Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: check_mk_agent: code cleanup for upcoming agent feature

by Andreas Boesl

Module: check_mk Branch: master Commit: 15c6738dd533049743dbc944c974364ed099cf6f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15c6738dd53304… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 5 15:39:00 2015 +0200 check_mk_agent: code cleanup for upcoming agent feature --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes agents/windows/check_mk_agent.cc | 14 +++++++++++--- agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes agents/windows/install_agent-64.exe | Bin 179044 -> 179051 bytes agents/windows/install_agent.exe | Bin 160003 -> 160025 bytes 9 files changed, 12 insertions(+), 4 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index ca55a6c..08839f6 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -198 +200 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 666b0f4..b1cb3c3 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 3ca66e0..3edfd78 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 1c2cd52..ab6bc48 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -5114,19 +5114,27 @@ void do_unpack_plugins(char *plugin_filename) { } } } + if (dirname == NULL) + filename = filepath; if (dirname != NULL) { char new_dir[1024]; snprintf(new_dir, sizeof(new_dir), "%s\\%s", g_agent_directory, dirname); CreateDirectory(new_dir, NULL); + fprintf(uninstall_file, "del \"%s\\%s\\%s\"\n", g_agent_directory, dirname, filename); } + else + fprintf(uninstall_file, "del \"%s\\%s\"\n", g_agent_directory, filename); - // Add uninstall information for this plugin - fprintf(uninstall_file, "del \"%s\\%s\\%s\"\n", g_agent_directory, dirname, filename); + // TODO: remove custom dirs on uninstall // Write plugin char plugin_path[512]; - snprintf(plugin_path, sizeof(plugin_path), "%s\\%s\\%s", g_agent_directory, dirname, filename); + if (dirname != NULL) + snprintf(plugin_path, sizeof(plugin_path), "%s\\%s\\%s", g_agent_directory, dirname, filename); + else + snprintf(plugin_path, sizeof(plugin_path), "%s\\%s", g_agent_directory, filename); + FILE *plugin_file = fopen(plugin_path, "wb"); fwrite(content, 1, content_length, plugin_file); fclose(plugin_file); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index eedb2d9..3d39d84 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 3db52a5..e212db8 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 0573dc3..9ad9f0c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 7ef306c..0e27d75 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 1c31b2d..dd1d83e 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 10 months

Check_MK Git: check_mk: Updated bug entries #0849

by Bastian Kuhn

Module: check_mk Branch: master Commit: c44b9c126f87f7035b8169bff38ef0366f515407 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44b9c126f87f7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Aug 5 14:26:35 2015 +0200 Updated bug entries #0849 --- .bugs/849 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/849 b/.bugs/849 new file mode 100644 index 0000000..af867e8 --- /dev/null +++ b/.bugs/849 @@ -0,0 +1,8 @@ +Title: Manpage without Catalog breaks Check Plugins Section in Wato +Component: wato +State: open +Date: 2015-08-05 11:04:58 +Targetversion: 1.2.7 +Class: bug + +See topic \ No newline at end of file

8 years, 10 months

Check_MK Git: check_mk: #2417 winperf_phydisk: can now work in a cluster environment

by Andreas Boesl

