Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: 14c66b1cf1a0cd8fb9786f1a907ca707b2c8a187 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14c66b1cf1a0cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 16:20:26 2015 +0100 Updated bug entries #2324 --- .bugs/2324 | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/.bugs/2324 b/.bugs/2324 new file mode 100644 index 0000000..ffd72a1 --- /dev/null +++ b/.bugs/2324 @@ -0,0 +1,42 @@ +Title: Generalize file io handling and catch various issues in a general way +Component: core +State: open +Date: 2015-12-02 16:18:27 +Targetversion: 1.2.7 +Class: bug + +Some general errors like: + +- No write permissions +- Disk full +- Disk read-only + +e.g. + +I hereby send you a report of a crash in the Check_MK Web GUI: + +Check_MK Version: 1.2.6p1 +Page: wato.py + +GET/POST-Variables: + _action=toggle + _transid=1442590858/4266942189 + _varname=enable_rulebased_notifications + folder= + mode=globalvars + +Traceback (most recent call last): + File "/usr/share/check_mk/web/htdocs/index.py", line 250, in handler + handler() + File "/usr/share/check_mk/web/htdocs/wato.py", line 235, in page_handler + result = modefunc("action") + File "/usr/share/check_mk/web/htdocs/wato.py", line 7451, in mode_globalvars + save_configuration_settings(current_settings) + File "/usr/share/check_mk/web/htdocs/wato.py", line 7761, in save_configuration_settings + save_configuration_vars(per_domain.get(domain, {}), dir + "global.mk") + File "/usr/share/check_mk/web/htdocs/wato.py", line 7765, in save_configuration_vars + out.write("# Written by WATO\n# encoding: utf-8\n\n") +IOError: [Errno 28] No space left on device + +could be handled in a better way. +We should abstract file io and handle these errors in a general way.

8 years, 9 months

dell_powerconnect_temp: Fixed unicode problem

by Bastian Kuhn

