Checkmk git commits March 2017

checkmk-commits@lists.checkmk.com

11 participants
379 discussions

dell_poweredge_temp: Fix default params written into autochecks during discovery

by Konstantin Büttner

Module: check_mk Branch: master Commit: ef554ccfb988991f692a5a92e5c1d54c00f431aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef554ccfb98899… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 13 15:09:52 2017 +0100 dell_poweredge_temp: Fix default params written into autochecks during discovery Thanks to Robert Sander for the correction. Change-Id: Ie51277c29d0d8260f3b886391fffa9255b04970d --- checks/dell_poweredge_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/dell_poweredge_temp b/checks/dell_poweredge_temp index 663f590..ac3112e 100644 --- a/checks/dell_poweredge_temp +++ b/checks/dell_poweredge_temp @@ -38,7 +38,7 @@ def inventory_dell_poweredge_temp(info): for line in info: if line[2] != '1': # StateSettings not 'unknown' item = dell_poweredge_temp_makeitem(line[0], line[1], line[5]) - yield item, None + yield item, {} def check_dell_poweredge_temp(item, params, info):

7 years, 6 months

updated werk 4495

by Simon Betz

Module: check_mk Branch: master Commit: 40cc560110db15db3b080ca60cb725b342f30409 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40cc560110db15… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 15:15:13 2017 +0100 updated werk 4495 Change-Id: I56f4d9be412db1dedc76c2d9a3aa04f4dc2ed47b --- agents/windows/plugins/mk_mysql.vbs | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/windows/plugins/mk_mysql.vbs b/agents/windows/plugins/mk_mysql.vbs index f96691e..e695396 100644 --- a/agents/windows/plugins/mk_mysql.vbs +++ b/agents/windows/plugins/mk_mysql.vbs @@ -114,6 +114,7 @@ For Each instance In instances.Keys cmd = Replace(cmd, "mysqld""", "mysql""") cmd = Replace(cmd, "mysqld-nt""", "mysql""") cmd = Replace(cmd, "mysql""", "mysql.exe""") + cmd = Replace(cmd, "mysqld.exe""", "mysql.exe""") cmd = Left(cmd, InStr(cmd, "mysql.exe""")+9) If cfg_file <> "" Then cmd = cmd & " --defaults-extra-file=""" & cfg_file & """"

7 years, 6 months

Fixed event console command forwarding with nagios core.

by Sven Panne

Module: check_mk Branch: master Commit: 6458511ac6f7fe0aaa5ee19ed138d3d94f0f93b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6458511ac6f7fe… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Mar 13 13:31:21 2017 +0100 Fixed event console command forwarding with nagios core. Change-Id: I3a2f0eebd7e897755d1896dd87b98ee4cfee9942 --- livestatus/src/Store.cc | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/livestatus/src/Store.cc b/livestatus/src/Store.cc index 61528e1..abed132 100644 --- a/livestatus/src/Store.cc +++ b/livestatus/src/Store.cc @@ -243,26 +243,22 @@ bool Store::handleCommand(const string &command) { // COMMAND [1462191638] MK_LOGWATCH_ACKNOWLEDGE;host123;\var\log\syslog if (parts.size() != 3) { Warning(_logger) << "MK_LOGWATCH_ACKNOWLEDGE expects 2 arguments"; - return false; + } else { + extern char g_mk_logwatch_path[]; + mk_logwatch_acknowledge(_logger, g_mk_logwatch_path, parts[1], + parts[2]); } - extern char g_mk_logwatch_path[]; - mk_logwatch_acknowledge(_logger, g_mk_logwatch_path, parts[1], - parts[2]); return true; } if (starts_with(command_name, "EC_")) { - if (parts.size() != 1) { - Warning(_logger) << command_name << "expects 0 arguments"; - return false; - } - if (_core->mkeventdEnabled()) { - ECTableConnection(_logger, _core->mkeventdSocketPath(), - "COMMAND " + command_name.substr(3)) - .run(); - } else { + if (!_core->mkeventdEnabled()) { Notice(_logger) << "event console disabled, ignoring command '" << command << "'"; + } else { + ECTableConnection(_logger, _core->mkeventdSocketPath(), + "COMMAND " + command.substr(3)) + .run(); } return true; }

7 years, 6 months

4536 FIX akcp_sensor_humidity: Crash if parameters are set

by Marcel Arentz

Module: check_mk Branch: master Commit: ec6021bc812721d507dc1b4c3af650e88935d3f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec6021bc812721… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 14:26:18 2017 +0100 4536 FIX akcp_sensor_humidity: Crash if parameters are set Change-Id: I33913ecc53af93444a5df3323016c7e48052cdb3 --- .werks/4536 | 10 ++++++++++ checks/akcp_sensor.include | 10 +++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.werks/4536 b/.werks/4536 new file mode 100644 index 0000000..b81af55 --- /dev/null +++ b/.werks/4536 @@ -0,0 +1,10 @@ +Title: akcp_sensor_humidity: Crash if parameters are set +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489411528 +Class: fix + + diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 7c5245d..427d00f 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -77,6 +77,13 @@ def inventory_akcp_humidity(info): yield description, "akcp_humidity_defaultlevels" def check_akcp_humidity(item, params, info): + if isinstance(params, tuple): + params = { + "levels_lower" : (params[1], params[0]), + "levels" : (params[3], params[2]), + } + + for description, percent, status, online in info: if description == item: # Online is set to "2" if sensor is offline @@ -87,7 +94,8 @@ def check_akcp_humidity(item, params, info): state, state_name = akcp_sensor_level_states[status] return state, "State: %s" % state_name - crit_lower, warn_lower, warn, crit = params + crit_lower, warn_lower = params['levels_lower'] + warn, crit = params['levels'] humidity = int(percent) infotext = "%s%%" % humidity

7 years, 6 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: 98d627e5490928c0369a62d9c0e139d2470018b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=98d627e5490928… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 14:25:22 2017 +0100 Reserved 10 Werk IDS Change-Id: If3b2c26d78d5417171de00b359d7a7de9f3f923e --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 1313386..42e82cc 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4536 +4546

7 years, 6 months

4352 FIX akcp_exp_temp, akcp_sensor_temp: No longer crash when temperature information is missing.

by Konstantin Büttner

Module: check_mk Branch: master Commit: baa3383a42441ee7b03969887d45ff8a2af11172 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=baa3383a42441e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Mar 13 14:09:27 2017 +0100 4352 FIX akcp_exp_temp, akcp_sensor_temp: No longer crash when temperature information is missing. Change-Id: I4f22655783cc41a9c9f786f639e432c1337c28b2 --- .werks/4352 | 11 +++++++++++ checks/akcp_sensor.include | 2 ++ 2 files changed, 13 insertions(+) diff --git a/.werks/4352 b/.werks/4352 new file mode 100644 index 0000000..c35aafd --- /dev/null +++ b/.werks/4352 @@ -0,0 +1,11 @@ +Title: akcp_exp_temp, akcp_sensor_temp: No longer crash when temperature information is missing. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1489410378 + + diff --git a/checks/akcp_sensor.include b/checks/akcp_sensor.include index 586633d..7c5245d 100644 --- a/checks/akcp_sensor.include +++ b/checks/akcp_sensor.include @@ -164,6 +164,8 @@ def check_akcp_sensor_temp(item, params, info): if degreeraw and degreeraw != "0": temperature = float(degreeraw) / 10.0 + elif not degree: + return 3, "Temperature information not found" else: temperature = float(degree)

7 years, 6 months

4445 FIX cisco_cpu: Fixed crash if values are empty

by Marcel Arentz

Module: check_mk Branch: master Commit: daa5fecc80bbb1277c99b6648a8521d23255d9b1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daa5fecc80bbb1… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 13:46:34 2017 +0100 4445 FIX cisco_cpu: Fixed crash if values are empty The checkplugin now also deals with empty values. See werk #2088 for more information. Change-Id: If8c32174da63ed7f26be6189b9f719fe12e7f756 --- checks/cisco_cpu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/cisco_cpu b/checks/cisco_cpu index 0eea5af..a911b70 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -31,8 +31,8 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): if info and \ - value1 = info[0][0].isdigit() and \ - value2 = info[0][1].isdigit(): + info[0][0].isdigit() and \ + info[0][1].isdigit(): return [( None, 'cisco_cpu_default_levels') ] def check_cisco_cpu(item, params, info):

7 years, 6 months

dhcp_pools: adapted levels handling to our convention

by Simon Betz

Module: check_mk Branch: master Commit: b34b3fbff612c1fdc5648529eb524401be2a24de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b34b3fbff612c1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 13:47:16 2017 +0100 dhcp_pools: adapted levels handling to our convention Change-Id: I2ac661743f4a9acfb5ff7cc83992cf333d6b5f48 --- checks/dhcp_pools.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/dhcp_pools.include b/checks/dhcp_pools.include index e348b2c..ba09260 100644 --- a/checks/dhcp_pools.include +++ b/checks/dhcp_pools.include @@ -62,9 +62,9 @@ def check_dhcp_pools_levels(free, used, pending, size, params): warn_abs = warn crit_abs = crit - if value <= crit: + if value < crit: state = 2 - elif value <= warn: + elif value < warn: state = 1 if state:

7 years, 6 months

4445 FIX cisco_cpu: Fixed crash if values are empty

by Marcel Arentz

Module: check_mk Branch: master Commit: 4083b6e3315cb5aa50bd53b3cc1508f14066a907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4083b6e3315cb5… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Mar 13 13:46:34 2017 +0100 4445 FIX cisco_cpu: Fixed crash if values are empty The checkplugin now also deals with empty values. See werk #2088 for more information. Change-Id: If8c32174da63ed7f26be6189b9f719fe12e7f756 --- .werks/4445 | 11 +++++++++++ checks/cisco_cpu | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/4445 b/.werks/4445 new file mode 100644 index 0000000..fa23d70 --- /dev/null +++ b/.werks/4445 @@ -0,0 +1,11 @@ +Title: cisco_cpu: Fixed crash if values are empty +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1489409114 +Class: fix + +The checkplugin now also deals with empty values. See werk #2088 for more +information. diff --git a/checks/cisco_cpu b/checks/cisco_cpu index 817cbc5..0eea5af 100644 --- a/checks/cisco_cpu +++ b/checks/cisco_cpu @@ -30,11 +30,15 @@ cisco_cpu_default_levels = (80.0, 90.0) def inventory_cisco_cpu(info): - if info and info[0] != [None, None]: + if info and \ + value1 = info[0][0].isdigit() and \ + value2 = info[0][1].isdigit(): return [( None, 'cisco_cpu_default_levels') ] def check_cisco_cpu(item, params, info): - if info[0] == [None, None]: + # Value of info could be (None, None) or ("", ""). + if not info[0][0].isdigit() and \ + not info[0][1].isdigit(): return 3, 'No information about the CPU utilization available' if info[0][1]:

7 years, 6 months

4520 FIX avaya_45xx_temp: Fixed wrong temperature unit and value handling

by Simon Betz

Module: check_mk Branch: master Commit: 70f9c48ce484ad4184bd30d43369dd785be47c88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70f9c48ce484ad… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Mar 13 13:42:33 2017 +0100 4520 FIX avaya_45xx_temp: Fixed wrong temperature unit and value handling Change-Id: I70b4a0498ebcd0babf555de4f916c55afd3dfa7f --- .werks/4520 | 11 +++++++++++ checks/avaya_45xx_temp | 12 ++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/4520 b/.werks/4520 new file mode 100644 index 0000000..6d4495b --- /dev/null +++ b/.werks/4520 @@ -0,0 +1,11 @@ +Title: avaya_45xx_temp: Fixed wrong temperature unit and value handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.4.0b4 +Date: 1489408727 + + diff --git a/checks/avaya_45xx_temp b/checks/avaya_45xx_temp index 6ccb47d..0ddd0de 100644 --- a/checks/avaya_45xx_temp +++ b/checks/avaya_45xx_temp @@ -36,8 +36,8 @@ def inventory_avaya_45xx_temp(info): def check_avaya_45xx_temp(item, params, info): for idx, temp in enumerate(info): if str(idx) == item: - return check_temperature(int(temp[0]), params, - "avaya_45xx_temp_%s" % item, dev_unit = "f") + return check_temperature(float(temp[0])/2.0, params, + "avaya_45xx_temp_%s" % item) check_info["avaya_45xx_temp"] = { "check_function": check_avaya_45xx_temp, @@ -46,8 +46,12 @@ check_info["avaya_45xx_temp"] = { "default_levels_variable": "avaya_45xx_temp_temp_default_levels", "has_perfdata": True, "group": "temperature", - # S5-CHASSIS-MIB - "snmp_info": ( ".1.3.6.1.4.1.45.1.6.3.7.1.1.5", [ 5 ] ), # Temperature in Fahrenheit + # S5-CHASSIS-MIB::s5ChasTmpSnrTmpValue + # The current temperature value of the temperature + # sensor. This is measured in units of a half degree + # centigrade, e.g. a value of 121 indicates a temperature + # of 60.5 degrees C. + "snmp_info": ( ".1.3.6.1.4.1.45.1.6.3.7.1.1.5", [ 5 ] ), "snmp_scan_function": lambda oid: ".1.3.6.1.4.1.45.3" in oid(".1.3.6.1.2.1.1.2.0"), "includes": [ "temperature.include" ], }

7 years, 6 months

← Newer
1
...
15
16
17
18
19
20
21
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2017