Module: check_mk Branch: master Commit: 815e203a824bfd24faaf6a4b8f278878f4d08eb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=815e203a824bfd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 5 11:17:07 2015 +0200 #2417 winperf_phydisk: can now work in a cluster environment --- .werks/2417 | 9 +++++++ ChangeLog | 1 + checks/winperf_phydisk | 61 +++++++++++++++++++++++++++++++++--------------- 3 files changed, 52 insertions(+), 19 deletions(-) diff --git a/.werks/2417 b/.werks/2417 new file mode 100644 index 0000000..cd80893 --- /dev/null +++ b/.werks/2417 @@ -0,0 +1,9 @@ +Title: winperf_phydisk: can now work in a cluster environment +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1438765575 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 76f5fbb..5d65306 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ * 2413 esx_vsphere_counters: new check to monitor the disk throughput and latency for ESX datastores * 2513 new checks sentry_pdu_outlets sentry_pdu_systempower: monitor the system power consumption and outlet states of sentry pdu devices which support the Sentry3-MIB * 2515 juniper_trpz_aps: check is now cluster-aware... + * 2417 winperf_phydisk: can now work in a cluster environment * 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset... * 2316 FIX: windows agent: fix garbled output of cached agent plugins... * 2358 FIX: check_mk_agent.solaris: more correct computation of zfs used space... diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index 7c267bd..96df0fd 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -69,27 +69,50 @@ def winperf_phydisk_convert(info): # an almost empty section, where the second line is missing completely if len(info) == 1: return [] - disks = [ d.split('_')[-1] for d in info[1][3:-1] ] - for line in info[2:]: - if line[1] == '-14': - disk_read_bytes = [ int(x) / 512 for x in line[2:-2] ] - elif line[1] == '-12': - disk_write_bytes = [ int(x) / 512 for x in line[2:-2] ] - elif line[1] == '-20': - disk_reads = [ int(x) for x in line[2:-2] ] - elif line[1] == '-18': - disk_writes = [ int(x) for x in line[2:-2] ] - elif line[1] == '1168': # Average Disk Read Queue Length - disk_readq_ctrs = [ int(x) for x in line[2:-2] ] - elif line[1] == '1170': # Average Disk Read Queue Length - disk_writeq_ctrs = [ int(x) for x in line[2:-2] ] - # Missing columns are donted by negative values (Linux sends here latency - # information) - empty = [ -1 for x in disks ] - none = [ None for x in disks ] # Used as dummy node info + lines = iter(info) + entries = [] + current_disks = [] + current_read_bytes = [] + current_write_bytes = [] + current_disk_reads = [] + current_disk_writes = [] + current_diskreadq_ctrs = [] + current_diskwriteq_ctrs = [] - return zip(none, disks, disk_read_bytes, disk_write_bytes, disk_reads, disk_writes, empty, disk_readq_ctrs, disk_writeq_ctrs) + def finalize_block(nodename): + # Missing columns are donted by negative values (Linux sends here latency information) + return zip([nodename for x in current_disks], current_disks, current_disk_read_bytes, + current_disk_write_bytes, current_disk_reads, current_disk_writes, [-1 for x in current_disks], + current_disk_readq_ctrs, current_disk_writeq_ctrs) + + current_node = "" + try: + while True: + line = lines.next() + if line[2] == "instances:": + if current_node != "": + entries.extend(finalize_block(current_node)) + current_node = line[0] + current_disks = [ d.split('_')[-1] for d in line[3:-1] ] + elif line[1] == '-14': + current_disk_read_bytes = [ int(x) / 512 for x in line[2:-2] ] + elif line[1] == '-12': + current_disk_write_bytes = [ int(x) / 512 for x in line[2:-2] ] + elif line[1] == '-20': + current_disk_reads = [ int(x) for x in line[2:-2] ] + elif line[1] == '-18': + current_disk_writes = [ int(x) for x in line[2:-2] ] + elif line[1] == '1168': # Average Disk Read Queue Length + current_disk_readq_ctrs = [ int(x) for x in line[2:-2] ] + elif line[1] == '1170': # Average Disk Read Queue Length + current_disk_writeq_ctrs = [ int(x) for x in line[2:-2] ] + except StopIteration: + if current_node != "": + entries.extend(finalize_block(current_node)) + pass + + return entries def inventory_winperf_phydisk(info): return inventory_diskstat_generic(winperf_phydisk_convert(info))

8 years, 10 months

Check_MK Git: check_mk: Exception-Attributes are now top level crash report values

by Lars Michelsen

