Module: check_mk
Branch: master
Commit: 0f526c4eae644925f94972a35c4949f39bc3a980
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f526c4eae6449…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Fri Aug 5 09:43:44 2016 +0200
3715 FIX agent_ipmi_sensors: fixed error handling
---
.werks/3715 | 10 ++++++++++
ChangeLog | 1 +
agents/special/agent_ipmi_sensors | 1 +
3 files changed, 12 insertions(+)
diff --git a/.werks/3715 b/.werks/3715
new file mode 100644
index 0000000..8738d70
--- /dev/null
+++ b/.werks/3715
@@ -0,0 +1,10 @@
+Title: agent_ipmi_sensors: fixed error handling
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.4.0i1
+Date: 1470383002
+
+
diff --git a/ChangeLog b/ChangeLog
index 7dd4a7f..24fa2fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -326,6 +326,7 @@
* 3711 FIX: ipmi: fixed wrong status handling if sensor status is ok but failures
detected
* 3734 FIX: esx_vsphere_hostsystem.cpu_usage esx_vsphere_hostsystem.mem_usage
esx_vsphere_hostsystem.maintenance: Fixed exception when needed data is missing
* 3759 FIX: cpu.loads: Fixed possible crash on missing data
+ * 3715 FIX: agent_ipmi_sensors: fixed error handling
Multisite:
* 3187 notification view: new filter for log command via regex
diff --git a/agents/special/agent_ipmi_sensors b/agents/special/agent_ipmi_sensors
index 80a1680..4cae37a 100755
--- a/agents/special/agent_ipmi_sensors
+++ b/agents/special/agent_ipmi_sensors
@@ -104,6 +104,7 @@ for sub_path in [ "sbin", "bin",
"local/sbin", "local/bin" ]:
sensor_data, err = p.communicate()
break
except Exception, e:
+ err = e
if opt_debug:
sys.stdout.write("ERROR: '%s': %s\n" % (base_cmd, e))
continue