Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

#2807 FIX check_mail_loop: POP3 protocol wasn't working at all

by Andreas Boesl

Module: check_mk Branch: master Commit: a8c601d19ec7725e63ae0978fa546d712b2b8de0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8c601d19ec772… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Dec 4 12:34:43 2015 +0100 #2807 FIX check_mail_loop: POP3 protocol wasn't working at all --- .werks/2807 | 8 ++++++++ ChangeLog | 1 + doc/treasures/active_checks/check_mail_loop | 9 ++++----- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.werks/2807 b/.werks/2807 new file mode 100644 index 0000000..a6a177b --- /dev/null +++ b/.werks/2807 @@ -0,0 +1,8 @@ +Title: check_mail_loop: POP3 protocol wasn't working at all +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449228796 +Class: fix + diff --git a/ChangeLog b/ChangeLog index 2a2e670..b700825 100644 --- a/ChangeLog +++ b/ChangeLog @@ -138,6 +138,7 @@ * 1309 FIX: multipath: Fixed name handling of multipaths... NOTE: Please refer to the migration notes! * 1310 FIX: blade_bx_powerfan: Check now uses better default leves... + * 2807 FIX: check_mail_loop: POP3 protocol wasn't working at all Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/doc/treasures/active_checks/check_mail_loop b/doc/treasures/active_checks/check_mail_loop index c9702ee..2f677de 100755 --- a/doc/treasures/active_checks/check_mail_loop +++ b/doc/treasures/active_checks/check_mail_loop @@ -239,7 +239,7 @@ def fetch_mails(): for i in range(num_messages): index = i+1 lines = g_M.retr(index)[1] - mails[i] = email.message_from_string("".join(lines)) + mails[i] = email.message_from_string("\n".join(lines)) else: # Get mails from IMAP mailbox @@ -257,7 +257,7 @@ def fetch_mails(): raise Exception('Failed to fetch mail %s (%s). Available messages: %r' % (num, parse_exception(e), messages)) # Now filter out the messages for this check - pattern = re.compile('(?:Re: )?Check_MK-Mail-Loop ([^\s]+) ([^\s]+)') + pattern = re.compile('(?:Re: |WG: )?Check_MK-Mail-Loop ([^\s]+) ([^\s]+)') for index, msg in mails.items(): matches = pattern.match(msg.get('Subject', '')) if matches: @@ -372,9 +372,8 @@ def cleanup_mailbox(): # processed before! In the meantime there might be occured new ones. for ident, (mail_index, recv_ts) in g_mails.items(): if fetch_proto == 'POP3': - response = g_M.dele(ident) - response = None - if response != "+OK": + response = g_M.dele(mail_index + 1) + if not response.startswith("+OK"): raise Exception("Response from server: [%s]" % response) else: ty, data = g_M.store(mail_index, '+FLAGS', '\\Deleted')

8 years, 9 months

#1310 FIX blade_bx_powerfan: Check now uses better default leves

by Bastian Kuhn

Module: check_mk Branch: master Commit: 8ad1f37fac35af8ab3ca3b7829f592e84c558870 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ad1f37fac35af… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 4 11:46:56 2015 +0100 #1310 FIX blade_bx_powerfan: Check now uses better default leves We got feedback that the default levels for this check are to high so we changed the levels to 20%/ 10% instead 50%/ 40% --- .werks/1310 | 10 ++++++++++ ChangeLog | 1 + checks/blade_bx_powerfan | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1310 b/.werks/1310 new file mode 100644 index 0000000..220f3d0 --- /dev/null +++ b/.werks/1310 @@ -0,0 +1,10 @@ +Title: blade_bx_powerfan: Check now uses better default leves +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449225921 +Class: fix + +We got feedback that the default levels for this check are to high so we changed the levels to 20%/ 10% instead 50%/ 40% + diff --git a/ChangeLog b/ChangeLog index 347bcaf..2a2e670 100644 --- a/ChangeLog +++ b/ChangeLog @@ -137,6 +137,7 @@ * 2860 FIX: mssql.vbs: Now really used the configuration file from the agent config directory * 1309 FIX: multipath: Fixed name handling of multipaths... NOTE: Please refer to the migration notes! + * 1310 FIX: blade_bx_powerfan: Check now uses better default leves... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/blade_bx_powerfan b/checks/blade_bx_powerfan index 39ee9db..9ddcc0d 100644 --- a/checks/blade_bx_powerfan +++ b/checks/blade_bx_powerfan @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. -blade_bx_fan_default_error_levels = (50, 40) # percentages or errors! +blade_bx_fan_default_error_levels = (20, 10) # percentages or errors! blade_bx_status = { "1" : "unknow", "2" : "disabled",