Module: check_mk Branch: master Commit: 4475b4d8f19c1b4cb2ab718a64f67338b23323d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4475b4d8f19c1b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 5 10:23:44 2015 +0200 Exception-Attributes are now top level crash report values --- web/htdocs/crash_reporting.py | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 770521e..a4ba8fb 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -228,7 +228,7 @@ def handle_report_form(tardata): def warn_about_local_files(info): if info["crash_type"] == "check": files = [] - for filepath, lineno, func, line in info["details"]["exc_traceback"]: + for filepath, lineno, func, line in info["exc_traceback"]: if "/local/" in filepath: files.append(filepath) @@ -270,6 +270,11 @@ def show_crash_report(info): html.write("<td>%s</td></tr>" % html.attrencode(info["os"])) html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check_MK Version")) html.write("<td>%s</td></tr>" % html.attrencode(info["version"])) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Exception")) + html.write("<td><pre>%s (%s)</pre></td></tr>" % (html.attrencode(info["exc_type"]), + html.attrencode(info["exc_value"]))) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Traceback")) + html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_traceback(info["exc_traceback"]))) html.write("</table>") @@ -287,11 +292,6 @@ def show_crashed_check_details(info): html.write("<td>%s</td></tr>" % html.attrencode(details["description"])) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Parameters")) html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_params(details["params"]))) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Exception")) - html.write("<td><pre>%s (%s)</pre></td></tr>" % (html.attrencode(details["exc_type"]), - html.attrencode(details["exc_value"]))) - html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Traceback")) - html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_traceback(details["exc_traceback"]))) html.write("</table>") @@ -324,11 +324,6 @@ def show_gui_crash_details(info): html.write("<td>%s</td></tr>" % html.attrencode(details["is_ssl_request"])) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Language")) html.write("<td>%s</td></tr>" % html.attrencode(details["language"])) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Exception")) - html.write("<td><pre>%s (%s)</pre></td></tr>" % (html.attrencode(details["exc_type"]), - html.attrencode(details["exc_value"]))) - html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Traceback")) - html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_traceback(details["exc_traceback"]))) html.write("</table>") @@ -358,10 +353,13 @@ def create_crash_dump_info_file(tar): exc_type, exc_value, exc_traceback = sys.exc_info() crash_info = { - "crash_type" : "gui", - "time" : time.time(), - "os" : get_os_info(), - "version" : defaults.check_mk_version, + "crash_type" : "gui", + "time" : time.time(), + "os" : get_os_info(), + "version" : defaults.check_mk_version, + "exc_type" : exc_type.__name__, + "exc_value" : "%s" % exc_value, + "exc_traceback" : traceback.extract_tb(exc_traceback), "details" : { "page" : html.myfile+".py", "vars" : html.vars, @@ -370,9 +368,6 @@ def create_crash_dump_info_file(tar): "is_mobile" : html.is_mobile(), "is_ssl_request" : html.is_ssl_request(), "language" : config.get_language(), - "exc_type" : exc_type.__name__, - "exc_value" : "%s" % exc_value, - "exc_traceback" : traceback.extract_tb(exc_traceback), }, }

8 years, 10 months

Check_MK Git: check_mk: Exception-Attributes are now top level crash report values

by Lars Michelsen

Module: check_mk Branch: master Commit: a6fa937421a5dc49a7f8a6a3cdbfdb201066e44c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6fa937421a5dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 5 10:16:42 2015 +0200 Exception-Attributes are now top level crash report values --- modules/check_mk_base.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index bba5752..710152e 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1476,10 +1476,13 @@ def create_crash_dump_info_file(crash_dir, hostname, check_name, item, params, d exc_type, exc_value, exc_traceback = sys.exc_info() crash_info = { - "crash_type" : "check", - "time" : time.time(), - "os" : get_os_info(), - "version" : check_mk_version, + "crash_type" : "check", + "time" : time.time(), + "os" : get_os_info(), + "version" : check_mk_version, + "exc_type" : exc_type.__name__, + "exc_value" : "%s" % exc_value, + "exc_traceback" : traceback.extract_tb(exc_traceback), "details" : { "check_output" : text, "host" : hostname, @@ -1487,9 +1490,6 @@ def create_crash_dump_info_file(crash_dir, hostname, check_name, item, params, d "check_type" : check_name, "item" : item, "params" : params, - "exc_type" : exc_type.__name__, - "exc_value" : "%s" % exc_value, - "exc_traceback" : traceback.extract_tb(exc_traceback), }, }

8 years, 10 months

Check_MK Git: check_mk: Small code restructuring

by Lars Michelsen

Module: check_mk Branch: master Commit: f85505fa6b1b13811d601effe31e53321b305093 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f85505fa6b1b13… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 5 08:36:16 2015 +0200 Small code restructuring --- web/htdocs/crash_reporting.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 60b4208..770521e 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -71,10 +71,7 @@ def page_crashed(what): warn_about_local_files(info) show_report_form(details) show_crash_report(info) - if info["crash_type"] == "check": - show_crashed_check_details(info) - else: - show_gui_crash_details(info) + show_crash_report_details(info) else: report_url = mailto_url = html.makeuri([ ("subject", "Check_MK Crash Report - " + defaults.check_mk_version), @@ -89,6 +86,13 @@ def page_crashed(what): html.footer() +def show_crash_report_details(info): + if info["crash_type"] == "check": + show_crashed_check_details(info) + else: + show_gui_crash_details(info) + + def show_context_buttons(what): if what == "check": html.begin_context_buttons()

8 years, 11 months

Check_MK Git: check_mk: fixed cluster-awareness in juniper_trpz_aps

by Simon Betz

Module: check_mk Branch: master Commit: f29c003ae7e0a9fdf277f6e435ffb7ba802dedd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f29c003ae7e0a9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 4 16:52:52 2015 +0200 fixed cluster-awareness in juniper_trpz_aps --- checks/juniper_trpz_aps | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/checks/juniper_trpz_aps b/checks/juniper_trpz_aps index 0c07559..acc3c15 100644 --- a/checks/juniper_trpz_aps +++ b/checks/juniper_trpz_aps @@ -28,14 +28,20 @@ def inventory_juniper_trpz_aps(info): return [ (None, None) ] def check_juniper_trpz_aps(_no_item, _no_params, info): - node, aps = info[0] - message = "%s access points online" % aps + aps_sum = 0 + message = "" + for node, aps in info: + aps_sum += int(aps) + message += "%s access points online" % aps - # Are we a cluster? - if node != None: - message = " (on %s)" % node + # Are we a cluster? + if node != None: + message += " (on %s)," % node - return 0, message, [ ('ap_devices_total', aps) ] + if message.endswith(','): + message = message[:-1] + + return 0, message, [ ('ap_devices_total', aps_sum) ] check_info["juniper_trpz_aps"] = { "check_function" : check_juniper_trpz_aps,

8 years, 11 months

Check_MK Git: check_mk: esx_vsphere_counters: now able to process datastore names with spaces

by Andreas Boesl

Module: check_mk Branch: master Commit: c13898e7cec26c2e9df6e9ffa13d26ad343f37c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c13898e7cec26c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 4 15:04:27 2015 +0200 esx_vsphere_counters: now able to process datastore names with spaces --- checks/esx_vsphere_counters | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index f292a4c..5d881cb 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -138,7 +138,7 @@ def esx_vsphere_counters_get_item_mapping(parsed): for instance, values in parsed.get("datastore.name").items(): if instance in map_instance_to_item and values[0][0] != "": - map_instance_to_item[instance] = values[0][0] + map_instance_to_item[instance] = values[0][0].replace(" ", "_") return map_instance_to_item def inventory_esx_vsphere_counters_datastoreio(parsed):

8 years, 11 months

Check_MK Git: check_mk: Fixed folding

by Lars Michelsen

Module: check_mk Branch: master Commit: 44f3180e5ffcd0b261c3fbfa6b7d8a7a4f219d76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44f3180e5ffcd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 4 14:50:03 2015 +0200 Fixed folding --- checks/esx_vsphere_counters | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/esx_vsphere_counters b/checks/esx_vsphere_counters index f292a4c..9419db8 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -105,6 +105,7 @@ check_info['esx_vsphere_counters.diskio'] = { 'includes' : [ "diskstat.include" ], } +#. # .--Datastore IO--------------------------------------------------------. # | ____ _ _ ___ ___ | # | | _ \ __ _| |_ __ _ ___| |_ ___ _ __ ___ |_ _/ _ \ |

8 years, 11 months

Check_MK Git: check_mk: #2416 FIX agent_netapp: fixed rare problem where environmental sensor info (fan, psus, temp) were not shown

by Andreas Boesl

Module: check_mk Branch: master Commit: e5b9432c2837b9fde5039049bdf93bfc10cb70a5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e5b9432c2837b9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 4 13:52:02 2015 +0200 #2416 FIX agent_netapp: fixed rare problem where environmental sensor info (fan, psus, temp) were not shown If the netapp filers shared an even amount of disks on a shelf, the agent had problems to determine which filer is responsible for the shelf sensors. In this case it reported "no one is responsible" which lead to missing checks. This has been fixed. If the disks of a shelf are evenly shared between the filers the shelf owner is now determined by comparing the system-name with the partner-system-name. --- .werks/2416 | 14 +++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 57 ++++++++++++++++++++++++++++++------------- 3 files changed, 55 insertions(+), 17 deletions(-) diff --git a/.werks/2416 b/.werks/2416 new file mode 100644 index 0000000..4457084 --- /dev/null +++ b/.werks/2416 @@ -0,0 +1,14 @@ +Title: agent_netapp: fixed rare problem where environmental sensor info (fan, psus, temp) were not shown +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438688902 + +If the netapp filers shared an even amount of disks on a shelf, the agent had problems +to determine which filer is responsible for the shelf sensors. +In this case it reported "no one is responsible" which lead to missing checks. +This has been fixed. If the disks of a shelf are evenly shared between the filers the +shelf owner is now determined by comparing the system-name with the partner-system-name. diff --git a/ChangeLog b/ChangeLog index 7c07852..6661c43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,7 @@ * 2414 FIX: logwatch: now really ignores ignored logwatch lines... * 2415 FIX: check_mail, check_mail_loop: fixed incorrect POP3 ssl setting (thanks to Bernhard Schmidt)... * 2452 FIX: cisco_temperature: Fixed handling of scaling... + * 2416 FIX: agent_netapp: fixed rare problem where environmental sensor info (fan, psus, temp) were not shown... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index 32147d1..eca6ce7 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -77,10 +77,6 @@ netapp_objects["netapp_api_protocol"] = { } } -netapp_objects["netapp_api_version"] = { - "configs" : { "system-get-info" : [], - "system-get-version" : [] } -} netapp_objects["netapp_api_status"] = { "configs" : { "diagnosis-status-get" : [] } @@ -90,8 +86,20 @@ netapp_objects["netapp_api_cluster"] = { "configs" : { "cf-status": [] }, } +def output_api_version(result): + shared_data["netapp_api_version"] = {"system-get-info": {}} + for node in result["configs"]["system-get-info"].child_get("system-info").children_get(): + shared_data["netapp_api_version"]["system-get-info"][node.element["name"]] = node.element["content"] + generic_output(results, "netapp_api_version") +netapp_objects["netapp_api_version"] = { + "configs" : { "system-get-info" : [], + "system-get-version" : [] }, + "output_function" : output_api_version, + "run_last" : True, +} + def output_disks(results): bay_list = results["configs"]["storage-shelf-bay-list-info"].child_get("shelf-bay-list") shelf_uids = {} @@ -139,27 +147,42 @@ netapp_objects["netapp_api_disk"] = { def output_environment(results): channel_list = results["configs"]["storage-shelf-environment-list-info"].child_get("shelf-environ-channel-list") - # We need to iterate over each channel. There are dozens of sensors.. + # This functions determines if the shelf belongs to the current filer + # Right now, the shelf is owned by the filer if it manages more disks than the partner on this shelf. + # In a 50:50 scenario the filer names are compared alphanumerically def shelf_is_mine(shelf_uid): mine = 0 partner = 0 if "netapp_api_disk" not in shared_data: return True - # TODO: We had a case where shelf_uid is not contained in shared_data["netapp_api_disk"]["shelf-uids"]. - # I (mk) do not know why. + cmp_name = False if shelf_uid not in shared_data["netapp_api_disk"]["shelf-uids"]: - return False - - for disk in shared_data["netapp_api_disk"]["shelf-uids"][shelf_uid]: - state = shared_data["netapp_api_disk"]["disks"].get(disk) - if state == "partner": - partner += 1 + # Could be an empty shelf without disks + cmp_name = True + else: + for disk in shared_data["netapp_api_disk"]["shelf-uids"][shelf_uid]: + state = shared_data["netapp_api_disk"]["disks"].get(disk) + if state == "partner": + partner += 1 + else: + mine += 1 + if mine == partner: + cmp_name = True else: - mine += 1 - return mine > partner + return mine > partner + + my_name = shared_data.get("netapp_api_version", {}).get("system-get-info", {}).get("system-name") + partner_name = shared_data.get("netapp_api_version", {}).get("system-get-info", {}).get("partner-system-name") + if my_name and partner_name: + return my_name > partner_name + else: + # As fallback, we always return true + # This means that the shelf is owned by both filers -> The sensor will be monitored twice + return True environ = {} + # We need to iterate over each channel. There are dozens of sensors.. for channel in channel_list.children_get(): channel_name = channel.child_get_string("channel-name") shelf_list = channel.child_get("shelf-environ-shelf-list") @@ -214,7 +237,7 @@ def output_environment(results): netapp_objects["netapp_api_environ"] = { "configs" : { "storage-shelf-environment-list-info": [] }, "output_function" : output_environment, - "requires" : "netapp_api_disk" # This object needs data from netapp_api_disk + "run_last" : True, } def output_vfiler(results): @@ -367,7 +390,7 @@ try: # Basic sorting is sufficient right now... elements = [] for entry in netapp_objects.items(): - if entry[1].get("requires"): + if entry[1].get("run_last"): elements.append(entry) else: elements.insert(0, entry)

8 years, 11 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015