Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 5b0864b7b9148785e4812bc474980c6708904b3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b0864b7b91487… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 12:37:55 2015 +0100 Rename SNMP timeout parameter --- web/plugins/wato/check_mk_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e2cdd83..a506042 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -2020,7 +2020,7 @@ register_rule(group, elements = [ ( "timeout", Float( - title = _("Timeout between retries"), + title = _("Response timeout for a single query"), help = _("After a request is sent to the remote SNMP agent we will wait up to this " "number of seconds until assuming the answer get lost and retrying."), default_value = 1,

8 years, 9 months

#2873 FIX megaraid_pdisks: handle case "Copyback" correctly

by Mathias Kettner

Module: check_mk Branch: master Commit: 879c2e26a23373b8308c6b3330dab0a6d430c188 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=879c2e26a23373… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 11:51:55 2015 +0100 #2873 FIX megaraid_pdisks: handle case "Copyback" correctly This state seems to happen while a spare disk has taken over and is filled with data in order to recreate redundancy. Thanks to Mark Cooney. --- .werks/2873 | 12 ++++++++++++ ChangeLog | 1 + checks/megaraid_pdisks | 1 + 3 files changed, 14 insertions(+) diff --git a/.werks/2873 b/.werks/2873 new file mode 100644 index 0000000..ea0c4a4 --- /dev/null +++ b/.werks/2873 @@ -0,0 +1,12 @@ +Title: megaraid_pdisks: handle case "Copyback" correctly +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449053442 + +This state seems to happen while a spare disk has taken over and +is filled with data in order to recreate redundancy. Thanks to +Mark Cooney. diff --git a/ChangeLog b/ChangeLog index ea9b43f..9e291de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 2782 FIX: cups_queues: fix crash in case user name contains spaces * 2849 FIX: winperf_processor.util: Fixed crash in case no CPU infos are sent * 2850 FIX: juniper_cpu: Better error handling of empty data reported by device + * 2873 FIX: megaraid_pdisks: handle case "Copyback" correctly... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/megaraid_pdisks b/checks/megaraid_pdisks index ce47a01..18c57cd 100644 --- a/checks/megaraid_pdisks +++ b/checks/megaraid_pdisks @@ -110,6 +110,7 @@ megaraid_pdisks_states = { 'JBOD' : 0, 'Failed' : 2, 'Unconfigured(bad)' : 1, + 'Copyback' : 1, } def check_megaraid_pdisks(item, _no_params, info):

8 years, 9 months

Reserved 10 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: 8251259d422ea4ee8588ecf51ccfdc76ccb2296f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8251259d422ea4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 11:50:30 2015 +0100 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 598ac53..538e144 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2873 +2883

8 years, 9 months

#2850 FIX juniper_cpu: Better error handling of empty data reported by device

by Lars Michelsen

Module: check_mk Branch: master Commit: e7769b23128faf07bec1d4e013e984e380aa5443 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7769b23128faf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 11:26:35 2015 +0100 #2850 FIX juniper_cpu: Better error handling of empty data reported by device --- .werks/2850 | 10 ++++++++++ ChangeLog | 1 + checks/juniper_cpu | 6 +++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2850 b/.werks/2850 new file mode 100644 index 0000000..ac18688 --- /dev/null +++ b/.werks/2850 @@ -0,0 +1,10 @@ +Title: juniper_cpu: Better error handling of empty data reported by device +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449051972 + + diff --git a/ChangeLog b/ChangeLog index c425e9a..ea9b43f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 2842 FIX: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit * 2782 FIX: cups_queues: fix crash in case user name contains spaces * 2849 FIX: winperf_processor.util: Fixed crash in case no CPU infos are sent + * 2850 FIX: juniper_cpu: Better error handling of empty data reported by device Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/juniper_cpu b/checks/juniper_cpu index 5278430..cf05d91 100644 --- a/checks/juniper_cpu +++ b/checks/juniper_cpu @@ -32,7 +32,11 @@ def inventory_juniper_cpu(info): def check_juniper_cpu(item, params, info): for line in info: if line[0] == item: - util1, util5, util15 = map(int, line[1:]) + try: + util1, util5, util15 = map(int, line[1:]) + except ValueError: + return 3, "CPU information not provided by device" + warn, crit = params label1, label5, label15 = "", "", "" state = 0

8 years, 9 months

juniper_cpu: Fixed code formating

by Lars Michelsen

Module: check_mk Branch: master Commit: 368c06ff5d0962457ddd6b09428d16d548ba675f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=368c06ff5d0962… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 11:22:42 2015 +0100 juniper_cpu: Fixed code formating Conflicts: checks/juniper_cpu --- checks/juniper_cpu | 59 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/checks/juniper_cpu b/checks/juniper_cpu index 9d237dc..5278430 100644 --- a/checks/juniper_cpu +++ b/checks/juniper_cpu @@ -31,39 +31,38 @@ def inventory_juniper_cpu(info): def check_juniper_cpu(item, params, info): for line in info: - if line[0] == item: - util1, util5, util15 = map(int,line[1:]) - warn, crit = params - label1, label5, label15 = "", "", "" - state = 0 - if util1 >= crit: - state = 2 - label1 = "(!!)" - elif util1 >= warn: - state = 1 - label1 = "(!)" - if util5 >= crit: - state = 2 - label5 = "(!!)" - elif util5 >= warn: - state = max(state,1) - label5 = "(!)" - if util15 >= crit: - state = 2 - label15 = "(!!)" - elif util15 >= warn: - state = max(state,1) - label15 = "(!)" + if line[0] == item: + util1, util5, util15 = map(int, line[1:]) + warn, crit = params + label1, label5, label15 = "", "", "" + state = 0 + if util1 >= crit: + state = 2 + label1 = "(!!)" + elif util1 >= warn: + state = 1 + label1 = "(!)" + if util5 >= crit: + state = 2 + label5 = "(!!)" + elif util5 >= warn: + state = max(state,1) + label5 = "(!)" + if util15 >= crit: + state = 2 + label15 = "(!!)" + elif util15 >= warn: + state = max(state,1) + label15 = "(!)" - perf = [( "util1", util1, warn, crit ), - ( "util5", util5, warn, crit ), - ( "util15", util15, warn, crit )] + perf = [( "util1", util1, warn, crit ), + ( "util5", util5, warn, crit ), + ( "util15", util15, warn, crit )] - message = "%d%% 1 min%s, %d%% 5 min%s, %d%% 15 min%s" % \ - ( util1, label1, util5, label5, util15, label15 ) - return state, message, perf - return 3, "Information not found in output" + message = "%d%% 1 min%s, %d%% 5 min%s, %d%% 15 min%s" % \ + ( util1, label1, util5, label5, util15, label15 ) + return state, message, perf check_info["juniper_cpu"] = { "check_function" : check_juniper_cpu,

8 years, 9 months

Conflicts:

by Lars Michelsen

Module: check_mk Branch: master Commit: 06c8a634d67aae884146c863ff09a5ec85de1f96 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06c8a634d67aae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 11:16:50 2015 +0100 Conflicts: ChangeLog checks/winperf_processor --- .werks/2849 | 10 ++++++++++ ChangeLog | 1 + checks/winperf_processor | 13 ++++++++++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.werks/2849 b/.werks/2849 new file mode 100644 index 0000000..4eaae74 --- /dev/null +++ b/.werks/2849 @@ -0,0 +1,10 @@ +Title: winperf_processor.util: Fixed crash in case no CPU infos are sent +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449051266 + + diff --git a/ChangeLog b/ChangeLog index 42ee294..c425e9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ * 2744 FIX: waitmax now kills the whole process group and is a bit more robust. * 2842 FIX: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit * 2782 FIX: cups_queues: fix crash in case user name contains spaces + * 2849 FIX: winperf_processor.util: Fixed crash in case no CPU infos are sent Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_processor b/checks/winperf_processor index 21345a8..75152e4 100644 --- a/checks/winperf_processor +++ b/checks/winperf_processor @@ -35,14 +35,13 @@ def inventory_winperf_util(info): try: if line[0] == '-232': return [(None, "winperf_cpu_default_levels")] - except: + except IndexError: pass # params: levels for warn / crit in percentage def check_winperf_util(_no_item, params, info): if not info: - yield 3, "Got no information from agent" return this_time = int(float(info[0][0])) @@ -51,9 +50,17 @@ def check_winperf_util(_no_item, params, info): "-96": "user", "-94": "privileged"} + winperf_lines = [] + for line in info[1:]: + if line[0] in what_map: + winperf_lines.append(line) + + if not winperf_lines: + return + wrapped = False - for line in info[1:]: + for line in winperf_lines: if line[0] in what_map: what = what_map[line[0]] # Windows sends one counter for each CPU plus one counter that

8 years, 9 months

#2782 FIX cups_queues: fix crash in case user name contains spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: 8cebfd79aecc8fa237f9a31b1987b8ff594b325c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cebfd79aecc8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 10:55:06 2015 +0100 #2782 FIX cups_queues: fix crash in case user name contains spaces --- .werks/2782 | 10 ++++++++++ ChangeLog | 1 + checks/cups_queues | 50 ++++++++++++++++++++++++++++++-------------------- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/.werks/2782 b/.werks/2782 new file mode 100644 index 0000000..f934edb --- /dev/null +++ b/.werks/2782 @@ -0,0 +1,10 @@ +Title: cups_queues: fix crash in case user name contains spaces +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449050089 + + diff --git a/ChangeLog b/ChangeLog index 161e4c0..42ee294 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ * 2800 FIX: mk_mysql: fixed some issues with incorrect assembled command line... * 2744 FIX: waitmax now kills the whole process group and is a bit more robust. * 2842 FIX: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit + * 2782 FIX: cups_queues: fix crash in case user name contains spaces Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cups_queues b/checks/cups_queues index 9a92d3c..d5131c7 100644 --- a/checks/cups_queues +++ b/checks/cups_queues @@ -24,26 +24,25 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - # Example output from agent: -#<<<cups_queues>>> -#printer lpr1 disabled since Wed Jun 16 14:21:14 2010 - -# reason unknown -#printer lpr2 now printing lpr2-3. enabled since Tue Jun 29 09:22:04 2010 -# Wiederherstellbar: Der Netzwerk-Host „lpr2“ ist beschäftigt, erneuter Versuch in 30 Sekunden … -#printer spr1 is idle. enabled since Thu Mar 11 14:28:23 2010 -#printer spr2 is idle. enabled since Thu Mar 11 14:28:23 2010 -#printer spr3 is idle. enabled since Thu Mar 11 14:28:23 2010 -#printer spr4 is idle. enabled since Thu Mar 11 14:28:23 2010 -#printer spr5 is idle. enabled since Thu Mar 11 14:28:23 2010 -#printer spr6 disabled since Mon Jun 21 10:29:39 2010 - -# /usr/lib/cups/backend/lpd failed -#printer spr7 is idle. enabled since Thu Mar 11 14:28:23 2010 -#printer spr8 is idle. enabled since Thu Mar 11 14:28:23 2010 -#--- -#lpr2-2 root 1024 Tue Jun 29 09:02:35 2010 -#lpr2-3 root 1024 Tue Jun 29 09:05:54 2010 +# <<<cups_queues>>> +# printer lpr1 disabled since Wed Jun 16 14:21:14 2010 - +# reason unknown +# printer lpr2 now printing lpr2-3. enabled since Tue Jun 29 09:22:04 2010 +# Wiederherstellbar: Der Netzwerk-Host „lpr2“ ist beschäftigt, erneuter Versuch in 30 Sekunden … +# printer spr1 is idle. enabled since Thu Mar 11 14:28:23 2010 +# printer spr2 is idle. enabled since Thu Mar 11 14:28:23 2010 +# printer spr3 is idle. enabled since Thu Mar 11 14:28:23 2010 +# printer spr4 is idle. enabled since Thu Mar 11 14:28:23 2010 +# printer spr5 is idle. enabled since Thu Mar 11 14:28:23 2010 +# printer spr6 disabled since Mon Jun 21 10:29:39 2010 - +# /usr/lib/cups/backend/lpd failed +# printer spr7 is idle. enabled since Thu Mar 11 14:28:23 2010 +# printer spr8 is idle. enabled since Thu Mar 11 14:28:23 2010 +# --- +# lpr2-2 root 1024 Tue Jun 29 09:02:35 2010 +# lpr2-3 root 1024 Tue Jun 29 09:05:54 2010 +# zam19-113565 Sebastian Hirschdobler 3561472 Fri Jul 31 12:58:01 2015 # Default thresholds # ("<Warning max entries>", "<Critical num entries>", "<Warning entry age in seconds>", "<Critical entry age>") @@ -60,6 +59,7 @@ def check_cups_queues(item, params, info): now = time.time() oldest = now for num, line in enumerate(info): + # Parse printer status if line[0] == 'printer' and line[1] == item: statusoutput = ' '.join(line[2:]) status = ' '.join(line[2:4]) @@ -77,17 +77,27 @@ def check_cups_queues(item, params, info): else: state = 3 output = "Undefined status output in \"lpr -p\"" + + # Parse job elif line[0].startswith(item+'-'): # This is a queue item count the number of items and check the max age numJobs += 1 # Try to parse different time formats - timestring = ' '.join(line[3:]) + + # Handle case where user names contain spaces + # zam19-113565 Sebastian Hirschdobler 3561472 Fri Jul 31 12:58:01 2015 + time_parts = line[3:] + while saveint(time_parts[0]) > 35: + time_parts = time_parts[1:] + + timestring = ' '.join(time_parts) try: # Tue Jun 29 09:05:54 2010 parsed = time.strptime(timestring, '%a %b %d %H:%M:%S %Y') except: # Thu 29 Aug 2013 12:41:42 AM CEST parsed = time.strptime(timestring, '%a %d %b %Y %H:%M:%S %p %Z') + dt = time.mktime(parsed) if dt < oldest: oldest = dt

8 years, 9 months

#2781 FIX Fix role handling of "Custom Links" snapin in case of adapted roles

by Mathias Kettner

Module: check_mk Branch: master Commit: 2e002a4e6bafffdb4391ba06e8c762e144b12dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e002a4e6bafff… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 10:32:57 2015 +0100 #2781 FIX Fix role handling of "Custom Links" snapin in case of adapted roles If you have defined you own roles then a user had not correctly been mapped to <tt>user</tt>, <tt>guest</tt> or <tt>admin</tt> when selecting the right portions of the custom links in the snapin. This has been fixed. Thanks to Molchanov Alexander. --- .werks/2781 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/config.py | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/2781 b/.werks/2781 new file mode 100644 index 0000000..190d137 --- /dev/null +++ b/.werks/2781 @@ -0,0 +1,13 @@ +Title: Fix role handling of "Custom Links" snapin in case of adapted roles +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449048678 + +If you have defined you own roles then a user had not correctly been mapped +to <tt>user</tt>, <tt>guest</tt> or <tt>admin</tt> when selecting the right +portions of the custom links in the snapin. This has been fixed. Thanks to +Molchanov Alexander. diff --git a/ChangeLog b/ChangeLog index 8e1cba7..161e4c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 2772 FIX: Fixed possible exception in icon column when showing some actions in the column... * 2846 FIX: View refresh could reset checkboxes on views where "always show checkboxes" is enabled * 2778 FIX: Fixed correct scaling of sidebar on newer versions of Chrome browser + * 2781 FIX: Fix role handling of "Custom Links" snapin in case of adapted roles... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/web/htdocs/config.py b/web/htdocs/config.py index 3a399d1..030b2fd 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -243,9 +243,9 @@ def login(u): # Get best base roles and use as "the" role of the user global user_baserole_id - if "admin" in user_role_ids: + if "admin" in user_baserole_ids: user_baserole_id = "admin" - elif "user" in user_role_ids: + elif "user" in user_baserole_ids: user_baserole_id = "user" else: user_baserole_id = "guest"

8 years, 9 months

The autocheck entries of clustered services were stored in

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b3acd7bca68a47c050cc5d2b4fc58aa8b01d743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b3acd7bca68a4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 10:10:54 2015 +0100 The autocheck entries of clustered services were stored in [cluster].mk autocheck files in past versions. Current versions are now storing the autochecks in the node specific files. The old [cluster].mk files were not cleaned up during discovery leading into duplicate autochecks entries. As these files were never updated again, they could result in unwanted services on the cluster hosts. This could be fixed manually by removing the [cluster].mk autocheck files via command line. The current version is now cleaning up the files during discovery. Conflicts: ChangeLog modules/automation.py --- .werks/2848 | 20 +++++++++++++++++++ ChangeLog | 1 + modules/discovery.py | 54 +++++++++++++++++++++++++++++++++----------------- 3 files changed, 57 insertions(+), 18 deletions(-) diff --git a/.werks/2848 b/.werks/2848 new file mode 100644 index 0000000..3b993fb --- /dev/null +++ b/.werks/2848 @@ -0,0 +1,20 @@ +Title: Fixed cleanup of old autocheck files of cluster hosts +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449047196 + +The autocheck entries of clustered services were stored in +[cluster].mk autocheck files in past versions. Current versions +are now storing the autochecks in the node specific files. + +The old [cluster].mk files were not cleaned up during discovery +leading into duplicate autochecks entries. As these files were +never updated again, they could result in unwanted services on +the cluster hosts. This could be fixed manually by removing the +[cluster].mk autocheck files via command line. + +The current version is now cleaning up the files during discovery. diff --git a/ChangeLog b/ChangeLog index 234846e..8e1cba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ * 2759 FIX: Allowing Emails to contain special characters like umlauts... * 2764 FIX: Fixed broken SNMP checks in case SNMP check interval is configured for clusters... * 2770 FIX: Check_MK is now warning the user about deprecated but configured checkgroup parameters... + * 2848 FIX: Fixed cleanup of old autocheck files of cluster hosts... Checks & Agents: * 2434 NetApp monitoring: Cluster-Mode is now supported, changes in existing 7Mode checks... diff --git a/modules/discovery.py b/modules/discovery.py index 2e281f3..a5b729d 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -52,9 +52,11 @@ def do_discovery(hostnames, check_types, only_new): # cannot be discovered but the user is allowed to specify # them and we do discovery on the nodes instead. nodes = [] + cluster_hosts = [] for h in hostnames: nodes = nodes_of(h) if nodes: + cluster_hosts.append(h) hostnames += nodes # Then remove clusters and make list unique @@ -78,6 +80,11 @@ def do_discovery(hostnames, check_types, only_new): cleanup_globals() + # Check whether or not the cluster host autocheck files are still + # existant. Remove them. The autochecks are only stored in the nodes + # autochecks files these days. + for hostname in cluster_hosts: + remove_autochecks_file(hostname) def do_discovery_for(hostname, check_types, only_new, use_caches, on_error): # Usually we disable SNMP scan if cmk -I is used without a list of @@ -1203,6 +1210,15 @@ def has_autochecks(hostname): return os.path.exists(autochecksdir + "/" + hostname + ".mk") +def remove_autochecks_file(hostname): + filepath = autochecksdir + "/" + hostname + ".mk" + try: + os.remove(filepath) + except OSError: + pass + + +# FIXME TODO: Consolidate with automation.py automation_write_autochecks_file() def save_autochecks_file(hostname, items): if not os.path.exists(autochecksdir): os.makedirs(autochecksdir) @@ -1231,6 +1247,11 @@ def set_autochecks_of(hostname, new_items): new_autochecks.append((check_type, item, paramstring)) # write new autochecks file for that host save_autochecks_file(node, new_autochecks) + + # Check whether or not the cluster host autocheck files are still + # existant. Remove them. The autochecks are only stored in the nodes + # autochecks files these days. + remove_autochecks_file(hostname) else: existing = parse_autochecks_file(hostname) # write new autochecks file, but take paramstrings from existing ones @@ -1254,25 +1275,22 @@ def remove_autochecks_of(hostname): nodes = nodes_of(hostname) if nodes: for node in nodes: - old_items = parse_autochecks_file(node) - new_items = [] - for check_type, item, paramstring in old_items: - descr = service_description(check_type, item) - if hostname != host_of_clustered_service(node, descr): - new_items.append((check_type, item, paramstring)) - else: - removed += 1 - save_autochecks_file(node, new_items) + removed += remove_autochecks_of_host(node) else: - old_items = parse_autochecks_file(hostname) - new_items = [] - for check_type, item, paramstring in old_items: - descr = service_description(check_type, item) - if hostname != host_of_clustered_service(hostname, descr): - new_items.append((check_type, item, paramstring)) - else: - removed += 1 - save_autochecks_file(hostname, new_items) + removed += remove_autochecks_of_host(hostname) return removed + +def remove_autochecks_of_host(hostname): + old_items = parse_autochecks_file(hostname) + removed = 0 + new_items = [] + for check_type, item, paramstring in old_items: + descr = service_description(check_type, item) + if hostname != host_of_clustered_service(hostname, descr): + new_items.append((check_type, item, paramstring)) + else: + removed += 1 + save_autochecks_file(hostname, new_items) + return removed

8 years, 9 months

#2780 cisco_vss: detect this check on newer (15.1) devices

by Mathias Kettner

Module: check_mk Branch: master Commit: e1f2918b03bb740d5217054f633d514de2227e8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1f2918b03bb74… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 09:50:42 2015 +0100 #2780 cisco_vss: detect this check on newer (15.1) devices --- .werks/2780 | 9 +++++++++ ChangeLog | 1 + checks/cisco_vss | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2780 b/.werks/2780 new file mode 100644 index 0000000..6c7d0fb --- /dev/null +++ b/.werks/2780 @@ -0,0 +1,9 @@ +Title: cisco_vss: detect this check on newer (15.1) devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449046212 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6492316..234846e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 2841 emcvnx_writecache: the check monitors the write cache state of the storage processors of an EMC VNX Storage System * 2803 netapp_api_volumes: clustered volumes now longer show the current node name in the service description... NOTE: Please refer to the migration notes! + * 2780 cisco_vss: detect this check on newer (15.1) devices * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... diff --git a/checks/cisco_vss b/checks/cisco_vss index d639a98..dce5dcf 100644 --- a/checks/cisco_vss +++ b/checks/cisco_vss @@ -115,7 +115,8 @@ check_info["cisco_vss"] = { "service_description": "VSS Status", "snmp_scan_function" : lambda oid: ( "Catalyst 45" in oid(".1.3.6.1.2.1.1.1.0") or - "Catalyst 65" in oid(".1.3.6.1.2.1.1.1.0")) and \ + "Catalyst 65" in oid(".1.3.6.1.2.1.1.1.0") or + "s72033_rp" in oid(".1.3.6.1.2.1.1.1.0")) and \ oid(".1.3.6.1.4.1.9.9.388.1.1.1.0"), "snmp_info" : [ ( ".1.3.6.1.4.1.9.9.388.1.2.2.1",

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015