Module: check_mk
Branch: master
Commit: 8a87d571dc9e265cf4c91ce467e4fbd6fbae8a02
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a87d571dc9e26…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 12 09:47:26 2016 +0100
#3056 FIX vms_cpu: Fixed exception when having thresholds configured
---
.werks/3055 | 2 +-
.werks/3056 | 9 +++++++++
ChangeLog | 3 ++-
checks/vms_cpu | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.werks/3055 b/.werks/3055
index 694a94a..e0e4d75 100644
--- a/.werks/3055
+++ b/.werks/3055
@@ -1,4 +1,4 @@
-Title: ibm_svc_mdiskgrp
+Title: ibm_svc_mdiskgrp: Fixed exception in case of configured thresholds
Level: 1
Component: checks
Compatible: compat
diff --git a/.werks/3056 b/.werks/3056
new file mode 100644
index 0000000..421c029
--- /dev/null
+++ b/.werks/3056
@@ -0,0 +1,9 @@
+Title: vms_cpu: Fixed exception when having thresholds configured
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i4
+Date: 1455266828
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 91de52c..02ac762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -270,7 +270,8 @@
* 3049 FIX: esx_vsphere_hostsystem.mem_usage_cluster: Fixed exception when no
thresholds configured
* 3052 FIX: domino_mailqueues: Fixed exception when receiving empty data from SNMP
* 3054 FIX: ups_modulys_battery: Fixed wrong remaining minutes in some cases
- * 3055 FIX: ibm_svc_mdiskgrp...
+ * 3055 FIX: ibm_svc_mdiskgrp: Fixed exception in case of configured thresholds...
+ * 3056 FIX: vms_cpu: Fixed exception when having thresholds configured
Multisite:
* 2684 Added icons for downloading agent data / walks of hosts...
diff --git a/checks/vms_cpu b/checks/vms_cpu
index 88184da..64ec2de 100644
--- a/checks/vms_cpu
+++ b/checks/vms_cpu
@@ -47,11 +47,11 @@ def check_vms_cpu(item, params, info):
( "system", system ),
( "wait", wait, 0, 0 ) ]
if params:
+ warn, crit = params
perfdata = [
( "user", user ),
( "system", system ),
( "wait", wait, warn, crit ) ]
- warn, crit = params
if wait >= crit:
state = 2
infotext += '(!!)'