Checkmk git commits May 2014

checkmk-commits@lists.checkmk.com

5 participants
134 discussions

Check_MK Git: check_mk: fixed werk description

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 42f40101e2f85484f9f95634bcba46ef2d5d393d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42f40101e2f854… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri May 16 13:07:18 2014 +0200 fixed werk description --- .werks/955 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/955 b/.werks/955 index 80c8ac9..d096e1c 100644 --- a/.werks/955 +++ b/.werks/955 @@ -1,4 +1,4 @@ -Title: zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS +Title: zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS arc Cache Level: 2 Component: checks Version: 1.2.5i3 diff --git a/ChangeLog b/ChangeLog index 1f67500..66073a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -47,7 +47,7 @@ * 0916 if: now able to configure minimum bandwidth limits * 0917 df checks: now able to show time left until disk full as perfometer and pnpgraph... * 0954 juniper_bgp_state: New Check for BGP status at Juniper Routers - * 0955 zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS + * 0955 zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS arc Cache * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection

10 years, 6 months

Check_MK Git: check_mk: zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e4e0d25e6c90abc1c97ea6a5e46e17de77eb67fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4e0d25e6c90ab… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri May 16 12:50:38 2014 +0200 zfs_arc_cache, zfs_arc_cache.l2: New Checks for Hit Ratios and Sizes of ZFS --- .werks/955 | 8 ++ ChangeLog | 1 + agents/check_mk_agent.solaris | 6 + checkman/zfs_arc_cache | 22 ++++ checkman/zfs_arc_cache.l2 | 17 +++ checks/zfs_arc_cache | 238 ++++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 8 ++ 7 files changed, 300 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e4e0d25e6c…

10 years, 6 months

Check_MK Git: check_mk: FIX Do not loose site specific global settings anymore when chaning a site 's configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: c4561c0745a94c373eaebdcb987d4e2031e4cda5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c4561c0745a94c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 16 11:54:09 2014 +0200 FIX Do not loose site specific global settings anymore when chaning a site's configuration When you use distributed monitoring and have a site with site specific global settings and afterwards edited the settings of the site connections then the global settings got lost. This has now been fixed. --- .werks/972 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/.werks/972 b/.werks/972 new file mode 100644 index 0000000..db4f675 --- /dev/null +++ b/.werks/972 @@ -0,0 +1,11 @@ +Title: Do not loose site specific global settings anymore when chaning a site's configuration +Level: 2 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1400233980 + +When you use distributed monitoring and have a site with site specific global settings +and afterwards edited the settings of the site connections then the global settings +got lost. This has now been fixed. diff --git a/ChangeLog b/ChangeLog index 997320d..f149fdf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -94,6 +94,7 @@ * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... * 0904 FIX: Fixed exception in host parameter overview... * 0971 FIX: Fix missing authentication of PHP addons in D-WATO when activation mode is reload... + * 0972 FIX: Do not loose site specific global settings anymore when chaning a site's configuration... Notifications: * 0754 Allow users to disable their notifications completely... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 62dbb2b..7872015 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9836,6 +9836,11 @@ def mode_edit_site(phase): if not new and "secret" in old_site: new_site["secret"] = old_site["secret"] + # Do not forget to add those settings (e.g. "globals") that + # are not edited with this dialog + for key in old_site.keys(): + if key not in new_site: + new_site[key] = old_site[key] save_sites(sites)

10 years, 6 months

Check_MK Git: check_mk: Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: e766dbaef21c79b82455c2d18a3efde13e15ba14 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e766dbaef21c79… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 16 11:52:48 2014 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 66ae025..acbef43 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -972 +982

10 years, 6 months

Check_MK Git: check_mk: FIX Fix missing authentication of PHP addons in D-WATO when activation mode is reload

by Mathias Kettner

