Module: check_mk
Branch: master
Commit: 5d440723052a3f7baa6402fd7dbe13e034d87e6a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d440723052a3f…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Tue Feb 10 16:47:17 2015 +0100
#1942 FIX netapp_api_volumes: fixed exception when performance data generation was
enabled
---
.werks/1942 | 10 ++++++++++
ChangeLog | 1 +
checks/netapp_api_volumes | 3 ++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/1942 b/.werks/1942
new file mode 100644
index 0000000..02e3c39
--- /dev/null
+++ b/.werks/1942
@@ -0,0 +1,10 @@
+Title: netapp_api_volumes: fixed exception when performance data generation was enabled
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1423583184
+
+
diff --git a/ChangeLog b/ChangeLog
index 70ecadd..6331393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,7 @@
* 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...
+ * 1942 FIX: netapp_api_volumes: fixed exception when performance data generation was
enabled
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes
index 64de534..8640cd4 100644
--- a/checks/netapp_api_volumes
+++ b/checks/netapp_api_volumes
@@ -80,8 +80,9 @@ def check_netapp_api_volumes(item, params, parsed):
for mode in ["read_", "write_", "other_"]:
for field, factor, format_text in [ ("data", None, None),
("latency", 10000.0, "%s: %.2f ms")]:
key = protocol + mode + field
- value = int(volume.get("counters", {}).get(key))
+ value = volume.get("counters", {}).get(key)
if value != None:
+ value = int(value)
try:
timedif, delta = get_counter("netapp_api_volumes.%s.%s"
% (item, key), now, value)
perf.append( (key, delta) )