Checkmk git commits February 2014

checkmk-commits@lists.checkmk.com

6 participants
141 discussions

Check_MK Git: check_mk: Internal code cleanup for inventory function

by Mathias Kettner

Module: check_mk Branch: master Commit: 113435629904a491a02ef0c4a26f418a41fadb67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=113435629904a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 14:18:07 2014 +0100 Internal code cleanup for inventory function --- modules/check_mk.py | 144 ++++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 71 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 2d64184..6ea87b1 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2633,6 +2633,70 @@ def quote_nagios_string(s): # | Automatic service detection | # '----------------------------------------------------------------------' +def do_inventory(hostnames, checknames, only_new): + + # For clusters add their nodes to the list + nodes = [] + for h in hostnames: + nodes = nodes_of(h) + if nodes: + hostnames += nodes + + # Then remove clusters and make list unique + hostnames = list(set([ h for h in hostnames if not is_cluster(h) ])) + hostnames.sort() + + if opt_verbose: + if len(hostnames) > 0: + sys.stdout.write("Inventorizing %s.\n" % ", ".join(hostnames)) + else: + sys.stdout.write("Inventorizing all hosts.\n") + + if inventory_checks: + checknames = inventory_checks.split(",") + + # remove existing checks, if option -I is used twice + if seen_I > 1: + if inventory_checks == None: + checknames = inventorable_checktypes("all") + if len(hostnames) > 0: + # Entries in hostnames that are either prefixed with @ + # or are no valid hostnames are considered to be tags. + for host in hostnames: + remove_autochecks_of(host, checknames) + # If all nodes of a cluster are contained in the list, then + # also remove the autochecks of that cluster. Beware: a host + # can be part more multiple clusters + for clust in clusters_of(host): + missing = [] # collect nodes missing on the command line + for node in nodes_of(clust): + if node not in hostnames: + missing.append(node) + + if len(missing) == 0: + if opt_verbose: + sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) + remove_autochecks_of(clust, checknames) + + else: + sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % + (host, clust, ",".join(missing), clust)) + + else: + for host in all_active_hosts() + all_active_clusters(): + remove_autochecks_of(host, checknames) + reread_autochecks() + + if inventory_checks == None: + do_snmp_scan(hostnames) + checknames = inventorable_checktypes("tcp") + + for checkname in checknames: + make_inventory(checkname, hostnames, False) + + do_cleanup_autochecks() + + def inventorable_checktypes(what): # snmp, tcp, all checknames = [ k for k in check_info.keys() @@ -5689,7 +5753,7 @@ if __name__ == "__main__": done = False seen_I = 0 - inventory_checks = None + check_types = None # Scan modifying options first (makes use independent of option order) for o,a in opts: if o in [ '-v', '--verbose' ]: @@ -5725,7 +5789,7 @@ if __name__ == "__main__": elif o == '-I': seen_I += 1 elif o == "--checks": - inventory_checks = a + check_types = a.split(",") elif o == "--cmc-file": opt_cmc_relfilename = a @@ -5859,70 +5923,11 @@ if __name__ == "__main__": raise sys.exit(3) + # handle -I / -II if not done and seen_I > 0: - hostnames = parse_hostname_list(args) - # For clusters add their nodes to the list - nodes = [] - for h in hostnames: - nodes = nodes_of(h) - if nodes: - hostnames += nodes - - # Then remove clusters and make list unique - hostnames = list(set([ h for h in hostnames if not is_cluster(h) ])) - hostnames.sort() - - if opt_verbose: - if len(hostnames) > 0: - sys.stdout.write("Inventorizing %s.\n" % ", ".join(hostnames)) - else: - sys.stdout.write("Inventorizing all hosts.\n") - - if inventory_checks: - checknames = inventory_checks.split(",") - - # remove existing checks, if option -I is used twice - if seen_I > 1: - if inventory_checks == None: - checknames = inventorable_checktypes("all") - if len(hostnames) > 0: - # Entries in hostnames that are either prefixed with @ - # or are no valid hostnames are considered to be tags. - for host in hostnames: - remove_autochecks_of(host, checknames) - # If all nodes of a cluster are contained in the list, then - # also remove the autochecks of that cluster. Beware: a host - # can be part more multiple clusters - for clust in clusters_of(host): - missing = [] # collect nodes missing on the command line - for node in nodes_of(clust): - if node not in hostnames: - missing.append(node) - - if len(missing) == 0: - if opt_verbose: - sys.stdout.write("All nodes of %s specified, dropping checks of %s, too.\n" % (clust, node)) - remove_autochecks_of(clust, checknames) - - else: - sys.stdout.write("Warning: %s is part of cluster %s, but you didn't specify %s as well.\nChecks on %s will be kept.\n" % - (host, clust, ",".join(missing), clust)) - - else: - for host in all_active_hosts() + all_active_clusters(): - remove_autochecks_of(host, checknames) - reread_autochecks() - - if inventory_checks == None: - do_snmp_scan(hostnames) - checknames = inventorable_checktypes("tcp") - - for checkname in checknames: - make_inventory(checkname, hostnames, False) - - do_cleanup_autochecks() - + do_inventory(hostnames, check_types, seen_I == 1) + done = True if done: output_profile() @@ -5930,10 +5935,13 @@ if __name__ == "__main__": elif (len(args) == 0 and not opt_keepalive) or len(args) > 2: usage() sys.exit(1) + + # handle --keepalive elif opt_keepalive: do_check_keepalive() - else: + # handle adhoc-check + else: hostname = args[0] if len(args) == 2: ipaddress = args[1] @@ -5947,11 +5955,5 @@ if __name__ == "__main__": print "Cannot resolve hostname '%s'." % hostname sys.exit(2) - # honor --checks= also when checking (makes testing easier) - if inventory_checks: - check_types = inventory_checks.split(",") - else: - check_types = None - do_check(hostname, ipaddress, check_types)

