Module: check_mk Branch: master Commit: 1243ea9426753240fcc0f678f5b3e244b9efc4b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1243ea94267532… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 3 14:26:44 2015 +0200 #2558 FIX cmciii.temp: Do not discover air temperature sensors anymore Fixes an exception in the check as the air temperature data can not be used by this check. --- .werks/2558 | 10 ++++++++++ ChangeLog | 1 + checks/cmciii | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2558 b/.werks/2558 new file mode 100644 index 0000000..a98f3cf --- /dev/null +++ b/.werks/2558 @@ -0,0 +1,10 @@ +Title: cmciii.temp: Do not discover air temperature sensors anymore +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1441283161 + +Fixes an exception in the check as the air temperature data can not be used by this check. diff --git a/ChangeLog b/ChangeLog index dc03de0..a3565fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -162,6 +162,7 @@ * 2554 FIX: oracle_recovery_status: Fixed exception when files have no checkpoints * 2568 FIX: apache_status: fixed computation of bytes and requests per second... * 2557 FIX: cmciii_lcp_airin cmciii_lcp_airout cmciii_lcp_waterin cmciii_lcp_waterout: Fixed exception parsing data from some devices + * 2558 FIX: cmciii.temp: Do not discover air temperature sensors anymore... Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/cmciii b/checks/cmciii index 0e69e09..b310024 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -457,7 +457,7 @@ def inventory_cmciii_temp(info): units = parse_units(info[1]) for (unit, item_name), entry in parsed.iteritems(): unit_type, unit_name = units[int(unit)-1][0:2] - if re.search(r'Temperature$',item_name): + if "Temperature" in item_name and "Air." not in item_name: inventory.append( ("%s %s" % (unit_name, item_name), None) ) return inventory