24 Jul
2013
24 Jul
'13
12:13 p.m.
Module: check_mk
Branch: master
Commit: f04de0990d42225ae1ab3eea1918ec3349a42783
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f04de0990d4222…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jul 24 12:12:19 2013 +0200
Fixed pnp-template of ps.perf when no cpu usage thresholds are set
---
pnp-templates/check_mk-ps.perf.php | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php
index 1a00285..eaa3503 100644
--- a/pnp-templates/check_mk-ps.perf.php
+++ b/pnp-templates/check_mk-ps.perf.php
@@ -76,24 +76,24 @@ if (isset($RRD["vsz"])) {
}
if (isset($RRD["pcpu"])) {
- $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU
Usage\" ";
- $def[3] = ""
- . "DEF:pcpu=$RRD[pcpu] "
- . "AREA:pcpu#30ff80:\"CPU usage (%) \" "
- . "LINE:pcpu#20a060:\"\" "
- . "GPRINT:pcpu:LAST:\"Current\: %4.1lf%%\" "
- . "GPRINT:pcpu:MIN:\"Min\: %4.1lf%%\" "
- . "GPRINT:pcpu:MAX:\"Max\: %4.1lf%%\\n\" "
- . "HRULE:$WARN[pcpu]#FFFF00:\"Warning at $WARN[pcpu]%\" "
- . "HRULE:$CRIT[pcpu]#FF0000:\"Critical at $CRIT[pcpu]%\" "
- ;
- if (isset($RRD["pcpuavg"])) {
- $def[3] .=
- "DEF:pcpuavg=$RRD[pcpuavg] ".
- "LINE:pcpuavg#000000:\"Average over $MAX[pcpuavg] minutes\\n\"
"
- ;
- }
-}
+ $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU
Usage\" ";
+ $def[3] = ""
+ . "DEF:pcpu=$RRD[pcpu] "
+ . "AREA:pcpu#30ff80:\"CPU usage (%) \" "
+ . "LINE:pcpu#20a060:\"\" "
+ . "GPRINT:pcpu:LAST:\"Current\: %4.1lf%%\" "
+ . "GPRINT:pcpu:MIN:\"Min\: %4.1lf%%\" "
+ . "GPRINT:pcpu:MAX:\"Max\: %4.1lf%%\\n\" ";
+
+ if ($WARN['pcpu'] != '')
+ $def[3] .= "HRULE:$WARN[pcpu]#FFFF00:\"Warning at $WARN[pcpu]%\"
";
+ if ($CRIT['pcpu'] != '')
+ $def[3] .= "HRULE:$CRIT[pcpu]#FF0000:\"Critical at $CRIT[pcpu]%\"
";
+ if (isset($RRD["pcpuavg"])) {
+ $def[3] .= "DEF:pcpuavg=$RRD[pcpuavg] "
+ "LINE:pcpuavg#000000:\"Average over $MAX[pcpuavg]
minutes\\n\" ";
+ }
+}
?>