Checkmk git commits August 2015

checkmk-commits@lists.checkmk.com

7 participants
211 discussions

Check_MK Git: check_mk: esx_vsphere_counters: Fixed " NoneType object has no attribute" exception in vsphere check and discovery

by Lars Michelsen

Module: check_mk Branch: master Commit: 424817f429b509129b99787f791b72fb036d78fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=424817f429b509… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Aug 13 08:41:01 2015 +0200 esx_vsphere_counters: Fixed "NoneType object has no attribute" exception in vsphere check and discovery --- 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 e9b85a4..60a1ae6 100644 --- a/checks/esx_vsphere_counters +++ b/checks/esx_vsphere_counters @@ -134,7 +134,7 @@ def parse_esx_vsphere_counters(info): # esx datastores are either shown by human readable name (if available) or by the uid def esx_vsphere_counters_get_item_mapping(parsed): map_instance_to_item = {} - for instance in parsed.get("datastore.read").keys(): + for instance in parsed.get("datastore.read", {}).keys(): map_instance_to_item[instance] = instance for instance, values in parsed.get("datastore.name").items():

8 years, 10 months

Check_MK Git: check_mk: #2536 emc_isilon_fans, emc_isilon_temp, emc_isilon_temp.cpu: New checks for fans and temperatures of EMC Isilon

by Mathias Kettner

Module: check_mk Branch: master Commit: 52ec3c10336bf992ab25cbfa5cb43957870bf84c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=52ec3c10336bf9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 12 17:38:56 2015 +0200 #2536 emc_isilon_fans, emc_isilon_temp, emc_isilon_temp.cpu: New checks for fans and temperatures of EMC Isilon --- .werks/2536 | 9 ++++ ChangeLog | 1 + checkman/emc_isilon_fans | 13 +++++ checkman/emc_isilon_temp | 13 +++++ checkman/emc_isilon_temp.cpu | 13 +++++ checks/emc_isilon_fans | 65 +++++++++++++++++++++++ checks/emc_isilon_temp | 118 ++++++++++++++++++++++++++++++++++++++++++ checks/fan.include | 6 +-- checks/fsc_fans | 3 +- 9 files changed, 236 insertions(+), 5 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=52ec3c1033…

8 years, 10 months

Check_MK Git: check_mk: bvip_fans: Fix: was not configurable via WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: ef6ec1ee9d5066f97866159529887cb96b3d1b85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef6ec1ee9d5066… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 12 17:16:24 2015 +0200 bvip_fans: Fix: was not configurable via WATO --- checks/bvip_fans | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checks/bvip_fans b/checks/bvip_fans index c39b144..1685a31 100644 --- a/checks/bvip_fans +++ b/checks/bvip_fans @@ -44,7 +44,6 @@ check_info["bvip_fans"] = { "snmp_scan_function" : bvip_scan_function, "snmp_info" : (".1.3.6.1.4.1.3967.1.1.8.1", [OID_END, 1 ]), "includes" : [ 'bvip.include', 'fan.include' ], - "has_perfdata" : True, - "group" : "fan", + "group" : "hw_fans", }

8 years, 10 months

Check_MK Git: check_mk: #2535 if64adm: new variant of 64 that allows to take the admin status of the interface into account

by Mathias Kettner

Module: check_mk Branch: master Commit: f63591e69e505b95a5d16c8c1f9172d82f47ac31 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f63591e69e505b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 12 15:27:28 2015 +0200 #2535 if64adm: new variant of 64 that allows to take the admin status of the interface into account --- .werks/2535 | 9 ++++ ChangeLog | 1 + checkman/if64adm | 12 +++++ checks/if.include | 1 + checks/if64 | 70 ++++---------------------- checks/if64.include | 89 ++++++++++++++++++++++++++++++++++ checks/if64adm | 61 +++++++++++++++++++++++ pnp-templates/check_mk-if64adm.php | 1 + web/htdocs/lib.py | 3 +- web/plugins/metrics/check_mk.py | 1 + web/plugins/perfometer/check_mk.py | 1 + web/plugins/wato/check_parameters.py | 14 ++++-- 12 files changed, 197 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f63591e69e…

8 years, 10 months

Check_MK Git: check_mk: ipmi: allow empty rules

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3ca91192a3631834f1572f874d4b18d98cb9b0e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ca91192a36318… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Aug 12 14:55:41 2015 +0200 ipmi: allow empty rules --- checks/ipmi | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/checks/ipmi b/checks/ipmi index 98a823e..34b8e97 100644 --- a/checks/ipmi +++ b/checks/ipmi @@ -103,7 +103,11 @@ def ipmi_ignore_entry(name, state): def ignored_sensors(): # merge ignored sensor list specified here and those from wato ignored_sensors_combined = ipmi_ignored_sensors[:] - rules = host_extra_conf(g_hostname, inventory_ipmi_rules)[0] + try: + rules = host_extra_conf(g_hostname, inventory_ipmi_rules)[0] + except IndexError: + rules = {} + ignored_sensors_combined += rules.get("ignored_sensors", []) return ignored_sensors_combined @@ -115,15 +119,18 @@ def ipmi_ignore_entry(name, state): return False def inventory_ipmi(info): - rules = host_extra_conf(g_hostname, inventory_ipmi_rules)[0] + try: + rules = host_extra_conf(g_hostname, inventory_ipmi_rules)[0] + except IndexError: + rules = {} # the default for summarize is always true so if either configuration key has been set # to false that setting was changed by the user and needs to override the other if not ipmi_summarize or not rules.get("summarize", True) or len(info) == 0: - return [ ( line[0], None ) - for line in info - if not ipmi_ignore_entry(line[0], line[3]) ] + for line in info: + if not ipmi_ignore_entry(line[0], line[3]): + yield line[0], None else: - return [ ( "Summary", None ) ] + yield "Summary", None def check_ipmi(item, params, info): if item == "Summary":

8 years, 10 months

Check_MK Git: check_mk: fixes regarding encoding of non-ascii characters

by Sebastian Herbord

Module: check_mk Branch: master Commit: 3b988c3ca2c91eb0596899beea6a7dc27c3d7989 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b988c3ca2c91e… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Wed Aug 12 14:20:33 2015 +0200 fixes regarding encoding of non-ascii characters --- checks/allnet_ip_sensoric | 2 +- checks/fjdarye.include | 18 +++++++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/checks/allnet_ip_sensoric b/checks/allnet_ip_sensoric index 69e6109..4ec1eab 100644 --- a/checks/allnet_ip_sensoric +++ b/checks/allnet_ip_sensoric @@ -170,7 +170,7 @@ def inventory_allnet_ip_sensoric_temp(info): inventory = [] for sensor in parsed.keys(): if (parsed[sensor].get('function') and parsed[sensor]["function"] == "1") \ - or (parsed[sensor].get('unit') and parsed[sensor]['unit'] == '°C'): + or (parsed[sensor].get('unit') and parsed[sensor]['unit'] == u'°C'): item = allnet_ip_sensoric_compose_item(sensor, parsed[sensor]) inventory.append( (item, "allnet_ip_sensoric_temp_default_levels") ) return inventory diff --git a/checks/fjdarye.include b/checks/fjdarye.include index 3a6bce8..3f8364c 100644 --- a/checks/fjdarye.include +++ b/checks/fjdarye.include @@ -116,32 +116,28 @@ def check_fjdarye_disks(index, expected_status, info): return (3, "No status for disk number %d present" % index) def inventory_fjdarye_rluns(info): - inventory = [] for line in info: rawdata = line[1] - if rawdata[3] == '\xa0': # RLUN is present - inventory.append( (line[0], "", None) ) - return inventory + if rawdata[3] == u'\xa0': # RLUN is present + yield line[0], "", None def check_fjdarye_rluns(item, _no_params, info): for line in info: if item == line[0]: rawdata = line[1] - if rawdata[3] != '\xa0': + if rawdata[3] != u'\xa0': return (2, "RLUN is not present" ) - elif rawdata[2] == '\x08': + elif rawdata[2] == u'\x08': return (1, "RLUN is rebuilding") - elif rawdata[2] == '\x07': + elif rawdata[2] == u'\x07': return (1, "RLUN copyback in progress") - elif rawdata[2] == '\x41': + elif rawdata[2] == u'\x41': return (1, "RLUN spare is in use") - elif rawdata[2] == '\x00': + elif rawdata[2] == u'\x00': return (0, "RLUN is in normal state") # assumption else: return (2, "RLUN in unknown state %02x" % ord(rawdata[2]) ) - return (3, "No RLUN %s in SNMP output" % item) - fjdarye_sum_status = { 1: 'unknown', 2: 'unused', 3: 'ok', 4: 'warning', 5: 'failed' }

8 years, 10 months

Check_MK Git: check_mk: #2516 check juniper_trpz_aps: now lists also the sessions on the access points

by Simon Betz

