Module: check_mk
Branch: master
Commit: bd4d85bf48692811975fcafc3469dba84252e42c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd4d85bf486928…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 4 08:37:35 2015 +0100
#2088 FIX cisco_cpu: Dealing with non CPU utilization information correctly
The check resulted in an exception when the host could be contacted
via SNMP, but the host did not provide a value for the CPU utilization.
---
.werks/2088 | 11 +++++++++++
ChangeLog | 1 +
checks/cisco_cpu | 5 ++++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/.werks/2088 b/.werks/2088
new file mode 100644
index 0000000..3ed81c2
--- /dev/null
+++ b/.werks/2088
@@ -0,0 +1,11 @@
+Title: cisco_cpu: Dealing with non CPU utilization information correctly
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1425454581
+
+The check resulted in an exception when the host could be contacted
+via SNMP, but the host did not provide a value for the CPU utilization.
diff --git a/ChangeLog b/ChangeLog
index c17ee8f..9f1ba8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -223,6 +223,7 @@
* 2086 FIX: apc_ats_status: Fixed exception when source different than selected
source
* 2087 FIX: netapp_api_temp: Fixed exception when dealing with old discovered
checks...
* 2051 FIX: windows agent: no longer outputs stderr of local and plugin scripts...
+ * 2088 FIX: cisco_cpu: Dealing with non CPU utilization information correctly...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/checks/cisco_cpu b/checks/cisco_cpu
index 03e41d5..d548137 100644
--- a/checks/cisco_cpu
+++ b/checks/cisco_cpu
@@ -30,10 +30,13 @@
cisco_cpu_default_levels = (80.0, 90.0)
def inventory_cisco_cpu(info):
- if info:
+ if info and info[0] != [None, None]:
return [( None, 'cisco_cpu_default_levels') ]
def check_cisco_cpu(item, params, info):
+ if info[0] == [None, None]:
+ return 3, 'No information about the CPU utilization available'
+
if info[0][1]:
util = float(info[0][1])
else: