Module: check_mk
Branch: master
Commit: 0d3b1a0e69d9fdc664299dbabe724623940cf58b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0d3b1a0e69d9fd…
Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de>
Date: Mon Sep 16 10:50:27 2013 +0200
check_mk-ipmi.php: PNP template for Power_Meter now displays correct unit (Watts)
---
ChangeLog | 2 ++
pnp-templates/check_mk-ipmi.php | 15 +++++++++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 304fdbf..7139d8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,6 +92,8 @@
currently supported: temperature, humidity, switch contact and smoke sensors
* cisco_wlc_client: now supports low/high warn and crit levels
* cisco_wlc: now supports configuration options for missing AP
+ * FIX: check_mk-ipmi.php: PNP template for Power_Meter now displays correct
+ unit (Watts)
Notifications:
diff --git a/pnp-templates/check_mk-ipmi.php b/pnp-templates/check_mk-ipmi.php
index 2de096d..462e179 100644
--- a/pnp-templates/check_mk-ipmi.php
+++ b/pnp-templates/check_mk-ipmi.php
@@ -23,11 +23,18 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
+if (substr($NAME[1], 0, 11) == 'Power_Meter') {
+ $vlabel = "--vertical-label 'Watts'";
+} elseif (substr($NAME[1], 0, 4) == 'Temp') {
+ $vlabel = "--vertical-label 'Celsius'";
+} else {
+ $vlabel = "";
+}
-$opt[1] = "--vertical-label 'Celsius' -l0 -u60 --title \"IPMI
temperature sensors $hostname\" ";
+$opt[1] = "$vlabel -l0 -u60 --title \"IPMI sensor $NAME[1] / $hostname\"
";
-$def[1] = "DEF:temp=$RRDFILE[1]:$DS[1]:MAX ";
-$def[1] .= "AREA:temp#ffd040:\"Average ambient temperature\" ";
-$def[1] .= "LINE:temp#ff8000 ";
+$def[1] = "DEF:value=$RRDFILE[1]:$DS[1]:MAX ";
+$def[1] .= "AREA:value#ffd040:\"Sensor $NAME[1] \\n\" ";
+$def[1] .= "LINE:value#ff8000 ";
?>