8 years, 9 months

sansymphony.ps1: Prevent unwanted output. Thanks to Micheal Mutsch

by Bastian Kuhn

Module: check_mk Branch: master Commit: 756c04f2caef0409008a5af0a0330e444f42ab28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=756c04f2caef04… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 4 11:22:32 2015 +0100 sansymphony.ps1: Prevent unwanted output. Thanks to Micheal Mutsch --- agents/windows/plugins/sansymphony.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/plugins/sansymphony.ps1 b/agents/windows/plugins/sansymphony.ps1 index 388d314..34e51f0 100644 --- a/agents/windows/plugins/sansymphony.ps1 +++ b/agents/windows/plugins/sansymphony.ps1 @@ -38,7 +38,7 @@ Import-Module "C:\Program Files\DataCore\SANsymphony\DataCore.Executive.Cmdlets. #set up PowerShell connection to local server -Connect-DcsServer -Server $ssvhostname -UserName $ssvusername -Password $ssvpassword -Connection check_mk +Connect-DcsServer -Server $ssvhostname -UserName $ssvusername -Password $ssvpassword -Connection check_mk | Out-Null # if the connection was succesfull, weŽll go on

8 years, 9 months

websphere_mq fixed serval problems when running on aix. Thanks to Jan-Philipp Henkel

by Bastian Kuhn

Module: check_mk Branch: master Commit: f76ee9dc3d7cbd86a844d3ed88dd8533fc5bdc18 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f76ee9dc3d7cbd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Dec 4 10:58:37 2015 +0100 websphere_mq fixed serval problems when running on aix. Thanks to Jan-Philipp Henkel --- agents/plugins/websphere_mq | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/agents/plugins/websphere_mq b/agents/plugins/websphere_mq index 158737a..fc407ae 100755 --- a/agents/plugins/websphere_mq +++ b/agents/plugins/websphere_mq @@ -27,7 +27,13 @@ if [ "$1" = "" ] then - su - mqm -c "/usr/lib/check_mk_agent/plugins/websphere_mq run" +# wwi -------------------------------------- +# deletion of "-" +# preventing a faulty "TCP Connection" section of the main agent +# by using the "-" option, the AIX environment show's the message "[YOU HAVE NEW MAIL]" before the section start: <<<websphere_mq_channels>>> +# so the next section will be useless for the OMD server check. +# su - mqm -c "/usr/lib/check_mk_agent/plugins/websphere_mq run" + su mqm -c "/usr/lib/check_mk_agent/plugins/websphere_mq run" else # Loop over all local mq instances for QM in $( ps -ef | grep -i '[/]usr/mqm/bin/runmqchl -c' | awk '{ print $NF }' | uniq) @@ -49,13 +55,20 @@ else echo "$a $i $c $s" done echo '<<<websphere_mq_queues>>>' - for t in `echo " display queue (*) where (USAGE EQ NORMAL) " | /usr/bin/runmqsc $QM | grep QLOCAL | grep -v SYSTEM | grep -v _T0 | grep -v _T1 | grep -v _T2 | grep -v _T3 | grep -v mqtest | grep QUEUE | awk '{ print $1 }' | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + for t in `echo " display queue (*) where (USAGE EQ NORMAL) " | /usr/bin/runmqsc $QM | grep -v SYSTEM | grep -v MQMON | grep -v MONITOR | grep -v _T0 | grep -v _T1 | grep -v _T2 | grep -v _T3 | grep -v mqtest | grep QUEUE | awk '{ print $1 }' | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` do - a=`echo " display queue ($t) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tail -1 | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + # wwi MQ admin change, to get more queues which are needed + #a=`echo " display queue ($t) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tail -1 | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }'` + a=`echo " display qlocal ($t) CURDEPTH " | /usr/bin/runmqsc $QM | grep CURDEPTH | tr " " "\n" | grep CURDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` b=`echo " display qlocal ($t) MAXDEPTH " | /usr/bin/runmqsc $QM | grep MAXDEPTH | tr " " "\n" | grep MAXDEPTH | sed '1,$s/(/ /g' | sed '1,$s/)/ /g'| awk '{print $2 }' | tr "\n" " "` - # Muster: Anzahl eingehender Messages $a auf $t Max-Queues $b - + # Muster: Anzahl eingehender Messages $a auf $t Max-Queues $b + # wwi ------------------------- + # preventing a CRASH of the check at the server side + if [ "$a" == "" ] && [ "$b" == "" ]; then + a=0 + b=0 + fi echo "$a $t $b" done done

