Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #1941 FIX df.include: fixed exception on emtpy filesystems

by Andreas Boesl

Module: check_mk Branch: master Commit: 5038082c3c82694a2b999c2acb34477936a356ec URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5038082c3c8269… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 10 16:02:33 2015 +0100 #1941 FIX df.include: fixed exception on emtpy filesystems The df.include library crashed on filesystems where the available space was equal to the total space of the device. --- .werks/1941 | 11 +++++++++++ ChangeLog | 1 + 2 files changed, 12 insertions(+) diff --git a/.werks/1941 b/.werks/1941 new file mode 100644 index 0000000..2453c1d --- /dev/null +++ b/.werks/1941 @@ -0,0 +1,11 @@ +Title: df.include: fixed exception on emtpy filesystems +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423580445 + +The df.include library crashed on filesystems where the available +space was equal to the total space of the device. diff --git a/ChangeLog b/ChangeLog index 1d7b278..70ecadd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -156,6 +156,7 @@ NOTE: Please refer to the migration notes! * 1938 FIX: docsis_channels_upstream: fixed missing checks if channels had the same ChannelId... * 1940 FIX: ps: Fixed a rare crash on malformed agent output... + * 1941 FIX: df.include: fixed exception on emtpy filesystems... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...

9 years, 4 months

Check_MK Git: check_mk: df.include: fixed exception when used_perc was 0

by Andreas Boesl

Module: check_mk Branch: master Commit: e15e680764a43e155555df2ecba135a91b45dac3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e15e680764a43e… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 10 15:47:08 2015 +0100 df.include: fixed exception when used_perc was 0 --- checks/df.include | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/df.include b/checks/df.include index 1254572..fa8f36d 100644 --- a/checks/df.include +++ b/checks/df.include @@ -319,7 +319,10 @@ def df_check_filesystem_single(hostname, mountpoint, size_mb, avail_mb, reserved # Show enough decimal digits so that very small percentages are still # visible! - perc_precision = max(1, 2 - int(round(math.log(used_perc, 10)))) + if used_perc > 0: + perc_precision = max(1, 2 - int(round(math.log(used_perc, 10)))) + else: + perc_precision = 1 infotext = "%%.%df%%%% used (%%s of %%s), %%s" % perc_precision % (used_perc, used_hr, size_hr, levels["levels_text"]) status = 0

9 years, 4 months

Check_MK Git: check_mk: esx_vsphere_hostsystem: Fixed broken folding

by Konstantin Büttner

Module: check_mk Branch: master Commit: 68f74316b9ceffc2369e09e86f2eb897527af12a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68f74316b9ceff… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 10 15:44:45 2015 +0100 esx_vsphere_hostsystem: Fixed broken folding --- checks/esx_vsphere_hostsystem | 1 + 1 file changed, 1 insertion(+) diff --git a/checks/esx_vsphere_hostsystem b/checks/esx_vsphere_hostsystem index be09a49..691ec914 100644 --- a/checks/esx_vsphere_hostsystem +++ b/checks/esx_vsphere_hostsystem @@ -225,6 +225,7 @@ check_info['esx_vsphere_hostsystem.cpu_util_cluster'] = { "has_perfdata" : True, "includes" : [ "cpu_util.include" ], } +#. # .--Memory--------------------------------------------------------------. # | __ __ | # | | \/ | ___ _ __ ___ ___ _ __ _ _ |

9 years, 4 months

Check_MK Git: check_mk: igored -> ignored

by Andreas Boesl

Module: check_mk Branch: master Commit: c9ce48d8be3d43c2fe14d19dae1217ad2a6fe1c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c9ce48d8be3d43… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 10 15:12:14 2015 +0100 igored -> ignored --- checks/ps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ps b/checks/ps index 2e20cbd..089ea90 100644 --- a/checks/ps +++ b/checks/ps @@ -104,7 +104,7 @@ def ps_parse_info(info): # We need to determine the number of cpu_cores without the wmic_info if len(line) < 3: # On some rare instances the name of the process is missing - # This line will be igored + # This line will be ignored continue if line[2].lower() == "system idle process": cpu_cores = int(line[1][1:-1].split(",")[9])

9 years, 4 months

Check_MK Git: check_mk: #1940 FIX ps: Fixed a rare crash on malformed agent output

by Andreas Boesl

Module: check_mk Branch: master Commit: 71522df8b28406acc1d9f0a08c966a68b9780fe6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71522df8b28406… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 10 15:11:21 2015 +0100 #1940 FIX ps: Fixed a rare crash on malformed agent output Sometimes the windows agent reported process lines without a process name, like <tt>(\\ZAOE\Grotest,149572,25184,0,20348,7752,7656250,12500000,241,5)</tt> The ps check crashed because it couldn't handle this type of line --- .werks/1940 | 12 ++++++++++++ ChangeLog | 1 + checks/ps | 4 ++++ 3 files changed, 17 insertions(+) diff --git a/.werks/1940 b/.werks/1940 new file mode 100644 index 0000000..8d132e1 --- /dev/null +++ b/.werks/1940 @@ -0,0 +1,12 @@ +Title: ps: Fixed a rare crash on malformed agent output +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1423577273 +Class: fix + +Sometimes the windows agent reported process lines without a process name, like +<tt>(\\ZAOE\Grotest,149572,25184,0,20348,7752,7656250,12500000,241,5)</tt> +The ps check crashed because it couldn't handle this type of line + diff --git a/ChangeLog b/ChangeLog index a74b053..1d7b278 100644 --- a/ChangeLog +++ b/ChangeLog @@ -155,6 +155,7 @@ * 1960 FIX: akcp_sensor_drycontact: Service description prefix changed from "Device" to "Dry Contact"... NOTE: Please refer to the migration notes! * 1938 FIX: docsis_channels_upstream: fixed missing checks if channels had the same ChannelId... + * 1940 FIX: ps: Fixed a rare crash on malformed agent output... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ps b/checks/ps index 091f7bf..2e20cbd 100644 --- a/checks/ps +++ b/checks/ps @@ -102,6 +102,10 @@ def ps_parse_info(info): use_wmic_info = False if not use_wmic_info: # We need to determine the number of cpu_cores without the wmic_info + if len(line) < 3: + # On some rare instances the name of the process is missing + # This line will be igored + continue if line[2].lower() == "system idle process": cpu_cores = int(line[1][1:-1].split(",")[9]) ps_result.append(line)

9 years, 4 months

Check_MK Git: check_mk: Fixed more broken manpages

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4d9e2ca5c07e0d1282e1a7e999bef3cdca407d3d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d9e2ca5c07e0d… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 10 14:33:19 2015 +0100 Fixed more broken manpages --- checkman/hwg_temp | 18 +++++++++--------- checkman/kentix_temp | 32 ++++++++++++++++---------------- checkman/lnx_thermal | 32 ++++++++++++++++---------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/checkman/hwg_temp b/checkman/hwg_temp index baccf9a..da9fdde 100644 --- a/checkman/hwg_temp +++ b/checkman/hwg_temp @@ -17,17 +17,17 @@ inventory: All available temperature sensors are automatically inventorized. [parameters] -This checks parameters are a dictionary with the +parameters(dict): This checks parameters are a dictionary with the following (optional) keys: - {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (30, 35) + {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (30, 35) - {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. - {"output_unit"}: "c", "f" or "k", the check will output the temperature in the -specified unit. If this is not set, output is in degrees Celsius. + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the + specified unit. If this is not set, output is in degrees Celsius. - {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value -according to the unit sent by the device. This key allows to override that. Tread -lightly, as this may lead to a misinterpreted temperature. Should only be used if -the device reports its unit incorrectly. + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value + according to the unit sent by the device. This key allows to override that. Tread + lightly, as this may lead to a misinterpreted temperature. Should only be used if + the device reports its unit incorrectly. diff --git a/checkman/kentix_temp b/checkman/kentix_temp index faca9af..c47d2e3 100644 --- a/checkman/kentix_temp +++ b/checkman/kentix_temp @@ -16,24 +16,24 @@ perfdata: One variable: the temperature in °C [parameters] -This checks parameters are a dictionary with the -following (optional) keys: +parameters(dict): This checks parameters are a dictionary with the + following (optional) keys: - {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (70, 80) + {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (70, 80) - {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. - {"output_unit"}: "c", "f" or "k", the check will output the temperature in the -specified unit. If this is not set, output is in degrees Celsius. + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the + specified unit. If this is not set, output is in degrees Celsius. - {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value -according to the unit sent by the device. This key allows to override that. Tread -lightly, as this may lead to a misinterpreted temperature. Should only be used if -the device reports its unit incorrectly. + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value + according to the unit sent by the device. This key allows to override that. Tread + lightly, as this may lead to a misinterpreted temperature. Should only be used if + the device reports its unit incorrectly. - {"device_levels_handling"}: How the check treats the device's internal levels -versus the ones you specify yourself. The following options are supported: "best" -results in the best status between yours and the device's levels, "worst" in the -worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and -devdefault uses your/the devices set of levels if present, otherwise the other -respectively. Default setting is "devdefault" + {"device_levels_handling"}: How the check treats the device's internal levels + versus the ones you specify yourself. The following options are supported: "best" + results in the best status between yours and the device's levels, "worst" in the + worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and + devdefault uses your/the devices set of levels if present, otherwise the other + respectively. Default setting is "devdefault" diff --git a/checkman/lnx_thermal b/checkman/lnx_thermal index 6b4a1c1..4e67050 100644 --- a/checkman/lnx_thermal +++ b/checkman/lnx_thermal @@ -17,24 +17,24 @@ inventory: Creates one check for earch thermal zone. [parameters] -This checks parameters are a dictionary with the -following (optional) keys: +parameters(dict): This checks parameters are a dictionary with the + following (optional) keys: - {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (70, 80) + {"levels"}: A tuple (warn, crit) containing the upper levels. Default: (70, 80) - {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. - {"output_unit"}: "c", "f" or "k", the check will output the temperature in the -specified unit. If this is not set, output is in degrees Celsius. + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the + specified unit. If this is not set, output is in degrees Celsius. - {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value -according to the unit sent by the device. This key allows to override that. Tread -lightly, as this may lead to a misinterpreted temperature. Should only be used if -the device reports its unit incorrectly. + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value + according to the unit sent by the device. This key allows to override that. Tread + lightly, as this may lead to a misinterpreted temperature. Should only be used if + the device reports its unit incorrectly. - {"device_levels_handling"}: How the check treats the device's internal levels -versus the ones you specify yourself. The following options are supported: "best" -results in the best status between yours and the device's levels, "worst" in the -worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and -devdefault uses your/the devices set of levels if present, otherwise the other -respectively. Default setting is "devdefault" + {"device_levels_handling"}: How the check treats the device's internal levels + versus the ones you specify yourself. The following options are supported: "best" + results in the best status between yours and the device's levels, "worst" in the + worst, "usr" ignore's the device's levels, "dev" ignores yours, usrdefault and + devdefault uses your/the devices set of levels if present, otherwise the other + respectively. Default setting is "devdefault"

9 years, 4 months

Check_MK Git: check_mk: etherbox.temp: Fixed broken manpage

by Konstantin Büttner

Module: check_mk Branch: master Commit: 4564b17789b5775dffdffa0a2015b59509ed3b3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4564b17789b577… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Feb 10 14:12:36 2015 +0100 etherbox.temp: Fixed broken manpage --- checkman/etherbox.temp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/checkman/etherbox.temp b/checkman/etherbox.temp index 0657738..7d68582 100644 --- a/checkman/etherbox.temp +++ b/checkman/etherbox.temp @@ -18,17 +18,17 @@ inventory: The inventory creates a service for each temperature sensor found [parameters] -This checks parameters are a dictionary with the -following (optional) keys: +parameters(dict): This checks parameters are a dictionary with the + following (optional) keys: - {"levels"}: A tuple (warn, crit) containing the upper levels. No defaults. + {"levels"}: A tuple (warn, crit) containing the upper levels. No defaults. - {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. + {"levels_lower"}: A tuple (warn, crit) containing the lower levels. No defaults. - {"output_unit"}: "c", "f" or "k", the check will output the temperature in the -specified unit. If this is not set, output is in degrees Celsius. + {"output_unit"}: "c", "f" or "k", the check will output the temperature in the + specified unit. If this is not set, output is in degrees Celsius. - {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value -according to the unit sent by the device. This key allows to override that. Tread -lightly, as this may lead to a misinterpreted temperature. Should only be used if -the device reports its unit incorrectly. + {"input_unit"}: "c, "f" or "k". By default, the check interprets the sensor value + according to the unit sent by the device. This key allows to override that. Tread + lightly, as this may lead to a misinterpreted temperature. Should only be used if + the device reports its unit incorrectly.

9 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2288

by Lars Michelsen

Module: check_mk Branch: master Commit: 8fc8a2cac2dd1c1375069b597edb1546efb9ff41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8fc8a2cac2dd1c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 13:52:20 2015 +0100 Updated bug entries #2288 --- .bugs/2288 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2288 b/.bugs/2288 new file mode 100644 index 0000000..52bc1b5 --- /dev/null +++ b/.bugs/2288 @@ -0,0 +1,11 @@ +Title: Don't hide "activate changes" button when activion produced an error +Component: wato +State: open +Date: 2015-02-10 13:51:03 +Targetversion: 1.2.7 +Class: nastiness + +When a user activates a change in WATO and the activation fails +for some reason, the activate changes button is hidden. The user +needs to reload the page to be able to retry the operation. It +would be better to let the user simply retry the action.

9 years, 4 months

Check_MK Git: check_mk: Fix: Handling HTML codes in various error messages correctly

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d5ce689b2b75d29812fa4d6e1ae15765e4481c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d5ce689b2b75d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 13:41:58 2015 +0100 Fix: Handling HTML codes in various error messages correctly --- web/htdocs/htmllib.py | 2 +- web/htdocs/wato.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index f92cf9d..689519d 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1002,7 +1002,7 @@ class html: # , <tt>, to be part of the exception message. The tags # are escaped first and then fixed again after attrencode. msg = self.attrencode(obj) - msg = re.sub(r'<(/?)(b|tt|i|br|pre|a|sup|p)>', r'<\1\2>', msg) + msg = re.sub(r'<(/?)(b|tt|i|br|pre|a|sup|p|li|ul|ol)>', r'<\1\2>', msg) # Also repair link definitions msg = re.sub(r'<a href="(.*)">', r'<a href="\1">', msg) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7fd30f4..41556b7 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5364,10 +5364,10 @@ def check_mk_local_automation(command, args=[], indata=""): sudoline = "%s ALL = (root) NOPASSWD: %s *" % (html.apache_user(), commandargs[0], " ".join(commandargs[1:])) sudo_msg = ("The webserver is running as user which has no rights on the " - "needed Check_MK/Nagios files. Please ensure you have set-up " + "needed Check_MK/Nagios files. Please ensure you have set-up " "the sudo environment correctly. e.g. proceed as follows:\n" "<ol><li>install sudo package</li>\n" - "<li>Append the following to the <code>/etc/sudoers</code> file:\n" + "<li>Append the following to the <tt>/etc/sudoers</tt> file:\n" "<pre># Needed for WATO - the Check_MK Web Administration Tool\n" "Defaults:%s !requiretty\n" "%s\n" @@ -5393,7 +5393,7 @@ def check_mk_local_automation(command, args=[], indata=""): stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True) except Exception, e: if commandargs[0] == 'sudo': - raise MKGeneralException("Cannot execute <tt>%s</tt>: %s %s" % (commandargs[0], e, sudo_msg)) + raise MKGeneralException("Cannot execute <tt>%s</tt>: %s %s" % (commandargs[0], e, sudo_msg)) else: raise MKGeneralException("Cannot execute <tt>%s</tt>: %s" % (commandargs[0], e)) p.stdin.write(repr(indata))

9 years, 4 months

Check_MK Git: check_mk: #1982 FIX Fixed exception during checking regular checking when having checks without discovery function

by Lars Michelsen

Module: check_mk Branch: master Commit: c21fbed1c5512382d88d657534867b45a6b27337 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c21fbed1c55123… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 10 08:35:40 2015 +0100 #1982 FIX Fixed exception during checking regular checking when having checks without discovery function --- .werks/1982 | 10 ++++++++++ ChangeLog | 1 + modules/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1982 b/.werks/1982 new file mode 100644 index 0000000..cf35f24 --- /dev/null +++ b/.werks/1982 @@ -0,0 +1,10 @@ +Title: Fixed exception during checking regular checking when having checks without discovery function +Level: 1 +Component: core +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1423553729 + + diff --git a/ChangeLog b/ChangeLog index 81d6f85..a74b053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * 1880 FIX: inventory_processes rules can now be configured without setting levels... * 1882 FIX: Fixed exception "filesystem_levels" not defined when compiling config for nagios * 1977 FIX: Dramatically reduced size of Check_MK check helper processes... + * 1982 FIX: Fixed exception during checking regular checking when having checks without discovery function Checks & Agents: * 1665 agent_netapp: New special agent for NetApp monitoring via Web-API... diff --git a/modules/check_mk.py b/modules/check_mk.py index d7927b7..60d5444 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2671,7 +2671,7 @@ opt_verbose = ('-v' in sys.argv) and 1 or 0 opt_debug = '-d' in sys.argv # make sure these names are defined (even if never needed) -no_inventory_possible = None +no_discovery_possible = None """) # Compile in all neccessary global variables

9 years, 4 months

← Newer
1
...
17
18
19
20
21
22
23
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015