10 years, 7 months

Check_MK Git: check_mk: FIX postgres_sessions: fix empty agent section in case of 0 sessions

by Mathias Kettner

Module: check_mk Branch: master Commit: 25a3ca9632feced097917c3632ccd32fcc493582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25a3ca9632fece… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 14:06:26 2014 +0100 FIX postgres_sessions: fix empty agent section in case of 0 sessions This fixes the problem that in some case when 0 sessions are active the agent section is empty and the inventory will find the check nomore. --- .werks/689 | 11 +++++++++++ ChangeLog | 3 ++- agents/plugins/mk_postgres | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/689 b/.werks/689 new file mode 100644 index 0000000..8d40dd2 --- /dev/null +++ b/.werks/689 @@ -0,0 +1,11 @@ +Title: postgres_sessions: fix empty agent section in case of 0 sessions +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391505669 + +This fixes the problem that in some case when 0 sessions are active +the agent section is empty and the inventory will find the check +nomore. diff --git a/ChangeLog b/ChangeLog index dff5b97..6345c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,8 +153,9 @@ * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... * 0272 FIX: if checks: port type 56 (fibrechannel) is no longer inventorized per default... * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well - * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... * 0688 FIX: winperf_msx_queues: Support output of Exchange 2013... + * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... + * 0689 FIX: postgres_sessions: fix empty agent section in case of 0 sessions... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/agents/plugins/mk_postgres b/agents/plugins/mk_postgres index 3d928db..dc92a20 100755 --- a/agents/plugins/mk_postgres +++ b/agents/plugins/mk_postgres @@ -17,6 +17,9 @@ do su - $USER -c "psql --variable ON_ERROR_STOP=1 -d postgres -A -t -F' '" 2>/dev/null)" && break done echo "$OUTPUT" +# line with number of idle sessions is sometimes missing on Postgre 8.x. This can lead +# to an altogether empty section and thus the check disappearing. +echo "$OUTPUT" | grep -q '^t ' || echo "t 0" echo '<<<postgres_stat_database:sep(59)>>>' echo 'select datid, datname, numbackends, xact_commit, xact_rollback, blks_read, blks_hit, tup_returned, tup_fetched, tup_inserted, tup_updated, tup_deleted, pg_database_size(datname) "datsize" from pg_stat_database;' \

10 years, 7 months