8 years, 9 months

cleanup in raritan.include

by Simon Betz

Module: check_mk Branch: master Commit: 7aeebb977a16cd3ab9ef8e352a0c2bc679812abb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7aeebb977a16cd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 3 17:05:01 2015 +0100 cleanup in raritan.include --- checks/raritan.include | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/checks/raritan.include b/checks/raritan.include index 5399e75..1ed411c 100644 --- a/checks/raritan.include +++ b/checks/raritan.include @@ -139,19 +139,22 @@ raritan_map_state = { # "X.Y.Z", # UpperCriticalThreshold # "X.Y.Z", # UpperWarningThreshold -def parse_raritan_sensors(info): # , raritan_device_type, raritan_device_item_name): +def parse_raritan_sensors(info): parsed = {} - for line in info: + for availability, sensor_id, sensor_name, sensor_type, sensor_state, sensor_unit, \ + sensor_exponent, sensor_value_str, sensor_lower_crit_str, sensor_lower_warn_str, \ + sensor_upper_crit_str, sensor_upper_warn_str in info: + sensor_type, sensor_type_readable = \ - raritan_map_type.get(line[3], ('', "Other")) + raritan_map_type.get(sensor_type, ('', "Other")) extra_name = "" if sensor_type_readable != '': extra_name += " " + sensor_type_readable - sensor_name = ("Sensor %s%s %s" % (line[1], extra_name, line[2])).strip() + sensor_name = ("Sensor %s%s %s" % (sensor_id, extra_name, sensor_name)).strip() - sensor_unit = raritan_map_unit.get(line[5], " Other") + sensor_unit = raritan_map_unit.get(sensor_unit, " Other") # binary sensors don't have any values or levels if sensor_type in [ 'binary', '' ]: @@ -165,11 +168,13 @@ def parse_raritan_sensors(info): # , raritan_device_type, raritan_device_item_na factor = 1 # if the value is 5 and unitSensorDecimalDigits is 2 # then actual value is 0.05 - sensor_data = map(lambda x: factor * float(x) / pow(10, int(line[6])), line[7:]) + sensor_data = map(lambda x: factor * float(x) / pow(10, int(sensor_exponent)), \ + [sensor_value_str, sensor_lower_crit_str, sensor_lower_warn_str, \ + sensor_upper_crit_str, sensor_upper_warn_str]) parsed[sensor_name] = { - 'is_available' : line[0], - 'state' : raritan_map_state.get(line[4], (3, "unhandled state")), + 'availability' : availability, + 'state' : raritan_map_state.get(sensor_state, (3, "unhandled state")), 'sensor_type' : sensor_type, 'sensor_data' : sensor_data, 'sensor_unit' : sensor_unit, @@ -181,7 +186,7 @@ def parse_raritan_sensors(info): # , raritan_device_type, raritan_device_item_na def inventory_raritan_sensors(parsed, sensor_type): inventory = [] for key, values in parsed.items(): - if values['is_available'] == '1' and values['sensor_type'] == sensor_type: + if values['availability'] == '1' and values['sensor_type'] == sensor_type: inventory.append( (key, None) ) return inventory @@ -190,7 +195,7 @@ def inventory_raritan_sensors(parsed, sensor_type): def inventory_raritan_sensors_temp(parsed, sensor_type): inventory = [] for key, values in parsed.items(): - if values['is_available'] == '1' and values['sensor_type'] == sensor_type: + if values['availability'] == '1' and values['sensor_type'] == sensor_type: inventory.append( (key, {}) ) return inventory

8 years, 9 months

adva_fsp_temp: Fixed unicode problem

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7e74233f5974da827abdb75fa22913bdae85f6ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e74233f5974da… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 3 17:04:20 2015 +0100 adva_fsp_temp: Fixed unicode problem --- checks/adva_fsp_temp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/adva_fsp_temp b/checks/adva_fsp_temp index 64957e5..3babfd5 100644 --- a/checks/adva_fsp_temp +++ b/checks/adva_fsp_temp @@ -46,10 +46,10 @@ def check_adva_fsp_temp(item, params, info): high = float(high)/10 low = float(low)/10 if low > -273: - infotext = "Temperature is %.1f °C (limits %.1f/%.1f °C) at %s" % (temp, low, high, descr) + infotext = u"Temperature is %.1f °C (limits %.1f/%.1f °C) at %s" % (temp, low, high, descr.decode("utf-8")) perfdata = [ ("temp", temp, "", str(low)+":"+str(high), ) ] else: - infotext = "Temperature is %.1f °C (crit at %.1f °C) at %s" % (temp, high, descr) + infotext = u"Temperature is %.1f °C (crit at %.1f °C) at %s" % (temp, high, descr.decode("utf-8")) perfdata = [ ("temp", temp, "", high, ) ] if temp <= -2730:

8 years, 9 months

Revert "cleanup in raritan.include"

by Simon Betz

Module: check_mk Branch: master Commit: 5cf4fcf39e6cb375a4df0c4457a1aea4b6384fc4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cf4fcf39e6cb3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 3 17:00:48 2015 +0100 Revert "cleanup in raritan.include" This reverts commit c44a5f623001dff82efdca957a04aa1684481148. --- checks/fileinfo | 267 ++++++++++++---------------------- checks/local | 88 +++++------ checks/raritan.include | 25 ++-- web/plugins/wato/check_parameters.py | 23 --- 4 files changed, 135 insertions(+), 268 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5cf4fcf39e…

8 years, 9 months

cleanup in raritan.include

by Simon Betz

Module: check_mk Branch: master Commit: c44a5f623001dff82efdca957a04aa1684481148 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c44a5f623001df… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 3 16:59:34 2015 +0100 cleanup in raritan.include --- checks/fileinfo | 267 ++++++++++++++++++++++------------ checks/local | 88 ++++++----- checks/raritan.include | 25 ++-- web/plugins/wato/check_parameters.py | 23 +++ 4 files changed, 268 insertions(+), 135 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c44a5f6230…

8 years, 9 months

Reverted part of todays small caching cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: 116ee5be9132a21fb5086b4adcc9bde62ebea0c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=116ee5be9132a2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Dec 3 16:41:32 2015 +0100 Reverted part of todays small caching cleanup --- ChangeLog | 4 ++-- modules/check_mk.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea5a731..347bcaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -133,10 +133,10 @@ * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks - * 1309 FIX: multipath: Fixed name handling of multipaths... - NOTE: Please refer to the migration notes! * 2859 FIX: Check_MK Discovery/Inventory and HW/SW Inventory services are now always using caches (if available)... * 2860 FIX: mssql.vbs: Now really used the configuration file from the agent config directory + * 1309 FIX: multipath: Fixed name handling of multipaths... + NOTE: Please refer to the migration notes! Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/modules/check_mk.py b/modules/check_mk.py index d39a585..25436c0 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4622,7 +4622,8 @@ def do_check_keepalive(): sys.stderr.flush() cleanup_globals() # Prepare for next check - restore_use_cachefile() + global opt_use_cachefile + opt_use_cachefile = True restore_original_agent_caching_usage() # Check if all global variables are clean, but only in verbose logging mode

8 years, 9 months

#1309 FIX multipath: Fixed name handling of multipaths

by Bastian Kuhn

Module: check_mk Branch: master Commit: b26288c96850f6f1f3580ccb87d40578546ee8d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b26288c96850f6… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Dec 3 13:37:21 2015 +0100 #1309 FIX multipath: Fixed name handling of multipaths Old Versions of Check_MK added in some cases a whitespace at the end of the path name. This has been fixed a while ago, but lead to the problem that the multipath check not longer detected this paths. Now the check can handle again the old names. This means you can make an update without to get an error, but you should do a rediscovery betimes to clean the thinks in the background (autochecks) up. Please note that the Check_MK Discovery Service will detect the multipath devices again and it looks like they have the same name, so do not wonder. It's cause of the autochecks. --- .werks/1309 | 16 ++++++++++++++++ ChangeLog | 4 +++- checks/multipath | 6 ++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/.werks/1309 b/.werks/1309 new file mode 100644 index 0000000..89ffbec --- /dev/null +++ b/.werks/1309 @@ -0,0 +1,16 @@ +Title: multipath: Fixed name handling of multipaths +Level: 1 +Component: checks +Compatible: incomp +Version: 1.2.7i4 +Date: 1449145724 +Class: fix + +Old Versions of Check_MK added in some cases a whitespace at the end of the path name. +This has been fixed a while ago, but lead to the problem that the multipath check not longer +detected this paths. Now the check can handle again the old names. This means you can make an update +without to get an error, but you should do a rediscovery betimes to clean the thinks in the background (autochecks) up. + +Please note that the Check_MK Discovery Service will detect the multipath devices again and it looks like they have the same name, +so do not wonder. It's cause of the autochecks. + diff --git a/ChangeLog b/ChangeLog index 5128363..7da5580 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,8 +52,8 @@ * 2803 netapp_api_volumes: clustered volumes now longer show the current node name in the service description... NOTE: Please refer to the migration notes! * 2780 cisco_vss: detect this check on newer (15.1) devices - * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... * 2874 netstat_an.bat: Restrict output of connections to TCP, safes performance + * 2866 ewon: Added support for monitoring Wagner OxyReduct devices with their data exposed through an ewon router... * 2660 FIX: fixed windows agent using the wrong working directory... * 2664 FIX: ps: Speedup in situation with many matching processes... * 2661 FIX: windows agent: fixed incomplete process list... @@ -133,6 +133,8 @@ * 2876 FIX: mk_logwatch: Avoid parsing lines that are currently being written by application... * 2806 FIX: oracle_rman: introduced missing WATO, allows configuration of backup age * 2883 FIX: default.php template: fixed id_string while creating default template, e.g. for custom checks + * 1309 FIX: multipath: Fixed name handling of multipaths... + NOTE: Please refer to the migration notes! Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/multipath b/checks/multipath index 6ddd4be..7e2a24e 100644 --- a/checks/multipath +++ b/checks/multipath @@ -283,8 +283,10 @@ def inventory_multipath(parsed): def check_multipath(item, target_numpaths, parsed): # Keys in parsed are the UUIDs. First assume that we are # looking for a UUID. Then fall back to aliases - if item in parsed: - mmap = parsed[item] + # item.rstrip(): Check_MK Versions < 1.2.8 created autochecks with a whitespace + # at the end of the item. With this fix we prevent serval hundreds of UKN after Update. + if item.rstrip() in parsed: + mmap = parsed[item.rstrip()] else: for mmap in parsed.values(): if mmap.get("alias") == item:

8 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015