Module: check_mk
Branch: master
Commit: 8c33211561f11fb90cca817e628bef315af4afa6
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c33211561f11f…
Author: Simon Betz <si(a)mathias-kettner.de>
Date: Thu Sep 13 09:01:18 2018 +0200
6589 FIX ibm_svc_mdiskgrp: Fixed disregarded provisioning state
Change-Id: I3680fea968c3574cd36ba0b2470133e2e2dfed5b
---
.werks/6589 | 10 ++++++++++
checks/ibm_svc_mdiskgrp | 13 +++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/.werks/6589 b/.werks/6589
new file mode 100644
index 0000000..a50e12a
--- /dev/null
+++ b/.werks/6589
@@ -0,0 +1,10 @@
+Title: ibm_svc_mdiskgrp: Fixed disregarded provisioning state
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.6.0i1
+Date: 1536822012
+Class: fix
+
+
diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp
index 98e9a1d..e08002d 100644
--- a/checks/ibm_svc_mdiskgrp
+++ b/checks/ibm_svc_mdiskgrp
@@ -98,15 +98,20 @@ def check_ibm_svc_mdiskgrp(item, params, info):
# Compute provisioning
if not capacity:
return # provisioning does not make sense when capacity is 0
+
provisioning = 100.0 * virtual_capacity / capacity
+ infotext = "Provisioning: %s" %
get_percent_human_readable(provisioning)
+ state = 0
if "provisioning_levels" in params:
warn, crit = params["provisioning_levels"]
if provisioning >= crit:
state = 2
elif provisioning >= warn:
state = 1
- else:
- state = 0
+ if state:
+ infotext += " (warn/crit at %s/%s)" % (
+ get_percent_human_readable(warn),
+ get_percent_human_readable(crit))
warn_mb = capacity * mb * warn / 100
crit_mb = capacity * mb * crit / 100
else:
@@ -115,8 +120,8 @@ def check_ibm_svc_mdiskgrp(item, params, info):
# Note: Performance data is now (with new metric system) normed to
# canonical units - i.e. 1 byte in this case.
- yield 0, "Provisioning: %s" %
get_percent_human_readable(provisioning), \
- [ ( "fs_provisioning", virtual_capacity*mb, warn_mb, crit_mb, 0,
capacity * mb) ]
+ yield state, infotext, [("fs_provisioning", virtual_capacity*mb,
+ warn_mb, crit_mb, 0, capacity * mb)]