Module: check_mk Branch: master Commit: fcbc22d992d8c6b6e2adbc9dd8a748a02a6c5df1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcbc22d992d8c6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Aug 11 17:43:31 2015 +0200 #2516 check juniper_trpz_aps: now lists also the sessions on the access points Now this check shows the total number of access points and sessions on the access points. Furthermore the check lists the access points and related sessions per node. --- .werks/2516 | 10 ++++++++++ ChangeLog | 1 + checkman/juniper_trpz_aps | 9 +++++++-- checks/juniper_trpz_aps | 33 +++++++++++++++++++++------------ 4 files changed, 39 insertions(+), 14 deletions(-) diff --git a/.werks/2516 b/.werks/2516 new file mode 100644 index 0000000..d3aba74 --- /dev/null +++ b/.werks/2516 @@ -0,0 +1,10 @@ +Title: check juniper_trpz_aps: now lists also the sessions on the access points +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1439307683 +Class: feature + +Now this check shows the total number of access points and sessions on the access points. +Furthermore the check lists the access points and related sessions per node. diff --git a/ChangeLog b/ChangeLog index d97e7b6..2d52dde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 1277 check_ldap: It is now possible to specify a alternative Hostname... * 1278 mssql_blocked_sessions: New Check to show blocked MSSQL Sessions * 1279 check_curl (treasures): Added NTLM support + * 2516 check juniper_trpz_aps: now lists also the sessions on the access points... * 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/checkman/juniper_trpz_aps b/checkman/juniper_trpz_aps index 4bf762f..d357845 100644 --- a/checkman/juniper_trpz_aps +++ b/checkman/juniper_trpz_aps @@ -4,8 +4,13 @@ catalog: hw/network/juniper license: GPL distribution: check_mk description: - Show the number of online access points registered on the controller. - This check is now cluster-aware. + Shows the number of online access points registered on the controller + and the sessions on the access point. + + This check is now cluster-aware: Displays the total number of active + access points and the total number of sessions on these access points. + Furthermore this check lists the online access points and related sessions + per node. inventory: One service for the number of access points diff --git a/checks/juniper_trpz_aps b/checks/juniper_trpz_aps index acc3c15..cfeca3e 100644 --- a/checks/juniper_trpz_aps +++ b/checks/juniper_trpz_aps @@ -28,28 +28,37 @@ def inventory_juniper_trpz_aps(info): return [ (None, None) ] def check_juniper_trpz_aps(_no_item, _no_params, info): - aps_sum = 0 + total_aps = 0 + total_sessions = 0 message = "" - for node, aps in info: - aps_sum += int(aps) - message += "%s access points online" % aps - + for node, aps, sessions in info: # Are we a cluster? if node != None: - message += " (on %s)," % node + message += "%s: " % node + + total_aps += int(aps) + total_sessions += int(sessions) + message += "%s access points online, %s sessions - " % (aps, sessions) + + if message.endswith(' - '): + message = message[:-3] - if message.endswith(','): - message = message[:-1] + if len(info) > 1: + infotext = "Total: %d access points, %d sessions (%s)" % (total_aps, total_sessions, message) + else: + infotext = message - return 0, message, [ ('ap_devices_total', aps_sum) ] + return 0, infotext, [ ('ap_devices_total', total_aps), ("total_sessions", total_sessions) ] check_info["juniper_trpz_aps"] = { "check_function" : check_juniper_trpz_aps, "inventory_function" : inventory_juniper_trpz_aps, "service_description" : "Access Points", "node_info" : True, + "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.14525.3.1"), - "snmp_info" : (".1.3.6.1.4.1.14525.4.5.1.1",[ - 1, #number of Access Points - ]) + "snmp_info" : (".1.3.6.1.4.1.14525.4", [ + "5.1.1.1", # number of active access points + "4.1.1.4", # number of sessions on active access points + ]), }

8 years, 10 months

Check_MK Git: check_mk: Allow missing uses_snmp info

by Lars Michelsen

Module: check_mk Branch: master Commit: d9740fd358db998ae608c4803df1352a31f45bd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d9740fd358db99… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 11 13:50:34 2015 +0200 Allow missing uses_snmp info --- web/htdocs/crash_reporting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index 6f6ee71..01048fa 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -287,7 +287,7 @@ def show_crashed_check_details(info): html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check Type")) html.write("<td>%s</td></tr>" % html.attrencode(details["check_type"])) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Uses SNMP")) - html.write("<td><pre>%s</pre></td></tr>" % (details["uses_snmp"] and _("Yes") or _("No"))) + html.write("<td><pre>%s</pre></td></tr>" % (details.get("uses_snmp", False) and _("Yes") or _("No"))) html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check Item")) html.write("<td>%s</td></tr>" % html.attrencode(details["item"])) html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Description"))

8 years, 10 months

Check_MK Git: check_mk: Add SNMP-Info to crash reports of SNMP based checks

by Lars Michelsen

