Module: check_mk
Branch: master
Commit: 4083b6e3315cb5aa50bd53b3cc1508f14066a907
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4083b6e3315cb5…
Author: Marcel Arentz <ma(a)mathias-kettner.de>
Date: Mon Mar 13 13:46:34 2017 +0100
4445 FIX cisco_cpu: Fixed crash if values are empty
The checkplugin now also deals with empty values. See werk #2088 for more
information.
Change-Id: If8c32174da63ed7f26be6189b9f719fe12e7f756
---
.werks/4445 | 11 +++++++++++
checks/cisco_cpu | 8 ++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/.werks/4445 b/.werks/4445
new file mode 100644
index 0000000..fa23d70
--- /dev/null
+++ b/.werks/4445
@@ -0,0 +1,11 @@
+Title: cisco_cpu: Fixed crash if values are empty
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1489409114
+Class: fix
+
+The checkplugin now also deals with empty values. See werk #2088 for more
+information.
diff --git a/checks/cisco_cpu b/checks/cisco_cpu
index 817cbc5..0eea5af 100644
--- a/checks/cisco_cpu
+++ b/checks/cisco_cpu
@@ -30,11 +30,15 @@
cisco_cpu_default_levels = (80.0, 90.0)
def inventory_cisco_cpu(info):
- if info and info[0] != [None, None]:
+ if info and \
+ value1 = info[0][0].isdigit() and \
+ value2 = info[0][1].isdigit():
return [( None, 'cisco_cpu_default_levels') ]
def check_cisco_cpu(item, params, info):
- if info[0] == [None, None]:
+ # Value of info could be (None, None) or ("", "").
+ if not info[0][0].isdigit() and \
+ not info[0][1].isdigit():
return 3, 'No information about the CPU utilization available'
if info[0][1]: