Module: check_mk
Branch: master
Commit: 3788952616eaf42a4bbf9f3155d64fbb192e75ca
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3788952616eaf4…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 3 08:37:18 2014 +0200
FIX lnx_thermal: Not checking active trip points (e.g. cooling device triggers) anymore
---
.werks/827 | 8 ++++++++
ChangeLog | 1 +
checks/lnx_thermal | 3 +++
3 files changed, 12 insertions(+)
diff --git a/.werks/827 b/.werks/827
new file mode 100644
index 0000000..6535cb6
--- /dev/null
+++ b/.werks/827
@@ -0,0 +1,8 @@
+Title: lnx_thermal: Not checking active trip points (e.g. cooling device triggers)
anymore
+Level: 1
+Component: checks
+Version: 1.2.5i5
+Date: 1404369399
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 0d6e465..d84f383 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@
* 0173 FIX: hitachi_hnas_volume: Fixed bug when snmp outputs empty lines
* 1037 FIX: bintec_info: support bintec RXL12500
* 0948 FIX: mk_inventory.ps1: increased caching time to 14400, fixed incorrect
default cachefile path
+ * 0827 FIX: lnx_thermal: Not checking active trip points (e.g. cooling device
triggers) anymore
Multisite:
* 1013 Sort host names naturally, e.g. foobar11 comes after foobar2...
diff --git a/checks/lnx_thermal b/checks/lnx_thermal
index 47d29db..da943b9 100644
--- a/checks/lnx_thermal
+++ b/checks/lnx_thermal
@@ -48,6 +48,9 @@ def check_lnx_thermal(item, params, info):
if len(line) > 4:
trip_points = dict(zip(line[5::2], map(lambda x: saveint(x) / 1000,
line[4::2])))
for tp_num, (tp_name, level) in enumerate(trip_points.items()):
+ # ignore active cooling device trip points (means enabling a fan or
similar)
+ if tp_name == 'active':
+ continue
if cur > level:
if tp_name in [ 'hot', 'critical' ]:
state = max(state, 2)