Module: check_mk Branch: master Commit: aec6de545b626a119d6fd3d42712a6b08f0ce7a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aec6de545b626a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 11 13:47:08 2015 +0200 Add SNMP-Info to crash reports of SNMP based checks --- modules/check_mk_base.py | 20 +++++++++++++++----- web/htdocs/crash_reporting.py | 8 +++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 710152e..5c9c09b 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1444,14 +1444,17 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): # This is put into a directory per service. The content is then # put into a tarball, base64 encoded and put into the long output # of the check :-) -def create_crash_dump(hostname, check_name, item, params, description, info): +def create_crash_dump(hostname, check_type, item, params, description, info): text = "check failed - please submit a crash report!" try: crash_dir = var_dir + "/crashed_checks/" + hostname + "/" + description.replace("/", "\\") prepare_crash_dump_directory(crash_dir) - create_crash_dump_info_file(crash_dir, hostname, check_name, item, params, description, info, text) - write_crash_dump_agent_output(crash_dir, hostname) + create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, description, info, text) + if check_uses_snmp(check_type): + write_crash_dump_snmp_info(crash_dir, hostname, check_type) + else: + write_crash_dump_agent_output(crash_dir, hostname) text += "\n" + "Crash dump:\n" + pack_crash_dump(crash_dir) + "\n" except: @@ -1472,7 +1475,7 @@ def prepare_crash_dump_directory(crash_dir): pass -def create_crash_dump_info_file(crash_dir, hostname, check_name, item, params, description, info, text): +def create_crash_dump_info_file(crash_dir, hostname, check_type, item, params, description, info, text): exc_type, exc_value, exc_traceback = sys.exc_info() crash_info = { @@ -1487,9 +1490,10 @@ def create_crash_dump_info_file(crash_dir, hostname, check_name, item, params, d "check_output" : text, "host" : hostname, "description" : description, - "check_type" : check_name, + "check_type" : check_type, "item" : item, "params" : params, + "uses_snmp" : check_uses_snmp(check_type), }, } @@ -1524,6 +1528,12 @@ def get_os_info(): return "UNKNOWN" +def write_crash_dump_snmp_info(crash_dir, hostname, check_type): + cachefile = tcp_cache_dir + "/" + hostname + "." + check_type.split(".")[0] + if os.path.exists(cachefile): + file(crash_dir + "/snmp_info", "w").write(file(cachefile).read()) + + def write_crash_dump_agent_output(crash_dir, hostname): cachefile = tcp_cache_dir + "/" + hostname if os.path.exists(cachefile): diff --git a/web/htdocs/crash_reporting.py b/web/htdocs/crash_reporting.py index dd3ac6a..6f6ee71 100644 --- a/web/htdocs/crash_reporting.py +++ b/web/htdocs/crash_reporting.py @@ -286,11 +286,13 @@ def show_crashed_check_details(info): html.write("<td>%s</td></tr>" % html.attrencode(details["host"])) html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check Type")) html.write("<td>%s</td></tr>" % html.attrencode(details["check_type"])) - html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Check Item")) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Uses SNMP")) + html.write("<td><pre>%s</pre></td></tr>" % (details["uses_snmp"] and _("Yes") or _("No"))) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Check Item")) html.write("<td>%s</td></tr>" % html.attrencode(details["item"])) - html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Description")) + html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Description")) html.write("<td>%s</td></tr>" % html.attrencode(details["description"])) - html.write("<tr class=\"data even0\"><td class=\"left\">%s</td>" % _("Parameters")) + html.write("<tr class=\"data odd0\"><td class=\"left\">%s</td>" % _("Parameters")) html.write("<td><pre>%s</pre></td></tr>" % html.attrencode(format_params(details["params"]))) html.write("</table>")

8 years, 10 months

Check_MK Git: check_mk: Now also using Inline-SNMP for cmk --snmpwalk

by Lars Michelsen

Module: check_mk Branch: master Commit: 5ac733bd0338b38d23a43b6aec6669eced6b453f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ac733bd0338b3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Aug 11 13:19:34 2015 +0200 Now also using Inline-SNMP for cmk --snmpwalk --- modules/check_mk.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 57e500d..fcc24fd 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4212,10 +4212,15 @@ def do_snmpwalk_on(hostname, filename): try: verbose("Walk on \"%s\"..." % oid) - results = snmpwalk_on_suboid(hostname, ip, oid, hex_plain = True) - for oid, value in results: + if has_inline_snmp and use_inline_snmp: + rows = inline_snmpwalk_on_suboid(hostname, None, oid) + rows = inline_convert_rows_for_stored_walk(rows) + else: + rows = snmpwalk_on_suboid(hostname, ip, oid, hex_plain = True) + + for oid, value in rows: out.write("%s %s\n" % (oid, value)) - verbose("%d variables.\n" % len(results)) + verbose("%d variables.\n" % len(rows)) except: if opt_debug: raise

8 years, 10 months

← Newer
1
...
12
13
14
15
16
17
18
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2015