Module: check_mk
Branch: master
Commit: 3c9c2f6953f9d592429c38072b9834cfec1cd959
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3c9c2f6953f9d5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Mar 14 13:01:25 2013 +0100
Fix PNP template for memory usage
---
pnp-templates/check_mk-mem.used.php | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/pnp-templates/check_mk-mem.used.php b/pnp-templates/check_mk-mem.used.php
index 5432603..d0c6ca0 100644
--- a/pnp-templates/check_mk-mem.used.php
+++ b/pnp-templates/check_mk-mem.used.php
@@ -38,14 +38,20 @@ foreach ($NAME as $i => $n) {
$MAX[$n] = $MAX[$i];
}
-$def[1] = "DEF:virt=$RRDFILE[3]:$DS[3]:MAX "
- . "DEF:ramx=$RRD[ramused] "
- . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX "
- . "CDEF:ram=virt,swap,- "
- ;
+$def[1] = "";
+if (isset($RRD['pagetables'])) {
+ $def[1] .= "DEF:pagetables=$RRD[pagetables] "
+ . "DEF:ram=$RRD[ramused] ";
+}
+else {
+ $def[1] .= "CDEF:pagetables=0 "
+ . "DEF:ram=$RRD[ramused] ";
+}
+
+$def[1] .= "DEF:virt=$RRDFILE[3]:$DS[3]:MAX "
+ . "DEF:swap=$RRDFILE[2]:$DS[2]:MAX "
-$def[1] .= ""
. "HRULE:$MAX[3]#000080:\"RAM+SWAP installed\" "
. "HRULE:$MAX[1]#2040d0:\"$maxgb GB RAM installed\" "
. "HRULE:$WARN[3]#FFFF00:\"Warning\" "
@@ -65,7 +71,7 @@ $def[1] .= ""
if (isset($RRD['pagetables'])) {
- $def[1] .= "DEF:pagetables=$RRD[pagetables] "
+ $def[1] .= ""
. "AREA:pagetables#ff8800:\"Page tables \":STACK "
. "GPRINT:pagetables:LAST:\"%6.0lf MB last\" "
. "GPRINT:pagetables:AVERAGE:\"%6.0lf MB avg\" "