Checkmk git commits October 2014

checkmk-commits@lists.checkmk.com

6 participants
310 discussions

Check_MK Git: check_mk: Updated bug entries #2167

by Andreas Boesl

Module: check_mk Branch: master Commit: 72ce3f0e5c2e02356cbaee2bc753f0eca91bab7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72ce3f0e5c2e02… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Oct 2 10:40:18 2014 +0200 Updated bug entries #2167 --- .bugs/2167 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.bugs/2167 b/.bugs/2167 new file mode 100644 index 0000000..5a97049 --- /dev/null +++ b/.bugs/2167 @@ -0,0 +1,12 @@ +Title: Edit view: Unable to save because of an empty selection +Component: multisite +State: open +Date: 2014-10-02 10:37:41 +Targetversion: future +Class: bug + +1) Edit any view +2) Press "Add column". Do not select an entry +3) Press "Save" causes an empty selection warning +4) Remove this empty selection +5) Press "Save" -> Warning persists

9 years, 8 months

Check_MK Git: check_mk: #1122 FIX windows agent: unicode logfile monitoring : now able to detect incomplete written lines

by Andreas Boesl

Module: check_mk Branch: master Commit: 6758bacec9c5827af5b288683bf6dc965e7f28d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6758bacec9c582… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Oct 1 17:53:43 2014 +0200 #1122 FIX windows agent: unicode logfile monitoring: now able to detect incomplete written lines There were instances where a logline was not fully written to a unicode file. For example C+: This is the first line This is the sec C-: In this scenario the agent is not allowed to parse the second line, because it has not been fully written to disk yet. A complete line is considered to be finished with a carriage return followed by a newline.<br><br> With this update the agent now stops parsing after the first line and continues at the start of the second line on the following agent query. Note: This only applies to utf-8 files --- .werks/1122 | 23 ++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 90 ++++++++++++++-------- agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 160067 -> 160117 bytes agents/windows/install_agent.exe | Bin 156984 -> 157057 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 12 files changed, 85 insertions(+), 31 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6758bacec9…

9 years, 8 months

Check_MK Git: check_mk: wagner_titanus_topsense: Now uses temperature. include

by Konstantin Büttner

Module: check_mk Branch: master Commit: a3a4b390fb5e1e0ba0bf1b9b43d3dbce71307cc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3a4b390fb5e1e… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 16:41:13 2014 +0200 wagner_titanus_topsense: Now uses temperature.include --- checks/wagner_titanus_topsense | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/checks/wagner_titanus_topsense b/checks/wagner_titanus_topsense index 0c2d4d2..8f4229e 100644 --- a/checks/wagner_titanus_topsense +++ b/checks/wagner_titanus_topsense @@ -313,32 +313,24 @@ def inventory_wagner_titanus_topsense_temp(info): ("2", "wagner_titanus_topsense_temperature_default_values") ] def check_wagner_titanus_topsense_temp(item, params, info): - warn, crit = params - status=0 if item == "1": temp = float(info[2][0][7]) elif item == "2": temp = float(info[2][0][8]) else: - return 3, "Temperature Detector %s not found in SNMP" % item - - if temp >= warn: - status = 1 - if temp >= crit: - status = 2 - - perfdata = [("temp", temp, warn, crit)] + return - return status, "Temperature is %0.1f °C" % temp, perfdata + return check_temperature(temp, params) check_info["wagner_titanus_topsense.temp"] = { "check_function" : check_wagner_titanus_topsense_temp, "inventory_function" : inventory_wagner_titanus_topsense_temp, - "service_description" : "Temperature Detector %s", + "service_description" : "Temperature %s", "has_perfdata" : True, "group" : "room_temperature", "snmp_info" : wagner_titanus_topsense_info, - "snmp_scan_function" : wagner_titanus_topsense_scan + "snmp_scan_function" : wagner_titanus_topsense_scan, + "includes" : [ "temperature.include" ], } #.

9 years, 8 months

Check_MK Git: check_mk: smart: Temperature check now uses temperature. include

by Konstantin Büttner