Check_MK Git: check_mk: FIX zypper: check is always registered as soon as mk_zypper plugin detects zypper tool

by Götz Golla

Module: check_mk Branch: master Commit: 99c6695d9d5a534e5860fb5c3c023159112c09c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99c6695d9d5a53… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Feb 4 10:51:30 2014 +0100 FIX zypper: check is always registered as soon as mk_zypper plugin detects zypper tool There is also a WATO section "Zypper Updates" now so that the check can be configured as a manual check. --- .werks/578 | 9 +++++++++ ChangeLog | 1 + checks/zypper | 7 +++++-- web/plugins/wato/check_parameters.py | 7 +++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.werks/578 b/.werks/578 new file mode 100644 index 0000000..616ce92 --- /dev/null +++ b/.werks/578 @@ -0,0 +1,9 @@ +Title: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool +Level: 1 +Component: checks +Version: 1.2.5i1 +Date: 1391505179 +Class: fix + +There is also a WATO section "Zypper Updates" now so that the check can be configured +as a manual check. diff --git a/ChangeLog b/ChangeLog index 977a936..817e1c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -152,6 +152,7 @@ * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... * 0272 FIX: if checks: port type 56 (fibrechannel) is no longer inventorized per default... * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well + * 0578 FIX: zypper: check is always registered as soon as mk_zypper plugin detects zypper tool... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/zypper b/checks/zypper index 8722dc9..291b44b 100644 --- a/checks/zypper +++ b/checks/zypper @@ -37,8 +37,10 @@ def inventory_zypper(info): - if len(info) > 0: - return [(None,{})] + # the agent section is only present when the agent has + # detected that zypper is installed, therefore the check + # can always register + return [(None,{})] def check_zypper(_no_item, _no_params, info): patch_types = {} @@ -83,4 +85,5 @@ check_info['zypper'] = { "check_function" : check_zypper, "inventory_function" : inventory_zypper, "service_description" : "Zypper Updates", + "group" : "zypper", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6973b05..d0219a9 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4618,3 +4618,10 @@ register_check_parameters( "first", False ) +register_check_parameters( + subgroup_os, + "zypper", + _("Zypper Updates"), + None, + None, None, +)

10 years, 7 months

Check_MK Git: check_mk: FIX winperf_msx_queues: Support output of Exchange 2013

by Mathias Kettner

Module: check_mk Branch: master Commit: 17648383cce742d41d16067f27ec9edd061e28ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17648383cce742… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Feb 4 10:08:54 2014 +0100 FIX winperf_msx_queues: Support output of Exchange 2013 Exchange2013 supports multiple priorities of queues and therefore outputs more than one counter. The check can now handle this. --- .werks/688 | 10 ++++++++++ ChangeLog | 1 + checks/winperf_msx_queues | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/688 b/.werks/688 new file mode 100644 index 0000000..b252e9a --- /dev/null +++ b/.werks/688 @@ -0,0 +1,10 @@ +Title: winperf_msx_queues: Support output of Exchange 2013 +Level: 1 +Component: checks +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391504873 + +Exchange2013 supports multiple priorities of queues and therefore outputs +more than one counter. The check can now handle this. diff --git a/ChangeLog b/ChangeLog index 13e051b..354348d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -153,6 +153,7 @@ * 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: improved handling of warning state... * 0272 FIX: if checks: port type 56 (fibrechannel) is no longer inventorized per default... * 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as well + * 0688 FIX: winperf_msx_queues: Support output of Exchange 2013... Multisite: * 0371 Added log class filter to hostsvcevents view diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues index 029710f..2f3129d 100644 --- a/checks/winperf_msx_queues +++ b/checks/winperf_msx_queues @@ -45,6 +45,14 @@ # 10362 0 rawcount # 10364 811 rawcount +# Example output from a Exchange 2013 server: +# <<<winperf_msx_queues>>> +# 1385554029.05 12048 +# 4 instances: niedrige_priorität normale_priorität hohe_priorität _total +# 2 0 0 0 0 rawcount +# 4 0 0 0 0 rawcount +# 6 0 0 0 0 rawcount + # Default warn/crit levels for length of queues msx_queues_default_levels = (500, 2000) @@ -68,7 +76,7 @@ def check_winperf_msx_queues(item, params, info): for line in info[2:]: if line[0] == winperf_msx_queues.get(item): - length = int(line[1]) + length = int(line[-2]) warn, crit = params perfdata = [("length", length, warn, crit)] infotext = "%d entries" % length

