Fixed graph template
Message-ID: <551525c1.N9LbjG4by1pYzJxy%lm(a)mathias-kettner.de>
User-Agent: Heirloom mailx 12.5 6/20/10
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: 1314de3512161770788900d497e6b2bd0efd29d2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1314de35121617…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Mar 27 10:41:15 2015 +0100
#2169 FIX jolokia_metrics.threads: Fixed graph template
The graphs were scaled wrong and all three graphs were showing the same information
Thanks for the patch to Ricardo Francisco T. Ribeiro!
---
.werks/2169 | 11 +++++++++++
ChangeLog | 1 +
pnp-templates/check_mk-jolokia_metrics.threads.php | 19 +++++++------------
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/.werks/2169 b/.werks/2169
new file mode 100644
index 0000000..d681f1e
--- /dev/null
+++ b/.werks/2169
@@ -0,0 +1,11 @@
+Title: jolokia_metrics.threads: Fixed graph template
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1427449149
+
+The graphs were scaled wrong and all three graphs were showing the same information
+Thanks for the patch to Ricardo Francisco T. Ribeiro!
diff --git a/ChangeLog b/ChangeLog
index 43ff5b5..dc9c923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -287,6 +287,7 @@
* 2162 FIX: citrix_sessions: Handle not set thresholds on single values correctly...
* 2163 FIX: printer_supply: Now auto detects whether or not a supply is consumable or
filling up...
* 2164 FIX: printer_supply: Fixed handling different capacities than percentage when
used upturned levels
+ * 2169 FIX: jolokia_metrics.threads: Fixed graph template...
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request,
added mailto link for error report...
diff --git a/pnp-templates/check_mk-jolokia_metrics.threads.php
b/pnp-templates/check_mk-jolokia_metrics.threads.php
index 4c1c370..43e0d1f 100644
--- a/pnp-templates/check_mk-jolokia_metrics.threads.php
+++ b/pnp-templates/check_mk-jolokia_metrics.threads.php
@@ -24,8 +24,7 @@
# Boston, MA 02110-1301 USA.
$title = str_replace("_", " ", $servicedesc);
-$opt[1] = "--vertical-label 'ThreadRate' -l 0 --title \"ThreadRate of
$title\" ";
-
+$opt[1] = "--vertical-label 'ThreadRate' -l0 --title \"ThreadRate of
$title\" ";
$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:AVERAGE " ;
$def[1] .= "AREA:var1#F2F2F2:\"\" " ;
$def[1] .= "LINE1:var1#FF6600:\"ThreadRate \" " ;
@@ -33,12 +32,10 @@ $def[1] .= "GPRINT:var1:LAST:\"%3.2lf LAST \" ";
$def[1] .= "GPRINT:var1:MAX:\"%3.2lf MAX \" ";
$def[1] .= "GPRINT:var1:AVERAGE:\"%3.2lf AVERAGE \" ";
-
-$opt[2] = "--vertical-label \"ThreadCount\" -u102 -l0 --title
\"Different ThreadCounts of $servicedesc\" ";
-$def[2] = "DEF:var1=$RRDFILE[1]:$DS[2]:AVERAGE " ;
-$def[2] .= "DEF:var2=$RRDFILE[1]:$DS[3]:AVERAGE " ;
-$def[2] .= "DEF:var3=$RRDFILE[1]:$DS[4]:AVERAGE " ;
-#
+$opt[2] = "--vertical-label 'ThreadCount' -l0 --title \"Different
ThreadCounts of $servicedesc\" ";
+$def[2] = "DEF:var1=$RRDFILE[2]:$DS[2]:AVERAGE " ;
+$def[2] .= "DEF:var2=$RRDFILE[3]:$DS[3]:AVERAGE " ;
+$def[2] .= "DEF:var3=$RRDFILE[4]:$DS[4]:AVERAGE " ;
$def[2] .= "AREA:var1#FFFFFF:\"\" " ;
$def[2] .= "AREA:var2#FFFFFF:\"\" " ;
$def[2] .= "AREA:var3#FFFFFF:\"\" " ;
@@ -49,12 +46,10 @@ $def[2] .= rrd::gprint("var2", array("LAST",
"MAX", "AVERAGE"),"%3.0lf");
$def[2] .= "LINE1:var3#0CD524:\"PeakThreadCount \" " ;
$def[2] .= rrd::gprint("var3", array("LAST", "MAX",
"AVERAGE"),"%3.0lf");
-#TotalStartedThreadCount
+# TotalStartedThreadCount
$opt[3] = "--vertical-label \"TotalStartedThreadCount\" -l0 --title
\"TotalStartedThreadCount of $title\" ";
-#
-$def[3] = "DEF:var1=$RRDFILE[1]:$DS[5]:AVERAGE " ;
+$def[3] = "DEF:var1=$RRDFILE[5]:$DS[5]:AVERAGE " ;
$def[3] .= "AREA:var1#F2F2F2:\"\" " ;
$def[3] .= "LINE1:var1#FF6600:\"TotalStartedThreadCount \" " ;
$def[3] .= "GPRINT:var1:LAST:\"%3.0lf current \" ";
?>
-