[checkmk-commits] Check_MK Git: check_mk: #2074 FIX pnptemplate netapp_api_volume: fixed title

Andreas Boesl ab at mathias-kettner.de
Wed Apr 29 13:22:42 CEST 2015


Module: check_mk
Branch: master
Commit: ab00ffcc020bb11ca3cc6f54c32202e0ac94a2c1
URL:    http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab00ffcc020bb11ca3cc6f54c32202e0ac94a2c1

Author: Andreas Boesl <ab at mathias-kettner.de>
Date:   Wed Apr 29 13:21:50 2015 +0200

#2074 FIX pnptemplate netapp_api_volume: fixed title

---

 .werks/2074                                   |   10 ++++++++++
 ChangeLog                                     |    1 +
 pnp-templates/check_mk-netapp_api_volumes.php |    9 ++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.werks/2074 b/.werks/2074
new file mode 100644
index 0000000..62decac
--- /dev/null
+++ b/.werks/2074
@@ -0,0 +1,10 @@
+Title: pnptemplate netapp_api_volume: fixed title
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1430306491
+
+
diff --git a/ChangeLog b/ChangeLog
index b798887..bcdb9e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -418,6 +418,7 @@
     * 2177 FIX: Host/Service statistics dashlets honor the site filter correctly now
     * 1957 FIX: Fixed default value for text input fields in notification plugins...
     * 2233 FIX: Fixed WATO folder view and Host Tags search with HTML Entity encoding...
+    * 2074 FIX: pnptemplate netapp_api_volume: fixed title
 
     WATO:
     * 1760 Added search form to manual checks page
diff --git a/pnp-templates/check_mk-netapp_api_volumes.php b/pnp-templates/check_mk-netapp_api_volumes.php
index c61f1f7..0efac99 100644
--- a/pnp-templates/check_mk-netapp_api_volumes.php
+++ b/pnp-templates/check_mk-netapp_api_volumes.php
@@ -41,14 +41,9 @@ foreach ($NAME as $i => $n) {
 # RRDtool Options
 #$servicedes=$NAGIOS_SERVICEDESC
 
-$fsname = str_replace("_", "/", substr($servicedesc, 3));
+$fsname = substr($servicedesc, 7);
 $fstitle = $fsname;
 
-# Hack for windows: replace C// with C:\
-if (strlen($fsname) == 3 && substr($fsname, 1, 2) == '//') {
-    $fsname = $fsname[0] . "\:\\\\";
-    $fstitle = $fsname[0] . ":\\";
-}
 
 $sizegb = sprintf("%.1f", $MAX[1] / 1024.0);
 $maxgb = $MAX[1] / 1024.0;
@@ -57,7 +52,7 @@ $critgb = $CRIT[1] / 1024.0;
 $warngbtxt = sprintf("%.1f", $warngb);
 $critgbtxt = sprintf("%.1f", $critgb);
 
-$opt[1] = "--vertical-label GB -l 0 -u $maxgb --title '$hostname: Filesystem $fstitle ($sizegb GB)' ";
+$opt[1] = "--vertical-label GB -l 0 -u $maxgb --title '$hostname: Volume $fstitle ($sizegb GB)' ";
 
 # First graph show current filesystem usage
 $def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX ";



More information about the checkmk-commits mailing list