Module: check_mk Branch: master Commit: 15f2d24b265f9b7b776748653ee61ec49cd5b76d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15f2d24b265f9b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 2 16:10:10 2015 +0100 dell_powerconnect_temp: Fixed unicode problem --- checks/dell_powerconnect_temp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/dell_powerconnect_temp b/checks/dell_powerconnect_temp index 7a430cb..a7abacf 100644 --- a/checks/dell_powerconnect_temp +++ b/checks/dell_powerconnect_temp @@ -78,7 +78,7 @@ def check_dell_powerconnect_temp(_no_item, params, info): else: status = dell_powerconnect_temp_status2nagios_map[dell_powerconnect_status] - return (status, 'The temperature sensor is currently (%s)%s, and the current temperature is %s °C%s' % + return (status, u'The temperature sensor is currently (%s)%s, and the current temperature is %s °C%s' % (dell_powerconnect_temp_status_map[state], sensor_info, temp, temp_info), [ ("temperature", int(temp), warn, crit, 0, 200), ])

8 years, 9 months

#2805 FIX ps: Now able to monitor processes which contain + characters

by Andreas Boesl

Module: check_mk Branch: master Commit: 91f1cfb7d543f79a18552a193ed3ac5ad0973176 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91f1cfb7d543f7… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 2 15:56:15 2015 +0100 #2805 FIX ps: Now able to monitor processes which contain + characters Any + character in process name, e.g <i>asm_diag_+ASM1</i> was interpreted as regular expression special character. Such processes could be found during the service discovery. The check function however, was unable to find this process again, because of the incorrect escaped + character. --- .werks/2805 | 14 ++++++++++++++ ChangeLog | 1 + checks/ps.include | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/2805 b/.werks/2805 new file mode 100644 index 0000000..fa7e53f --- /dev/null +++ b/.werks/2805 @@ -0,0 +1,14 @@ +Title: ps: Now able to monitor processes which contain + characters +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449067758 +Class: fix + +Any + character in process name, e.g <i>asm_diag_+ASM1</i> was interpreted +as regular expression special character. + +Such processes could be found during the service discovery. +The check function however, was unable to find this process again, because +of the incorrect escaped + character. diff --git a/ChangeLog b/ChangeLog index 3b4d145..be7800d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,7 @@ * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... * 2875 FIX: citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins * 2857 FIX: fritz.conn: Handling missing connection state infos as UNKNOWN + * 2805 FIX: ps: Now able to monitor processes which contain + characters... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ps.include b/checks/ps.include index 5ebc422..86b3bf6 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -153,7 +153,7 @@ def instantiate_regex_pattern_once(pattern, match): def escape_regex_chars(match): r = "" for c in match: - if c in r"[]\().?{}|*^$": + if c in r"[]\().?{}|*^$+": r += "\\" r += c return r

8 years, 9 months

#2876 FIX mk_logwatch: Avoid parsing lines that are currently being written by application

by Mathias Kettner

Module: check_mk Branch: master Commit: fdb7be44da538cc09a9f5cbc604779e4e67f9b15 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdb7be44da538c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 16:05:07 2015 +0100 #2876 FIX mk_logwatch: Avoid parsing lines that are currently being written by application Thanks to Václav Chlumský. --- .werks/2876 | 9 +++++++++ ChangeLog | 1 + agents/plugins/mk_logwatch | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/.werks/2876 b/.werks/2876 new file mode 100644 index 0000000..280d94f --- /dev/null +++ b/.werks/2876 @@ -0,0 +1,9 @@ +Title: mk_logwatch: Avoid parsing lines that are currently being written by application +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449068658 +Class: fix + +Thanks to Václav Chlumský. diff --git a/ChangeLog b/ChangeLog index 13e90bf..ec0fbee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -128,6 +128,7 @@ * 2857 FIX: fritz.conn: Handling missing connection state infos as UNKNOWN * 2858 FIX: hp_proliant_da_phydrv: Adding disk controller to check items... NOTE: Please refer to the migration notes! + * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/plugins/mk_logwatch b/agents/plugins/mk_logwatch index efbb40e..6e114b8 100755 --- a/agents/plugins/mk_logwatch +++ b/agents/plugins/mk_logwatch @@ -165,6 +165,12 @@ def next_line(file_handle): else: try: line = file_handle.next() + # Avoid parsing of (yet) incomplete lines (when acutal application + # is just in the process of writing) + if not line.endswith(os.linesep): + begin_of_line_offset = file_handle.tell() - len(line) + os.lseek(file_handle.fileno(), begin_of_line_offset, 0) + return None return line except: return None

8 years, 9 months

#2858 FIX hp_proliant_da_phydrv: Adding disk controller to check items

by Lars Michelsen

Module: check_mk Branch: master Commit: a9ff9b08608cb20d34695de1be694595d3c471b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a9ff9b08608cb2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 15:55:38 2015 +0100 #2858 FIX hp_proliant_da_phydrv: Adding disk controller to check items Older checks were not taking the controller number into account which was resulting in missing service checks for some disks. We have now added the controller id to the check item to fix this issue. You will have to rediscover the affected hosts and eventually update related rules like disabled services or similar since the service description is now changed, for example from "HW Phydrv 0" to "HW Phydrv 0/0". --- .werks/2858 | 15 +++++++++++++++ ChangeLog | 2 ++ checks/hp_proliant_da_phydrv | 17 ++++++++++------- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.werks/2858 b/.werks/2858 new file mode 100644 index 0000000..f92c27a --- /dev/null +++ b/.werks/2858 @@ -0,0 +1,15 @@ +Title: hp_proliant_da_phydrv: Adding disk controller to check items +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1449067943 +Class: fix + +Older checks were not taking the controller number into account which +was resulting in missing service checks for some disks. We have now +added the controller id to the check item to fix this issue. + +You will have to rediscover the affected hosts and eventually update +related rules like disabled services or similar since the service +description is now changed, for example from "HW Phydrv 0" to "HW Phydrv 0/0". diff --git a/ChangeLog b/ChangeLog index 3b4d145..13e90bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -126,6 +126,8 @@ * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... * 2875 FIX: citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins * 2857 FIX: fritz.conn: Handling missing connection state infos as UNKNOWN + * 2858 FIX: hp_proliant_da_phydrv: Adding disk controller to check items... + NOTE: Please refer to the migration notes! Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/hp_proliant_da_phydrv b/checks/hp_proliant_da_phydrv index 5de5f0e..127ffbb 100644 --- a/checks/hp_proliant_da_phydrv +++ b/checks/hp_proliant_da_phydrv @@ -24,9 +24,12 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# Author: Lars Michelsen <lm(a)mathias-kettner.de> - -hp_proliant_da_phydrv_condition_status2nagios = { 'other': 3, 'ok': 0, 'degraded': 2, 'failed': 2 } +hp_proliant_da_phydrv_condition_status2nagios = { + 'other' : 3, + 'ok' : 0, + 'degraded' : 2, + 'failed' : 2, +} hp_proliant_da_phydrv_condition = { 0: 'n/a', 1: 'other', @@ -52,12 +55,12 @@ hp_proliant_da_phydrv_smart_status = { } def inventory_hp_proliant_da_phydrv(info): - if len(info) > 0: - return [ (line[1], None) for line in info ] + return [ (line[0]+'/'+line[1], None) for line in info ] -def check_hp_proliant_da_phydrv(item, params, info): +def check_hp_proliant_da_phydrv(item, _no_params, info): for line in info: - if line[1] == item: + # First condition is for legacy discovered services + if line[1] == item or (line[0]+'/'+line[1]) == item: cntlr_index, index, bay, status, ref_hours, size, condition, bus_number, smart_status = line snmp_status = hp_proliant_da_phydrv_status[int(status)]

8 years, 9 months

agents/check_mk_agent.aix: fix problem with missing cache dir,

by Mathias Kettner

add -p to mkdir Message-ID: <565f01b0.bk+86O7CuFq7Yzb+%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Module: check_mk Branch: master Commit: 0bcf3959def7805ee5ed24403756e7bde1330448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bcf3959def780… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 15:35:19 2015 +0100 agents/check_mk_agent.aix: fix problem with missing cache dir, add -p to mkdir thanks to Benoit Héroux --- agents/check_mk_agent.aix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 4c3060d..5247bf8 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -96,7 +96,7 @@ function run_cached { CMDLINE=$* MAXAGE=$MAXAGE*60 - if [ ! -e $MK_VARDIR/cache ] ; then mkdir $MK_VARDIR/cache ; fi + if [ ! -e $MK_VARDIR/cache ] ; then mkdir -p $MK_VARDIR/cache ; fi CACHE_FILE=$MK_VARDIR/cache/$NAME.cache USE_CACHE_FILE=""

8 years, 9 months

#2857 FIX fritz.conn: Handling missing connection state infos as UNKNOWN

by Lars Michelsen

Module: check_mk Branch: master Commit: dae5a9cef10f80296259933cab224b8bf7544e8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dae5a9cef10f80… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 15:31:25 2015 +0100 #2857 FIX fritz.conn: Handling missing connection state infos as UNKNOWN --- .werks/2857 | 10 ++++++++++ ChangeLog | 1 + checks/fritz | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/.werks/2857 b/.werks/2857 new file mode 100644 index 0000000..3f9e68d --- /dev/null +++ b/.werks/2857 @@ -0,0 +1,10 @@ +Title: fritz.conn: Handling missing connection state infos as UNKNOWN +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449066670 + + diff --git a/ChangeLog b/ChangeLog index 89a335e..3b4d145 100644 --- a/ChangeLog +++ b/ChangeLog @@ -125,6 +125,7 @@ * 1308 FIX: check_mk_agent.linux: Not longer list prl_fs filesystems... * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... * 2875 FIX: citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins + * 2857 FIX: fritz.conn: Handling missing connection state infos as UNKNOWN Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/fritz b/checks/fritz index 52bd107..0989f94 100644 --- a/checks/fritz +++ b/checks/fritz @@ -51,7 +51,11 @@ fritz_conn_states = { def check_fritz_conn(_unused, _no_params, info): if not info: return 3, 'Connection info is missing' + data = fritz_parse_info(info) + if "NewConnectionStatus" not in data: + return 3, 'Connection info is missing' + state_txt = data['NewConnectionStatus'] nag_state = fritz_conn_states.get(state_txt) if nag_state is None:

8 years, 9 months

#2875 FIX citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins

by Mathias Kettner

Module: check_mk Branch: master Commit: 1134120b81bdea28dfb70950e4459e414508bb99 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1134120b81bdea… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 15:21:32 2015 +0100 #2875 FIX citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins --- .werks/2875 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/citrix_farm.ps1 | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/2875 b/.werks/2875 new file mode 100644 index 0000000..c35bc8c --- /dev/null +++ b/.werks/2875 @@ -0,0 +1,9 @@ +Title: citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449066069 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 1cea857..89a335e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 2855 FIX: ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 * 1308 FIX: check_mk_agent.linux: Not longer list prl_fs filesystems... * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... + * 2875 FIX: citrix_farm.ps1: Add missing end marker of piggy data - fixes problem in subsequent plugins Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/citrix_farm.ps1 b/agents/windows/plugins/citrix_farm.ps1 index af531b8..7cac869 100644 --- a/agents/windows/plugins/citrix_farm.ps1 +++ b/agents/windows/plugins/citrix_farm.ps1 @@ -1,5 +1,3 @@ -#!/usr/bin/python -# -*- encoding: utf-8; py-indent-offset: 4 -*- # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / | @@ -175,3 +173,4 @@ foreach ($Controller in $Controllers) { "CitrixPoolName $HypervisorConnectionName" } } +"<<<<>>>>"

8 years, 9 months

hitachi_hus_status: Fixed code alignment

by Lars Michelsen

Module: check_mk Branch: master Commit: 97796729dd3f1a265d887692ffa6a47bee8df0d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=97796729dd3f1a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 15:13:43 2015 +0100 hitachi_hus_status: Fixed code alignment --- ChangeLog | 2 +- checks/hitachi_hus_status | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbc5acf..1cea857 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,7 +114,6 @@ * 2800 FIX: mk_mysql: fixed some issues with incorrect assembled command line... * 2744 FIX: waitmax now kills the whole process group and is a bit more robust. * 2842 FIX: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit - * 1308 FIX: check_mk_agent.linux: Not longer list prl_fs filesystems... * 2782 FIX: cups_queues: fix crash in case user name contains spaces * 2849 FIX: winperf_processor.util: Fixed crash in case no CPU infos are sent * 2850 FIX: juniper_cpu: Better error handling of empty data reported by device @@ -123,6 +122,7 @@ * 2853 FIX: cisco_asa_failover: Added support for CISCO PIX security devices * 2854 FIX: winperf_if: Assuming interfaces without status to be up * 2855 FIX: ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 + * 1308 FIX: check_mk_agent.linux: Not longer list prl_fs filesystems... * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... Multisite: diff --git a/checks/hitachi_hus_status b/checks/hitachi_hus_status index 6d73b85..30f4f8f 100644 --- a/checks/hitachi_hus_status +++ b/checks/hitachi_hus_status @@ -50,13 +50,13 @@ def check_hitachi_hus_status(_no_item, _no_params, info): 268435456 : ( 2, "Host connector alarm" ), } if int(info[0][0]) == 0: - yield 0, "Array in normal status" + yield 0, "Array in normal status" else: - yield 0, "Errorcode: %s" % info[0][0] - for status, output in status_values.items(): - state, message = output - if status & int(info[0][0]): - yield state, message + yield 0, "Errorcode: %s" % info[0][0] + for status, output in status_values.items(): + state, message = output + if status & int(info[0][0]): + yield state, message check_info["hitachi_hus_status"] = { "check_function" : check_hitachi_hus_status,

8 years, 9 months

This fixes a crash like this:

by Lars Michelsen

Module: check_mk Branch: master Commit: 347d4b24a325d6f5af7212af8d45411bbe220c91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=347d4b24a325d6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 15:01:33 2015 +0100 This fixes a crash like this: UnboundLocalError: local variable 'disk_read_bytes' referenced before assignment Conflicts: ChangeLog checks/winperf_phydisk --- .werks/2856 | 12 ++++++++++++ ChangeLog | 1 + checks/winperf_phydisk | 6 +++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/2856 b/.werks/2856 new file mode 100644 index 0000000..e0edfb3 --- /dev/null +++ b/.werks/2856 @@ -0,0 +1,12 @@ +Title: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449064692 + +This fixes a crash like this: + +UnboundLocalError: local variable 'disk_read_bytes' referenced before assignment diff --git a/ChangeLog b/ChangeLog index 8491810..ce5bc72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -122,6 +122,7 @@ * 2853 FIX: cisco_asa_failover: Added support for CISCO PIX security devices * 2854 FIX: winperf_if: Assuming interfaces without status to be up * 2855 FIX: ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 + * 2856 FIX: winperf_phydisk: Not discovering on clusters where disk perfcounters are missing... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_phydisk b/checks/winperf_phydisk index e2fd98b..cca658b 100644 --- a/checks/winperf_phydisk +++ b/checks/winperf_phydisk @@ -67,7 +67,11 @@ def winperf_phydisk_convert(info): # for now. # In case disk performance counters are not enabled, the agent sends # an almost empty section, where the second line is missing completely - if len(info) == 1: + def disk_perfcounters_disabled(info): + nodes = set([ l[0] for l in info ]) + return len(nodes) == len(info) + + if disk_perfcounters_disabled(info): return [] lines = iter(info)

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015