Module: check_mk Branch: master Commit: c9529572ee21965d0fd154a3cac7e16901ae91c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9529572ee2196… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 15:38:21 2014 +0200 smart: Temperature check now uses temperature.include --- checks/smart | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/checks/smart b/checks/smart index 579365b..1dfde49 100644 --- a/checks/smart +++ b/checks/smart @@ -149,19 +149,10 @@ def inventory_smart_temp(info): def check_smart_temp(item, params, info): disks = parse_smart(info) if item not in disks: - return 3, "Disk not found" - disk = disks[item] + return - celsius = disk["Temperature_Celsius"] - warn, crit = params - perfdata = [ ( "temp", celsius, warn, crit ) ] - if celsius >= crit: - state = 2 - elif celsius >= warn: - state = 1 - else: - state = 0 - return state, "Temperature is %dC" % celsius, perfdata + disk = disks[item] + return check_temperature(disk["Temperature_Celsius"], params) check_info["smart.temp"] = { 'check_function': check_smart_temp, @@ -169,4 +160,5 @@ check_info["smart.temp"] = { 'service_description': 'Temperature SMART %s', 'group': 'disk_temperature', 'has_perfdata': True, + 'includes': [ 'temperature.include' ], }

9 years, 8 months

Check_MK Git: check_mk: nvidia: Temperature check now uses temperature. include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 7428b1bc1856892ccb625cb55ac8592f086ee165 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7428b1bc185689… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 15:37:42 2014 +0200 nvidia: Temperature check now uses temperature.include --- checks/nvidia | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/checks/nvidia b/checks/nvidia index 8fb5fc8..793778e 100644 --- a/checks/nvidia +++ b/checks/nvidia @@ -39,21 +39,15 @@ def check_nvidia_temp(item, params, info): warn, crit = params[2:4] else: warn, crit = params[0:2] - infotext = "%dC - levels at %d/%d" % (temp, warn, crit) - perfdata = [ ("temp", temp, warn, crit ) ] - if temp >= crit: - return (2, infotext, perfdata) - elif temp >= warn: - return (1, infotext, perfdata) - else: - return (0, infotext, perfdata) - return (3, 'sensor not found in agent output') + + return check_temperature(temp, (warn, crit)) check_info["nvidia.temp"] = { 'check_function': check_nvidia_temp, 'inventory_function': inventory_nvidia_temp, 'service_description': 'Temperature NVIDIA %s', 'has_perfdata': True, + 'includes': [ 'temperature.include' ], }

9 years, 8 months

Check_MK Git: check_mk: Fix exception when core is Nagios

by Mathias Kettner

Module: check_mk Branch: master Commit: 236544ae6c5f34e37a42150015025557efbafa45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=236544ae6c5f34… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 1 15:34:57 2014 +0200 Fix exception when core is Nagios --- modules/check_mk.py | 3 --- modules/check_mk_base.py | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 6c1b1c3..40acf4b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -719,9 +719,6 @@ def get_snmp_character_encoding(hostname): if len(entries) > 0: return entries[0] -def check_uses_snmp(check_type): - return snmp_info.get(check_type.split(".")[0]) != None - def is_snmp_host(hostname): return in_binary_hostlist(hostname, snmp_hosts) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index da5a01f..b081296 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1585,6 +1585,9 @@ def nodes_of(hostname): g_nodesof_cache[hostname] = None return None +def check_uses_snmp(check_type): + return snmp_info.get(check_type.split(".")[0]) != None + def pnp_cleanup(s): return s \ .replace(' ', '_') \

9 years, 8 months

Check_MK Git: check_mk: kernel: Fix invalid exception in case of simulated agent output

by Mathias Kettner

Module: check_mk Branch: master Commit: b1addafa45ae12e2f2ea7cb01702e2ed896fe457 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1addafa45ae12… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Oct 1 15:12:09 2014 +0200 kernel: Fix invalid exception in case of simulated agent output --- checks/kernel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/kernel b/checks/kernel index 3a3c804..6135420 100644 --- a/checks/kernel +++ b/checks/kernel @@ -155,7 +155,7 @@ def kernel_check_cpu_utilization(item, params, info): sum_jiffies = sum(diff_values[0:7]) # do not account for steal! if sum_jiffies == 0: - raise MKCounterException(None, "Too short time difference since last check") + raise MKCounterWrapped(None, "Too short time difference since last check") user = diff_values[0] + diff_values[1] # add user + nice system = diff_values[2]

9 years, 8 months

Check_MK Git: check_mk: knuerr_rms_temp: Now uses temperature.include

by Konstantin Büttner

Module: check_mk Branch: master Commit: 0ce8af5430bf23d5909ab765a042083525c403ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ce8af5430bf23… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 14:50:45 2014 +0200 knuerr_rms_temp: Now uses temperature.include --- checks/knuerr_rms_temp | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/checks/knuerr_rms_temp b/checks/knuerr_rms_temp index e08d6d6..bb81c2c 100644 --- a/checks/knuerr_rms_temp +++ b/checks/knuerr_rms_temp @@ -24,26 +24,19 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -knuerr_rms_temp_default_levels = ( 30, 35 ) +knuerr_rms_temp_default_levels = (30, 35) + def inventory_knuerr_rms_temp(info): - return [ ( None, 'knuerr_rms_temp_default_levels') ] + return [ (None, 'knuerr_rms_temp_default_levels') ] + def check_knuerr_rms_temp(_no_item, params, info): - name, reading = info[0] - reading = float(reading) / 10 - warn, crit = params - infotext = "Current Temperature: %.1f°C on Sensor %s" % ( reading, name ) - levels = ' (Warn/Crit at %s/%s)' % ( warn, crit ) - perfdata = [ ('temp', reading, warn, crit ) ] - state = 0 - if reading >= crit: - state = 2 - infotext += levels - elif reading >= warn: - state = 1 - infotext += levels - return state, infotext, perfdata + name, rawtemp = info[0] + status, infotext, perfdata = check_temperature(float(rawtemp) / 10, params) + infotext += " (%s)" % name + return status, infotext, perfdata + check_info["knuerr_rms_temp"] = { "check_function" : check_knuerr_rms_temp, @@ -51,7 +44,8 @@ check_info["knuerr_rms_temp"] = { "service_description" : "Temperature", "has_perfdata" : True, "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.3711.15.1", - "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1" , [ 2 , 4 ]), - "group" : "hw_single_temperature" + "snmp_info" : ( ".1.3.6.1.4.1.3711.15.1.1.1.1", [2, 4]), + "group" : "hw_single_temperature", + "includes" : [ "temperature.include" ], }

9 years, 8 months

Check_MK Git: check_mk: temperature.include: Added fahrenheit_to_celsius conversion function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 922d3919abc0f41b9fd554f4c4086aee8486d35a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=922d3919abc0f4… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 11:54:43 2014 +0200 temperature.include: Added fahrenheit_to_celsius conversion function --- checks/temperature.include | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/temperature.include b/checks/temperature.include index 3db199e..3020d78 100644 --- a/checks/temperature.include +++ b/checks/temperature.include @@ -24,7 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Checks Temperature against crit/warn levels defined in params. temp must + +def fahrenheit_to_celsius(tempf): + return (float(tempf) - 32) * (5.0 / 9.0) + + +# Checks Celsius temperature against crit/warn levels defined in params. temp must # be int or float def check_temperature(temp, params):

9 years, 9 months

Check_MK Git: check_mk: hwg_temp: Reworked to use include function

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2b570e2dce03bb67e5ec97a961aff1fb8b8733f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b570e2dce03bb… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Oct 1 11:50:10 2014 +0200 hwg_temp: Reworked to use include function --- checks/hwg_temp | 60 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/checks/hwg_temp b/checks/hwg_temp index e29dd8b..e397a76 100644 --- a/checks/hwg_temp +++ b/checks/hwg_temp @@ -28,11 +28,12 @@ hwg_temp_defaultlevels = (23, 25) def inventory_hwg_temp(info): - return [ (line[0], "hwg_temp_defaultlevels" ) for line in info if int(line[2]) != 0] + return [ (line[0], "hwg_temp_defaultlevels") + for line in info + if int(line[2]) != 0 and line[5] in ["1", "2", "3"] ] def check_hwg_temp(item, params, info): - warn, crit = params status_text = { "0" : "Invalid", "1" : "Normal", @@ -40,36 +41,42 @@ def check_hwg_temp(item, params, info): "3" : "Out Of Range High", "4" : "Alarm Low", "5" : "Alarm High", - } + } + unit_text = { "0" : "unknown", "1" : "°C", "2" : "°F", "3" : "°K", "4" : "%", - } - for line in info: - if line[0] == item: - descr, status, current, current_m, unit = line[1:] - current_state = savefloat(current_m)/10 + } + + # Nomenclature in this check: sensorstatus is what the device sends, state is what the check returns. + for index, descr, sensorstatus, current, unit in info: + if index == item: + tempval = float(current) + if unit == "2": + temp = fahrenheit_to_celsius(tempval) + elif unit == "3": + temp = tempval - 273.15 + elif unit == "4": + return + else: + temp = tempval + + state, infotext, perfdata = check_temperature(temp, params) + if descr: + infotext += " (%s)" % descr + yield state, infotext, perfdata - state = 0 - if current_state >= crit: - state = 2 - elif current_state >= warn: - state = 1 - elif status in ('4', '2'): - state = 1 - elif status in('0', '3', '5'): - state = 2 + if sensorstatus != '1': + if sensorstatus in ['2', '3', '4', '5']: + state = 2 + else: + state = 3 - perfdata = [ ("temp", current, warn, crit, 0 ) ] - unit = unit_text.get(unit) - status = status_text.get(status, "UNKOWN") - return(state, "%s at %s%s (warn/crit at %s%s/%s%s), Status is %s" % \ - (descr, current, unit, warn, unit, crit, unit, status), perfdata) + yield state, "Status is %s" % status_text.get(sensorstatus, "UNKNOWN") - return (3, "Sensor %s not found in SNMP data %s" % (item) ) check_info['hwg_temp'] = { "check_function" : check_hwg_temp, @@ -84,12 +91,11 @@ check_info['hwg_temp'] = { "1.3", # current value string "1.4", - # current value*10 integer - "1.5", # sensor unit integer 0=unknown, 1=°C, 2=°F, 3=°K, 4=% "1.7", ]), - "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), - "group" : "room_temperature", + "snmp_scan_function" : lambda oid: "hwg" in oid(".1.3.6.1.2.1.1.1.0").lower(), + "group" : "room_temperature", + "includes" : [ "temperature.include" ], }

9 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2014