Module: check_mk
Branch: master
Commit: 57e98ba5a974208ae7a35ceaaf88ca2869ecb053
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57e98ba5a97420…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Jan 24 18:46:57 2013 +0100
jolokia_metrics.mem/pnpgraph: fixed bugs when warn/crit levels were not set
---
checks/jolokia_metrics | 2 +
pnp-templates/check_mk-jolokia_metrics.mem.php | 26 ++++++++++++++---------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/checks/jolokia_metrics b/checks/jolokia_metrics
index d0096ef..96f686c 100644
--- a/checks/jolokia_metrics
+++ b/checks/jolokia_metrics
@@ -209,6 +209,8 @@ def check_jolokia_metrics_mem(item, params, info):
elif value >= value_max * params[what][0] / 100.0:
param_state = 1
level_info = "%s(warn at %s%%)" % (state_sign[1],
params[what][0])
+ else:
+ perfdata.append((what, value, "", "", "",
value_max))
info_list.append("%s: %0.fMB/%.1f%% used%s" % (what.title(), value,
value/value_max*100, level_info))
diff --git a/pnp-templates/check_mk-jolokia_metrics.mem.php
b/pnp-templates/check_mk-jolokia_metrics.mem.php
index 3d6ae47..c892bb2 100644
--- a/pnp-templates/check_mk-jolokia_metrics.mem.php
+++ b/pnp-templates/check_mk-jolokia_metrics.mem.php
@@ -32,17 +32,23 @@ $def[1] = ""
. "CDEF:total=heap,nonheap,+ "
. "AREA:heap#00c0ff:\"Heap\" "
- . "LINE1:$WARN[1]#a0ad00:\"Heap WARN\" "
- . "LINE1:$CRIT[1]#ad0000:\"Heap CRIT\" "
- . "LINE1:$MAX[1]#003077:\"Heap MAX\" "
+ . "LINE1:$MAX[1]#003077:\"Heap MAX\" ";
+if ($CRIT[1]) {
+ $def[1] .= "LINE1:$WARN[1]#a0ad00:\"Heap WARN\" "
+ . "LINE1:$CRIT[1]#ad0000:\"Heap CRIT\" ";
+}
- . "AREA:min_nonheap#3430bf:\"Nonheap\" "
- . "LINE1:-$WARN[2]#adfd30:\"Nonheap WARN\" "
- . "LINE1:-$CRIT[2]#ff0080:\"Nonheap CRIT\" "
- . "LINE1:-$MAX[2]#003233:\"Nonheap MAX
\" "
- . "GPRINT:total:LAST:\"Total %.2lfMB last\" "
+$def[1] .= "AREA:min_nonheap#3430bf:\"Nonheap\" "
+ . "LINE1:-$MAX[2]#003233:\"Nonheap MAX \" ";
+if ($CRIT[2]) {
+ $def[1] .= "LINE1:-$WARN[2]#adfd30:\"Nonheap WARN\" "
+ . "LINE1:-$CRIT[2]#ff0080:\"Nonheap CRIT\" ";
+}
+
+
+$def[1] .= "GPRINT:total:LAST:\"Total %.2lfMB last\" "
. "GPRINT:total:AVERAGE:\"%.2lfMB avg\" "
- . "GPRINT:total:MAX:\"%.2lfMB max \" "
- . "";
+ . "GPRINT:total:MAX:\"%.2lfMB max \" " . "";
+
?>