10 years, 7 months

Check_MK Git: check_mk: FIX Fixed mkeventd notification plugin

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7c6e9bbb7e5f1f49717d1d77a019d109fdc57738 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c6e9bbb7e5f1f… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 3 15:51:31 2014 +0100 FIX Fixed mkeventd notification plugin The service description was missing --- .werks/133 | 9 +++++++++ ChangeLog | 3 ++- notifications/mkeventd | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/133 b/.werks/133 new file mode 100644 index 0000000..37593e7 --- /dev/null +++ b/.werks/133 @@ -0,0 +1,9 @@ +Title: Fixed mkeventd notification plugin +Level: 1 +Component: notifications +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391439039 + +The service description was missing diff --git a/ChangeLog b/ChangeLog index 695fa6d..13e051b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,8 +78,8 @@ * 0576 fileinfo.groups: new feature to include current date in file pattern * 0130 Support of new Firmware version of various Fujitsu Sotarge Systems * 0698 emc_isilon.nodehealth: new check for EMC Isilon Storage systems: NodeHealth - * 0132 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware * 0699 emc_isilon_iops: New check for Disk Operations per Second (IOPS) in EMC Isilon Storage + * 0132 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... @@ -254,6 +254,7 @@ * 0684 New notification variables NOTIFY_LASTSERVICEOK and NOTIFY_LASTHOSTUP... * 0108 FIX: Prevent service notification on host alerts... * 0058 FIX: Fix email notifications containing non-ASCII characters in some situtations... + * 0133 FIX: Fixed mkeventd notification plugin... Reporting & Availability: * 0018 New option for displaying a legend for the colors used in the timeline... diff --git a/notifications/mkeventd b/notifications/mkeventd index 3999acb..9045057 100755 --- a/notifications/mkeventd +++ b/notifications/mkeventd @@ -17,6 +17,6 @@ if [ "$NOTIFY_WHAT" = HOST ] then mkevent -n "$FACILITY" "$REMOTE" $NOTIFY_HOSTSTATEID "$NOTIFY_HOSTNAME" "" "$NOTIFY_HOSTOUTPUT" "$NOTIFY_HOST_SL" "$NOTIFY_HOST_EC_CONTACT" else - mkevent -n "$FACILITY" "$REMOTE" $NOTIFY_SERVICESTATEID "$NOTIFY_HOSTNAME" "$NOTIFY_SERVICENAME" "$NOTIFY_SERVICEOUTPUT" "$NOTIFY_SERVICE_SL" "$NOTIFY_SERVICE_EC_CONTACT" "$NOTIFY_HOST_SL" "$NOTIFY_HOST_EC_CONTACT" + mkevent -n "$FACILITY" "$REMOTE" $NOTIFY_SERVICESTATEID "$NOTIFY_HOSTNAME" "$NOTIFY_SERVICEDESC" "$NOTIFY_SERVICEOUTPUT" "$NOTIFY_SERVICE_SL" "$NOTIFY_SERVICE_EC_CONTACT" "$NOTIFY_HOST_SL" "$NOTIFY_HOST_EC_CONTACT" fi

10 years, 7 months

Check_MK Git: check_mk: New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware

by Bastian Kuhn

Module: check_mk Branch: master Commit: a5511409e958c8dc202a928aa4c8a3a75755b4b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5511409e958c8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 3 15:29:59 2014 +0100 New checks fjdarye101_disks fjdarye101_rluns: Fujitsu Storage Systems with 2013 Firmware --- .werks/132 | 8 +++++++ ChangeLog | 3 ++- checkman/fjdarye101_disks | 26 ++++++++++++++++++++ checkman/fjdarye101_disks.summary | 34 +++++++++++++++++++++++++++ checkman/fjdarye101_rluns | 27 +++++++++++++++++++++ checks/fjdarye100_rluns | 14 +++++------ checks/fjdarye101_disks | 47 +++++++++++++++++++++++++++++++++++++ checks/fjdarye101_rluns | 35 +++++++++++++++++++++++++++ checks/fjdarye60_rluns | 35 +++++---------------------- 9 files changed, 191 insertions(+), 38 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a5511409e9…

