Module: check_mk
Branch: master
Commit: 8cb627adc022fca4981ba433c0b6b8c7a401587a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cb627adc022fc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Feb 15 16:47:59 2016 +0100
#3205 FIX raritan_pdu_inlet: Fixed exception in case phases report a non OK state
---
.werks/3205 | 10 ++++++++++
ChangeLog | 1 +
checks/raritan_pdu_inlet | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/3205 b/.werks/3205
new file mode 100644
index 0000000..3a2960c
--- /dev/null
+++ b/.werks/3205
@@ -0,0 +1,10 @@
+Title: raritan_pdu_inlet: Fixed exception in case phases report a non OK state
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.9i1
+Date: 1455551228
+
+
diff --git a/ChangeLog b/ChangeLog
index 8388acb..757b72f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin
* 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters
* 3075 FIX: windows agent: fixed data encryption of realtime updates were
incompatible...
+ * 3205 FIX: raritan_pdu_inlet: Fixed exception in case phases report a non OK state
Multisite:
* 3059 FIX: Fixed highlighting of availability timeline time slices
diff --git a/checks/raritan_pdu_inlet b/checks/raritan_pdu_inlet
index af6a4f2..8980f7a 100644
--- a/checks/raritan_pdu_inlet
+++ b/checks/raritan_pdu_inlet
@@ -38,7 +38,7 @@ def parse_raritan_pdu_inlet(info):
state, state_info = raritan_map_state[sensor_state]
if state > 0:
- parsed[phase][key] = (value, (state,
raritan_pdu_sensor_states[sensor_state]))
+ parsed[phase][key] = (value, (state, state_info))
else:
parsed[phase][key] = (value, None)
return parsed