Module: check_mk Branch: master Commit: 374395811b75b22a35d85c9189bc1676b9e173e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=374395811b75b2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 16 11:32:46 2014 +0200 FIX Fix missing authentication of PHP addons in D-WATO when activation mode is reload When you set the activation mode in WATO from restart to reload and use distributed WATO then on the remote sites the hook for creating the authentication information for PHP addons like PNP4Nagios and NagVis would not be created. This has been fixed now. --- .werks/971 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/971 b/.werks/971 new file mode 100644 index 0000000..2a35b6c --- /dev/null +++ b/.werks/971 @@ -0,0 +1,12 @@ +Title: Fix missing authentication of PHP addons in D-WATO when activation mode is reload +Level: 1 +Component: wato +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1400232694 + +When you set the activation mode in WATO from restart to reload and use +distributed WATO then on the remote sites the hook for creating the authentication +information for PHP addons like PNP4Nagios and NagVis would not be created. This has +been fixed now. diff --git a/ChangeLog b/ChangeLog index feeeefd..997320d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,6 +93,7 @@ * 0965 Cumulative permissions and contact groups for WATO folders... * 0781 FIX: host diag page: fixed problem with update of diagnose subwindows... * 0904 FIX: Fixed exception in host parameter overview... + * 0971 FIX: Fix missing authentication of PHP addons in D-WATO when activation mode is reload... Notifications: * 0754 Allow users to disable their notifications completely... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8faaeae..62dbb2b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5319,7 +5319,7 @@ def check_mk_local_automation(command, args=[], indata=""): "<li>Retry this operation</li></ol>\n" % (html.apache_user(), sudoline)) - if command == 'restart': + if command in [ 'restart', 'reload' ]: try: call_hook_pre_activate_changes() except Exception, e: @@ -5353,7 +5353,7 @@ def check_mk_local_automation(command, args=[], indata=""): # On successful "restart" command execute the activate changes hook - if command == 'restart': + if command in [ 'restart', 'reload' ]: call_hook_activate_changes() try:

10 years, 6 months

Check_MK Git: check_mk: df pnptemplate:

by Andreas Boesl

