Checkmk git commits May 2017

checkmk-commits@lists.checkmk.com

12 participants
254 discussions

4633 FIX jolokia_metrics.uptime: No longer crash when agent info is incomplete

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4998cd1d724454fabe65d58f17fca163c9b2db76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4998cd1d724454… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 24 16:14:31 2017 +0200 4633 FIX jolokia_metrics.uptime: No longer crash when agent info is incomplete Change-Id: Ib6be2fc49cc1b3fd8a69e823ffd16cada93e6c70 --- .werks/4633 | 11 +++++++++++ checks/jolokia_metrics | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/4633 b/.werks/4633 new file mode 100644 index 0000000..dc3459d --- /dev/null +++ b/.werks/4633 @@ -0,0 +1,11 @@ +Title: jolokia_metrics.uptime: No longer crash when agent info is incomplete +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495635204 + + diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics index 5b0f414..dad38d3 100644 --- a/checks/jolokia_metrics +++ b/checks/jolokia_metrics @@ -704,8 +704,9 @@ def check_jolokia_metrics_uptime(item, params, info): if parsed.get(item, "") == None: raise MKCounterWrapped("No information from Jolokia agent") if item in parsed: - uptime = int(parsed[item]['Uptime']) / 1000 - return check_uptime_seconds(params, uptime) + if "Uptime" in parsed[item]: + uptime = int(parsed[item]['Uptime']) / 1000 + return check_uptime_seconds(params, uptime) check_info["jolokia_metrics.uptime"] = {

7 years, 3 months

4632 FIX fsc_subsystems: No longer crash when statuscode is missing

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9db226d9c942531489a65792e4ee2c2fc93fd8fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9db226d9c94253… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 24 15:26:34 2017 +0200 4632 FIX fsc_subsystems: No longer crash when statuscode is missing Change-Id: Iba797dcb17b191095f4290e8c208d09400d1bc2a --- .werks/4632 | 11 +++++++++++ checks/fsc_subsystems | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/4632 b/.werks/4632 new file mode 100644 index 0000000..0d6eb5c --- /dev/null +++ b/.werks/4632 @@ -0,0 +1,11 @@ +Title: fsc_subsystems: No longer crash when statuscode is missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495632274 + + diff --git a/checks/fsc_subsystems b/checks/fsc_subsystems index f5ed71a..a3e3e37 100644 --- a/checks/fsc_subsystems +++ b/checks/fsc_subsystems @@ -33,6 +33,8 @@ def check_fsc_subsystems(item, params, info): for line in info: # , value1, value2 in info: name = line[0] if name != item: continue + if line[1] == u"": + return 3, "Status not found in SNMP data" status = int(line[1]) statusname = { 1:'ok', 2:'degraded', 3:'error', 4:'failed', 5:'unknown-init'}.get(status, 'invalid') if status == 1 or status == 5:

7 years, 3 months

4742 FIX wmi_cpuload: Added required tables to prevent crash

by Marcel Arentz

Module: check_mk Branch: master Commit: e2b0c4a31d47bb93f6ba06f8183e8b660c2a7cff URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2b0c4a31d47bb… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed May 24 15:11:50 2017 +0200 4742 FIX wmi_cpuload: Added required tables to prevent crash Until now the checkplugin created Services only if there are potential instancesi regardless if the needed information to compute these instances is available. This has been fixed now - Services are only created, if all necessary data is available. Change-Id: I6b97345b8c85d213c8299ba528e2b148a3d82f05 --- .werks/4742 | 13 +++++++++++++ checks/wmi_cpuload | 9 +++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/4742 b/.werks/4742 new file mode 100644 index 0000000..a71f219 --- /dev/null +++ b/.werks/4742 @@ -0,0 +1,13 @@ +Title: wmi_cpuload: Added required tables to prevent crash +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1495631029 +Class: fix + +Until now the checkplugin created Services only if there are potential +instancesi regardless if the needed information to compute these instances +is available. This has been fixed now - Services are only created, if all +necessary data is available. diff --git a/checks/wmi_cpuload b/checks/wmi_cpuload index e433a57..d120721 100644 --- a/checks/wmi_cpuload +++ b/checks/wmi_cpuload @@ -25,6 +25,11 @@ # Boston, MA 02110-1301 USA. +def inventory_wmi_cpuload(parsed): + return inventory_wmi_table(parsed, \ + required_tables = [ "computer_system", "system_perf" ]) + + def check_wmi_cpuload(item, params, parsed): # the processor queue length is logically similar to linux cpu load as # it states the number of processes waiting to be assigned cpu time. @@ -51,9 +56,9 @@ def check_wmi_cpuload(item, params, parsed): check_info['wmi_cpuload'] = { - 'inventory_function' : inventory_wmi_table, - 'check_function' : check_wmi_cpuload, 'parse_function' : parse_wmi_table, + 'inventory_function' : inventory_wmi_cpuload, + 'check_function' : check_wmi_cpuload, 'has_perfdata' : True, 'service_description' : "Processor Queue", 'includes' : ['wmi.include', 'cpu_load.include'],

7 years, 3 months

4631 FIX cisco_ace_rserver: Fix broken IP address parsing

by Konstantin Büttner

Module: check_mk Branch: master Commit: 43b81dec459c3c16738599fb15384efb779f2bbc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=43b81dec459c3c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed May 24 15:03:43 2017 +0200 4631 FIX cisco_ace_rserver: Fix broken IP address parsing Due to a change in the way SNMP is handled by Check_MK between versions 1.2.6 and 1.2.8, OIDs representing the IP address of the interface would now no longer be parsed (crash-free but incorrectly) and crash. This has been fixed. Re-discovery is required if and only if neither a description nor a name had been used as an item before. Change-Id: Ie552fd9efed593bf718ebd9cd47561ece44789e2 --- .werks/4631 | 16 ++++++++++++++++ checks/cisco_ace_rserver | 28 +++++++++++++++++++++++----- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/.werks/4631 b/.werks/4631 new file mode 100644 index 0000000..a78110b --- /dev/null +++ b/.werks/4631 @@ -0,0 +1,16 @@ +Title: cisco_ace_rserver: Fix broken IP address parsing +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495630510 + +Due to a change in the way SNMP is handled by Check_MK between +versions 1.2.6 and 1.2.8, OIDs representing the IP address of +the interface would now no longer be parsed (crash-free but +incorrectly) and crash. This has been fixed. +Re-discovery is required if and only if neither a description +nor a name had been used as an item before. diff --git a/checks/cisco_ace_rserver b/checks/cisco_ace_rserver index 49ae410..e23dc77 100644 --- a/checks/cisco_ace_rserver +++ b/checks/cisco_ace_rserver @@ -24,17 +24,34 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# Parse an InetAddress type object as defined in the SNMP-FRAMEWORK-MIB +def parse_framework_mib_inet_address(ip_address_type, ip_address): + if ip_address_type == 1: + return "%d.%d.%d.%d" % tuple(ip_address) + elif ip_address_type == 2: + return "%x:%x:%x:%x:%x:%x:%x:%x" % tuple(ip_address) + elif ip_address_type == 3: + return "%d.%d.%d.%d%%%d%d%d%d" % tuple(ip_address) + elif ip_address_type == 4: + return "%x:%x:%x:%x:%x:%x:%x:%x%%%d%d%d%d" % tuple(ip_address) + elif ip_address_type == 5: # Means DNS name - Reconvert to ASCII string + return "".join(map(chr,ip_address)) + elif ip_address_type == 0: # Unknown address type - represent as hex string + return "".join(map(lambda byte: "%x" % byte, ip_address)) + def inventory_cisco_ace_rserver(info): - for name, ip, descr, admin_status, oper_status, conns in info: + for name, ip_address_type, ip_address, descr, admin_status, oper_status, conns in info: + ip = parse_framework_mib_inet_address(int(ip_address_type), ip_address) if name != '': item = name elif descr != '': item = descr else: - item = socket.inet_ntoa(ip) + ip yield item, None + def check_cisco_ace_rserver(item, _no_params, info): admin_stati = { "1": "in service", @@ -62,8 +79,8 @@ def check_cisco_ace_rserver(item, _no_params, info): "18": (2, "max load reached"), } - for name, ip, descr, admin_status, oper_status, conns in info: - ip_addr = socket.inet_ntoa(ip) + for name, ip_address_type, ip_address, descr, admin_status, oper_status, conns in info: + ip_addr = parse_framework_mib_inet_address(ip_address_type, ip_address) if name == item or ip_addr == item or descr == item: admin_state = admin_stati[admin_status] state, state_txt = oper_stati[oper_status] @@ -82,7 +99,8 @@ check_info['cisco_ace_rserver'] = { "service_description" : "ACE RServer %s", "snmp_info" : ( ".1.3.6.1.4.1.9.9.470.1.1.1.1", [ # cesRserverEntry "1", # cesRserverName - "4", # cesRserverIpAddress + "3", # cesRserverIpAddressType + BINARY("4"), # cesRserverIpAddress "5", # cesRserverDescription "12", # cesRserverAdminStatus "13", # cesRserverOperStatus

7 years, 3 months

refactored dell_powerconnect_temp

by Marcel Arentz

Module: check_mk Branch: master Commit: 92e8f0a9cff39f4833345af212feb055f180c19f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=92e8f0a9cff39f… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed May 24 12:56:08 2017 +0200 refactored dell_powerconnect_temp Change-Id: I12def3fd52e8307503ad305133d03745fd3ab9a2 --- checks/dell_powerconnect_temp | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index f0cd9d4..e17319c 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -24,48 +24,43 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Tested with Dell PowerConnect 5448 and 5424 models. -# Relevant SNMP OIDs: +# Example: # .1.3.6.1.4.1.89.53.15.1.9.1 = INTEGER: 42 # .1.3.6.1.4.1.89.53.15.1.10.1 = INTEGER: ok(1) # Temperature is in Celcius by default. - -# Status codes: -# 1 => ok, -# 2 => unavailable, -# 3 => nonoperational, - -# GENERAL MAPS: -dell_powerconnect_temp_status_map = { '1': 'ok', '2': 'unavailable', '3': 'nonoperational' } -dell_powerconnect_temp_status2nagios_map = { '1': 0, '2': 1, '3': 2 } +# Tested with Dell PowerConnect 5448 and 5424 models. factory_settings["dell_powerconnect_temp_default_values"] = { "levels" : (35, 40), } -# Inventory all of the temperature sensors def inventory_dell_powerconnect_temp(checkname, info): for temp, state in info: - # use default variable as parameter. Note the quotes! - return [("Ambient", {})] + yield ( "Ambient", {} ) -# Execute a check against each sensor. def check_dell_powerconnect_temp(_no_item, params, info): + translate_status = { + '1' : (0, 'ok'), + '2' : (1, 'unavailable'), + '3' : (2, 'nonoperational'), + } for temp, state in info: return check_temperature(float(temp), params, "dell_powerconnect", - dev_status=dell_powerconnect_temp_status2nagios_map[state], - dev_status_name=dell_powerconnect_temp_status_map[state]) + dev_status=translate_status[state][0], + dev_status_name=translate_status[state][1]) check_info["dell_powerconnect_temp"] = { - "check_function" : check_dell_powerconnect_temp, "inventory_function" : inventory_dell_powerconnect_temp, + "check_function" : check_dell_powerconnect_temp, "service_description" : "Temperature %s", "default_levels_variable" : "dell_powerconnect_temp_default_values", "has_perfdata" : True, - "snmp_info" : (".1.3.6.1.4.1.89.53.15.1", ["9", "10"]), - "snmp_scan_function" : \ - lambda oid : ".1.3.6.1.4.1.674.10895" in oid(".1.3.6.1.2.1.1.2.0"), + "snmp_info" : (".1.3.6.1.4.1.89.53.15.1", [ + "9", # RADLAN-Physicaldescription-MIB::rlPhdUnitEnvParamTempSensorValue + "10" # RADLAN-Physicaldescription-MIB::rlPhdUnitEnvParamTempSensorStatus + ]), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.674.10895"), "group" : "temperature", }

7 years, 3 months

4741 FIX dell_powerconnect_temp: Fixed missing reference for computing the temperature

by Marcel Arentz

Module: check_mk Branch: master Commit: 9a525d7a93e68a89710dc5646178b064bd2d16d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a525d7a93e68a… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed May 24 12:59:08 2017 +0200 4741 FIX dell_powerconnect_temp: Fixed missing reference for computing the temperature Change-Id: I3a778c6814e950193bd804a583b3aafdc3a6b0b1 --- .werks/4741 | 10 ++++++++++ checks/dell_powerconnect_temp | 1 + 2 files changed, 11 insertions(+) diff --git a/.werks/4741 b/.werks/4741 new file mode 100644 index 0000000..2f7d1af --- /dev/null +++ b/.werks/4741 @@ -0,0 +1,10 @@ +Title: dell_powerconnect_temp: Fixed missing reference for computing the temperature +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1495623507 +Class: fix + + diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index e17319c..bc662b9 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -63,4 +63,5 @@ check_info["dell_powerconnect_temp"] = { ]), "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.674.10895"), "group" : "temperature", + "includes" : [ "temperature.include" ] }

7 years, 3 months

4748 FIX solaris_fmadm: Check was only discovered when an error is detected

by Lars Michelsen

Module: check_mk Branch: master Commit: 80c79eb9477cc1758850d19404f9a2bed3292c2a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80c79eb9477cc1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 12:55:28 2017 +0200 4748 FIX solaris_fmadm: Check was only discovered when an error is detected Change-Id: Id48845e15c6c6caff8bd10b7e6af605dfb8b4f76 --- .werks/4748 | 11 +++++++++++ agents/check_mk_agent.solaris | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4748 b/.werks/4748 new file mode 100644 index 0000000..6868ed4 --- /dev/null +++ b/.werks/4748 @@ -0,0 +1,11 @@ +Title: solaris_fmadm: Check was only discovered when an error is detected +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495623301 + + diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index dc4ec58..adacbaf 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -381,7 +381,7 @@ fi # Displaying Information About Faults or Defects # If there are no faults the output of this command will be empty. -if type fmadm faulty > /dev/null 2>&1 +if type fmadm >/dev/null 2>&1 then echo '<<<solaris_fmadm:sep(58)>>>' fmadm faulty

7 years, 3 months

4740 FIX mysql: Fixed crash if instance is not available anymore

by Marcel Arentz

Module: check_mk Branch: master Commit: a4ab176b8a634366587e678a5d7c1053c4fec809 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4ab176b8a6343… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed May 24 12:04:09 2017 +0200 4740 FIX mysql: Fixed crash if instance is not available anymore Change-Id: I43223fcee6b27baeb8f47e57d18afb8e2652518f --- .werks/4740 | 10 ++++++++++ checks/mysql | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/4740 b/.werks/4740 new file mode 100644 index 0000000..3764660 --- /dev/null +++ b/.werks/4740 @@ -0,0 +1,10 @@ +Title: mysql: Fixed crash if instance is not available anymore +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1495620206 +Class: fix + + diff --git a/checks/mysql b/checks/mysql index 5f51084..3fcd135 100644 --- a/checks/mysql +++ b/checks/mysql @@ -94,7 +94,7 @@ def inventory_mysql_version(parsed): yield instance, {} def check_mysql_version(item, _no_params, parsed): - if item in parsed: + if item in parsed and not len(parsed[item]) == 0: values = parsed[item] return 0, "Version: " + values['version'] @@ -125,7 +125,7 @@ check_info['mysql'] = { def check_mysql_sessions(item, params, parsed): - if item in parsed: + if item in parsed and not len(parsed[item]) == 0: values = parsed[item] total_sessions = values["Threads_connected"] running_sessions = values["Threads_running"]

7 years, 3 months

Fixed wrong function call

by Lars Michelsen

Module: check_mk Branch: master Commit: 14d8c222f1612d4a5c0bc81f0b346c94dcb3dc2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14d8c222f1612d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 24 11:49:27 2017 +0200 Fixed wrong function call Change-Id: If233ad770134ab7087515ee4ada9f02b6c5c75c4 --- web/htdocs/bi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index 6302a5b..df69103 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -276,7 +276,7 @@ class JobWorker(object): aggr_type, aggr_idx, groups = job["id"] log("Compilation finished %r - took %.3f sec" % (job["id"], time.time() - start_time)) except Exception, e: - log("MP-Worker Exception %s" % traceback.format_exception()) + log("MP-Worker Exception %s" % traceback.format_exc()) mp_errors.put("Aggregation error: %s" % traceback.format_exc()) finally: # Even in an error scenario we consider these hosts as compiled

7 years, 3 months

4664 FIX netapp_api_qtree_quota: Fixed NameError: name 'is_digit' is not defined

by Simon Betz

Module: check_mk Branch: master Commit: b542b4b786e33afb934c768df28c36f37f9944c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b542b4b786e33a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed May 24 11:37:41 2017 +0200 4664 FIX netapp_api_qtree_quota: Fixed NameError: name 'is_digit' is not defined Change-Id: I16c1352b41cd50d188402edcc5fbecc51e4e5110 --- .werks/4664 | 11 +++++++++++ checks/netapp_api_qtree_quota | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4664 b/.werks/4664 new file mode 100644 index 0000000..6e6ab0a --- /dev/null +++ b/.werks/4664 @@ -0,0 +1,11 @@ +Title: netapp_api_qtree_quota: Fixed NameError: name 'is_digit' is not defined +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1495618381 + + diff --git a/checks/netapp_api_qtree_quota b/checks/netapp_api_qtree_quota index 9742f81..659abfa 100644 --- a/checks/netapp_api_qtree_quota +++ b/checks/netapp_api_qtree_quota @@ -43,7 +43,7 @@ def check_netapp_api_qtree_quota(item, params, parsed): return 3, "Qtree not found in agent output" disk_limit = qtree.get("disk-limit") - if not disk_limit.is_digit(): + if not disk_limit.isdigit(): return 3, "Qtree has no disk limit set" size_total = int(disk_limit) / 1024.0

7 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2017