10 years, 7 months

Check_MK Git: check_mk: Merge conflict

by Bastian Kuhn

Module: check_mk Branch: master Commit: 2bdaf99dd6edd53c62133056fdf9ac2097581bad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bdaf99dd6edd5… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Feb 3 15:30:44 2014 +0100 Merge conflict ---

10 years, 7 months

Check_MK Git: check_mk: emcvnx_info: now reports information about Model an Revision correctly. It retrieves this information by an additional call of naviseccli with getagent option

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 97f3ea3acca6c09831fe6e1e64a2e3351621449d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97f3ea3acca6c0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Feb 3 14:59:25 2014 +0100 emcvnx_info: now reports information about Model an Revision correctly. It retrieves this information by an additional call of naviseccli with getagent option --- agents/special/agent_emcvnx | 29 +++++++++++++++++++++++------ checkman/emcvnx_info | 8 ++++++++ web/plugins/wato/datasource_programs.py | 1 + 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/agents/special/agent_emcvnx b/agents/special/agent_emcvnx index 887ba29..35e5e89 100755 --- a/agents/special/agent_emcvnx +++ b/agents/special/agent_emcvnx @@ -65,9 +65,9 @@ OPTIONS: -i MODULES, --modules MODULES Modules to query. This is a comma separated list of which may contain the keywords "disks", "hba", "hwstatus", - "raidgroups" or "all" to define which information should - be queried from the SP. You can define to use only view of - them to optimize performance. The default is "all". + "raidgroups", "agent" or "all" to define which information + should be queried from the SP. You can define to use only + view of them to optimize performance. The default is "all". """) @@ -93,6 +93,7 @@ host_address = None user = None password = None mortypes = [ 'all' ] +fetch_agent_info = False naviseccli_options = { "disks" : {"cmd_option" : "-disk", "active" : False}, @@ -135,6 +136,7 @@ for module in naviseccli_options.keys(): try: if mortypes.index("all") >= 0: naviseccli_options[module]["active"] = True + fetch_agent_info = True except ValueError: pass @@ -144,19 +146,24 @@ for module in naviseccli_options.keys(): except ValueError: pass +try: + if mortypes.index("agent") >= 0: + fetch_agent_info = True +except ValueError: + pass ############################################################################# # fetch information by calling naviseccli ############################################################################# -basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 getall " % (host_address, user, password) +basecmd="naviseccli -h %s -User %s -Password '%s' -Scope 0 " % (host_address, user, password) # # check_mk section of agent output # print "<<<check_mk>>>" -cmd=basecmd + "-sp" +cmd=basecmd + "getall -sp" if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) @@ -179,13 +186,23 @@ print "<<<emcvnx_info>>>" for line in cmdout: print line +# if module "agent" was requested, fetch additional information about the +# agent, e. g. Model and Revision +if fetch_agent_info: + cmd=basecmd + "getagent" + if opt_debug: + sys.stderr.write("executing external command: %s\n" % cmd) + + for line in os.popen(cmd).readlines(): + print line, + # # all other sections of agent output # for module in naviseccli_options.keys(): if naviseccli_options[module]["active"] == True: print "<<<emcvnx_%s>>>" % module - cmd=basecmd + naviseccli_options[module]["cmd_option"] + cmd=basecmd + "getall " + naviseccli_options[module]["cmd_option"] if opt_debug: sys.stderr.write("executing external command: %s\n" % cmd) for line in os.popen(cmd).readlines(): diff --git a/checkman/emcvnx_info b/checkman/emcvnx_info index d37855e..a85329c 100644 --- a/checkman/emcvnx_info +++ b/checkman/emcvnx_info @@ -12,5 +12,13 @@ description: The information is retriefed by the special agent agent_emcvnx which uses EMC's command line tool naviseccli. + The full information is only available if you did switch on the "Model and + Revsion" switch in the WATO rule "Check state of EMC VNX storage systems" or + did call the special agent (as datasource program) with --modules option + including "agent" module. If you are not interested in Model and Revision of + your Storage device you can switch this off and save one call of naviseccli in + every check interval. In this case the Check reports only the serial number + of the SP. + inventory: Finds exactly one check on every EMC VNX storage system called EMC VNX Info diff --git a/web/plugins/wato/datasource_programs.py b/web/plugins/wato/datasource_programs.py index 60f39f5..9989cbc 100644 --- a/web/plugins/wato/datasource_programs.py +++ b/web/plugins/wato/datasource_programs.py @@ -193,6 +193,7 @@ register_rule(group, ( "hba", _("iSCSI HBAs") ), ( "hwstatus", _("Hardware Status") ), ( "raidgroups", _("RAID Groups") ), + ( "agent", _("Model and Revsion") ), ], default_value = [ "disks", "hba", "hwstatus", ], allow_empty = False,

10 years, 7 months

Check_MK Git: check_mk: FIX Fixed exception when view title or description was missing

by Andreas Boesl

Module: check_mk Branch: master Commit: e2f0ff96056565140e5fa952d95d534c5ee38935 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2f0ff96056565… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Feb 3 14:30:05 2014 +0100 FIX Fixed exception when view title or description was missing --- .werks/274 | 9 +++++++++ ChangeLog | 1 + web/htdocs/views.py | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.werks/274 b/.werks/274 new file mode 100644 index 0000000..8bfe4fe --- /dev/null +++ b/.werks/274 @@ -0,0 +1,9 @@ +Title: Fixed exception when view title or description was missing +Level: 1 +Component: multisite +Class: fix +State: unknown +Version: 1.2.5i1 +Date: 1391434136 + + diff --git a/ChangeLog b/ChangeLog index 5e0ecc0..977a936 100644 --- a/ChangeLog +++ b/ChangeLog @@ -192,6 +192,7 @@ * 0676 FIX: Move view "Stale services" to Problems folder * 0270 FIX: Multisite host tag filter: Now uses exact match... * 0273 FIX: Fixed exceptions when modifying / cloning views... + * 0274 FIX: Fixed exception when view title or description was missing WATO: * 0308 Multisite can now set rotation view permissions for NagVis... diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 8085e88..f47dbfc 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -278,6 +278,11 @@ def load_views(): html.multisite_views[(user, name)] = view + # Repair views with missing 'title' or 'description' + for key in [ "title", "description" ]: + if key not in view: + view[key] = _("Missing %s") % key + except SyntaxError, e: raise MKGeneralException(_("Cannot load views from %s/views.mk: %s") % (dirpath, e))

10 years, 7 months

Check_MK Git: check_mk: emcvnx_raidgroups: did fail on very first check with an index out of range exception

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 91fb977c212575e3e65b9a8108b1a1ad83855528 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91fb977c212575… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Feb 3 13:51:01 2014 +0100 emcvnx_raidgroups: did fail on very first check with an index out of range exception --- checks/emcvnx_raidgroups | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checks/emcvnx_raidgroups b/checks/emcvnx_raidgroups index dffb854..6b559a9 100644 --- a/checks/emcvnx_raidgroups +++ b/checks/emcvnx_raidgroups @@ -201,7 +201,9 @@ def check_emcvnx_raidgroups_capacity(item, params, info): # variable name in perfdata is not allowed to be just a number # especially 0 does not work, so prefix it generally with "rg" rc, message, perfdata = df_check_filesystem_list(item, params, fslist) - perfdata[0] = ("rg" + perfdata[0][0], perfdata[0][1], perfdata[0][2], perfdata[0][3], perfdata[0][4], perfdata[0][5]) + # note: on very first run perfdata is empty + if len(perfdata) > 0: + perfdata[0] = ("rg" + perfdata[0][0], perfdata[0][1], perfdata[0][2], perfdata[0][3], perfdata[0][4], perfdata[0][5]) return rc, message, perfdata

10 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2014