Module: check_mk Branch: master Commit: a50f3d51bf946badcde3a7c60f200fccbdccb72b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a50f3d51bf946b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 16 11:10:48 2014 +0200 df pnptemplate: improved display of unmonitored areas fixed negative-growth display bug for AVG rrd values --- pnp-templates/check_mk-df.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pnp-templates/check_mk-df.php b/pnp-templates/check_mk-df.php index 640e13f..957f3d9 100644 --- a/pnp-templates/check_mk-df.php +++ b/pnp-templates/check_mk-df.php @@ -132,15 +132,18 @@ if (isset($RRD['trend_hoursleft'])) { // Trend $opt[4] = "--vertical-label 'Days left' -l -1 -u 365 -X0 --title '$hostname: Days left for $fstitle' "; $def[4] = "DEF:hours_left=${RRD_AVG['trend_hoursleft']} "; + $def[4] .= "DEF:hours_left_min=${RRD_MIN['trend_hoursleft']} "; // negative hours indicate no growth // the dataset hours_left_isneg stores this info for each point as True/False - $def[4] .= "CDEF:hours_left_isneg=hours_left,-1,EQ "; + $def[4] .= "CDEF:hours_left_isneg=hours_left_min,-1,EQ "; + $def[4] .= "CDEF:hours_left_unmon=hours_left_min,400,0,IF "; $def[4] .= "CDEF:days_left=hours_left,24,/ "; $def[4] .= "CDEF:days_left_cap=days_left,400,MIN "; // Convert negative points to 400 (y-axis cap) $def[4] .= "CDEF:days_left_cap_positive=hours_left_isneg,400,days_left_cap,IF "; // The AREA has a rendering problem. Points are too far to the right - $def[4] .= "AREA:400#AA2200: "; + $def[4] .= "AREA:hours_left_unmon#AA2200: "; + $def[4] .= "AREA:days_left_cap_positive#22AA44:\"Days left\:\" "; $def[4] .= "GPRINT:days_left:LAST:\"%7.2lf days\" ";

10 years, 6 months

Check_MK Git: check_mk: juniper_bgp_state: New Check for BGP status at Juniper Routers

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: e02759e00d2db1ba739fe71a6edd25cb5aca91a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e02759e00d2db1… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Fri May 16 08:39:04 2014 +0200 juniper_bgp_state: New Check for BGP status at Juniper Routers --- .werks/954 | 8 +++++ ChangeLog | 1 + checkman/juniper_bgp_state | 19 ++++++++++ checks/juniper_bgp_state | 82 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 110 insertions(+) diff --git a/.werks/954 b/.werks/954 new file mode 100644 index 0000000..4e594ce --- /dev/null +++ b/.werks/954 @@ -0,0 +1,8 @@ +Title: juniper_bgp_state: New Check for BGP status at Juniper Routers +Level: 2 +Component: checks +Version: 1.2.5i3 +Date: 1400222313 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 89f329f..feeeefd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,6 +46,7 @@ * 0160 brocade_vdx_status: New check to monitor the operational state of vdx switches. * 0916 if: now able to configure minimum bandwidth limits * 0917 df checks: now able to show time left until disk full as perfometer and pnpgraph... + * 0954 juniper_bgp_state: New Check for BGP status at Juniper Routers * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/juniper_bgp_state b/checkman/juniper_bgp_state new file mode 100644 index 0000000..9228dfd --- /dev/null +++ b/checkman/juniper_bgp_state @@ -0,0 +1,19 @@ +title: Juniper Routers: BGP Status +agents: snmp +catalog: hw/network/juniper +license: GPL +distribution: check_mk +description: + Checks the BGP status for the connection to one peer at Juniper Routers. + + If the operational status (jnxBgpM2PeerStatus) is not {running} it returns + {WARN} - that means: The connection has probably been shutdown manually. + If the operational status is {running} it looks for the state of the + connection (jnxBgpM2PeerState). On {established} it returns {OK} and {CRIT} + on every other. + +item: + The IP address of the peer. + +inventory: + Finds one check for every BGP connection reported by SNMP. diff --git a/checks/juniper_bgp_state b/checks/juniper_bgp_state new file mode 100644 index 0000000..a9cf183 --- /dev/null +++ b/checks/juniper_bgp_state @@ -0,0 +1,82 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2013 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +def juniper_bgp_state_create_item(oid_end): + return re.sub("6\.1\.[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\.1\.", "", oid_end) + +def inventory_juniper_bgp_state(info): + inventory = [] + for oid_end, bgp_state, bgp_operational_state in info: + inventory.append( (juniper_bgp_state_create_item(oid_end), None) ) + return inventory + +def check_juniper_bgp_state(item, _no_params, info): + bgp_state_map = [ "undefined", # 0 does not exist + "idle", # 1 + "connect", # 2 + "active", # 3 + "opensent", # 4 + "openconfirm", # 5 + "established"] # 6 + bgp_operational_state_map = [ "undefined", # 0 does not exist + "halted", # 1 + "running"] # 2 + status = 0 + for oid_end, bgp_state, bgp_operational_state in info: + peering_partner_ip = juniper_bgp_state_create_item(oid_end) + bgp_state = int(bgp_state) + bgp_operational_state = int(bgp_operational_state) + + if peering_partner_ip == item: + operational_state_error_string = "" + state_error_string = "" + + if bgp_operational_state != 2: + status = 1 + operational_state_error_string = "(!)" + elif bgp_state != 6: + status = 2 + state_error_string = "(!!)" + + return status, "Status with peer %s is %s%s, operational status: %s%s" \ + % (peering_partner_ip, \ + bgp_state_map[bgp_state], state_error_string, \ + bgp_operational_state_map[bgp_operational_state], \ + operational_state_error_string) + + return 3, "Peering partner %s not configured" % item + +check_info["juniper_bgp_state"] = { + "check_function" : check_juniper_bgp_state, + "inventory_function" : inventory_juniper_bgp_state, + "service_description" : "BGP Status Peer %s", + "snmp_info" : ('.1.3.6.1.4.1.2636.5.1.1.2.1.1.1', [ OID_END, # take peering partner IP from this + 2, # jnxBgpM2PeerState + 3 ]), # jnxBgpM2PeerStatus + # (like operational status) + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.2636.1.1.1.2.90"), + "has_perfdata" : False, +}

10 years, 6 months

Check_MK Git: check_mk: Added draft for renaming of hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 3c48b90b7792f625071b3dfdacb21ad09fb1f0a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c48b90b7792f6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 15 21:41:59 2014 +0200 Added draft for renaming of hosts --- doc/drafts/LIESMICH.hosts_umbenennen | 61 ++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/doc/drafts/LIESMICH.hosts_umbenennen b/doc/drafts/LIESMICH.hosts_umbenennen new file mode 100644 index 0000000..b2285ab --- /dev/null +++ b/doc/drafts/LIESMICH.hosts_umbenennen @@ -0,0 +1,61 @@ +Konzept zur Funktion "Umbenennen von Hosts" +------------------------------------------- + +Im WATO in den Details eines Hosts bauen wir einen neuen Knopf ein "Rename Host". +Dieser Knopf führt zu einer eigenen Seite. Das ganze muss auch für Cluster gehen. +Diese Seite enthält: + +- Ein Formular, in dem man den neuen Hostnamen eingeben kann. +- Eine Aufstellung, wo überall der Name geändert werden wird. + +WATO: + * Hostverwaltung: Name des Hosts im Folder + * Cluster: wenn der Host Node eines Clusters ist + * Regeln: in allen Regeln explizite Nennungen ersetzen (keine Regexen) + * Notifications: explizite Nennungen in Notification-Regeln (RBN) + * Flexible Notifications: auch hier (also in den Benutzerprofilen) + ==> Das alles geschieht lokal direkt im zentralen WATO + +Multisite: + * Favoriten der Benutzer + + +Check_MK: + * Verzeichnisse und Dateien unter var: + * piggyback + * autochecks (auch *in* der Datei!) + * logwatch + * snmpwalks + * Verzeichnisse unter tmp: + * cache + * counters + + ==> Das alles muss mit einer Automation gehen + +Core: + - Downtimes und Acknowledgements. + Nagios -> retention.dat + CMC -> Fuck, wie soll ich *das* machen??? + +OMD: + * PNP4Nagios - Performancedaten. Was ist mit den Spooldateien? + * rrdcached - Journaldateien (dazu muss das Ding aber gestoppt sein) + * Historie von Nagios und CMC + -> Hier ist das Problem, dass die dummen Logfileeinträge nicht immer + gleich aussehen. Wenn man nur nach ;...; geht, kann man evtl. + auch Services erwischen von Hosts, die zufällig so heißen (oder + absichtlich). + * NagVis - Nennungen der Hosts in Maps + - nagios - Historie und retention.dat (dazu muss der Core stoppt sein) + Das Umbenennen in retention.dat geht beim CMC aber eh nicht. Daher + lassen wir es bei Nagios evtl. auch weg. Man kann ja gleich nach dem + Umbenennen ein reschedule machen? + + ==> Auch das muss mit einer Automation gehen + +ES FEHLT: + +* nagios.log (analog von CMC) +* retentions.dat (analog bei CMC) +* Stop/Start vom Core inkl. Config erzeugen zu rechter Zeit +* Nachdenken, ob noch was fehlt.

10 years, 6 months

Check_MK Git: check_mk: Intermediate state in the renaming of hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 156ee62152c335f0978692928d2ec9764ee9e984 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=156ee62152c335… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 15 21:41:09 2014 +0200 Intermediate state in the renaming of hosts --- modules/automation.py | 125 ++++++++++++++ web/htdocs/images/icon_rename_host.png | Bin 0 -> 2743 bytes web/htdocs/wato.py | 293 +++++++++++++++++++++++++++++--- 3 files changed, 396 insertions(+), 22 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=156ee62152…

10 years, 6 months

Check_MK Git: check_mk: df checks: now able to show time left until disk full as perfometer and pnpgraph

by Andreas Boesl

Module: check_mk Branch: master Commit: 1092ec95cd54e74c3de67c5f73fa6e0ecde7d9cf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1092ec95cd54e7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 15 15:36:16 2014 +0200 df checks: now able to show time left until disk full as perfometer and pnpgraph There WATO rule <tt>Filesystems (used space and growth)</tt> now has an option where you can configure whether the time left until disk full information is always shown. If this option is set the multsite perfometer for the check is split horizontally and will additionally show the days left information. A new "Days left" pnpgraph is also available. --- .werks/917 | 12 ++++++++ ChangeLog | 1 + checks/df.include | 52 +++++++++++++++++++++++++--------- pnp-templates/check_mk-df.php | 18 ++++++++++++ web/plugins/perfometer/check_mk.py | 47 ++++++++++++++++++++++++++---- web/plugins/wato/check_parameters.py | 8 +++++- 6 files changed, 119 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1092ec95cd…

10 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
13
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2014