Menu
▾
▴
[Ganglia-svn] SF.net SVN: ganglia:[1733] trunk/monitor-core/web/graph.d
|
From: <ca...@us...> - 2008-08-27 21:38:24
|
Revision: 1733
http://ganglia.svn.sourceforge.net/ganglia/?rev=1733&view=rev
Author: carenas
Date: 2008-08-27 21:38:33 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
web: modular graphics white space, tab/dead code elimination and style fixes
Modified Paths:
--------------
trunk/monitor-core/web/graph.d/cpu_report.php
trunk/monitor-core/web/graph.d/load_report.php
trunk/monitor-core/web/graph.d/mem_report.php
trunk/monitor-core/web/graph.d/metric.php
trunk/monitor-core/web/graph.d/network_report.php
trunk/monitor-core/web/graph.d/packet_report.php
trunk/monitor-core/web/graph.d/sample_report.php
Modified: trunk/monitor-core/web/graph.d/cpu_report.php
===================================================================
--- trunk/monitor-core/web/graph.d/cpu_report.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/cpu_report.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -1,13 +1,12 @@
<?php
-
/* Pass in by reference! */
function graph_cpu_report ( &$rrdtool_graph ) {
- global $context,
+ global $context,
$cpu_idle_color,
- $cpu_nice_color,
- $cpu_system_color,
+ $cpu_nice_color,
+ $cpu_system_color,
$cpu_user_color,
$cpu_wio_color,
$hostname,
@@ -15,18 +14,17 @@
$rrd_dir,
$size,
$strip_domainname;
-
+
if ($strip_domainname) {
$hostname = strip_domainname($hostname);
}
- $rrdtool_graph['height'] += $size == 'medium' ? 14 : 0 ;
+ $rrdtool_graph['height'] += ($size == 'medium') ? 14 : 0;
$title = 'CPU';
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
} else {
$rrdtool_graph['title'] = "$hostname $title last $range";
-
}
$rrdtool_graph['upper-limit'] = '100';
$rrdtool_graph['lower-limit'] = '0';
@@ -35,8 +33,10 @@
if($context != "host" ) {
-
- /* If we are not in a host context, then we need to calculate the average */
+ /*
+ * If we are not in a host context, then we need to calculate
+ * the average
+ */
$series =
"DEF:'num_nodes'='${rrd_dir}/cpu_user.rrd':'num':AVERAGE "
. "DEF:'cpu_user'='${rrd_dir}/cpu_user.rrd':'sum':AVERAGE "
@@ -58,10 +58,11 @@
}
$series .= "STACK:'ccpu_idle'#$cpu_idle_color:'Idle CPU' ";
- }
- // Context is not "host"
- else {
+ } else {
+
+ /* Context is not "host" */
+
$series ="DEF:'cpu_user'='${rrd_dir}/cpu_user.rrd':'sum':AVERAGE "
."DEF:'cpu_nice'='${rrd_dir}/cpu_nice.rrd':'sum':AVERAGE "
."DEF:'cpu_system'='${rrd_dir}/cpu_system.rrd':'sum':AVERAGE "
@@ -78,7 +79,6 @@
$series .= "STACK:'cpu_idle'#$cpu_idle_color:'Idle CPU' ";
}
-
$rrdtool_graph['series'] = $series;
return $rrdtool_graph;
Modified: trunk/monitor-core/web/graph.d/load_report.php
===================================================================
--- trunk/monitor-core/web/graph.d/load_report.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/load_report.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -1,26 +1,25 @@
<?php
-
/* Pass in by reference! */
function graph_load_report ( &$rrdtool_graph ) {
- global $context,
- $cpu_num_color,
+ global $context,
+ $cpu_num_color,
$cpu_user_color,
$hostname,
$load_one_color,
$num_nodes_color,
$proc_run_color,
- $range,
+ $range,
$rrd_dir,
$size,
$strip_domainname;
-
+
if ($strip_domainname) {
$hostname = strip_domainname($hostname);
}
- $rrdtool_graph['height'] += $size == 'medium' ? 28 : 0 ;
+ $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
$title = 'Load';
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
@@ -41,11 +40,10 @@
$series .="DEF:'num_nodes'='${rrd_dir}/cpu_num.rrd':'num':AVERAGE ";
$series .= "LINE2:'num_nodes'#$num_nodes_color:'Nodes' ";
}
-
+
$series .="LINE2:'cpu_num'#$cpu_num_color:'CPUs' ";
$series .="LINE2:'proc_run'#$proc_run_color:'Running Processes' ";
-
$rrdtool_graph['series'] = $series;
return $rrdtool_graph;
Modified: trunk/monitor-core/web/graph.d/mem_report.php
===================================================================
--- trunk/monitor-core/web/graph.d/mem_report.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/mem_report.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -1,15 +1,14 @@
<?php
-
/* Pass in by reference! */
function graph_mem_report ( &$rrdtool_graph ) {
- global $context,
- $hostname,
+ global $context,
+ $hostname,
$mem_shared_color,
- $mem_cached_color,
- $mem_buffered_color,
- $mem_swapped_color,
+ $mem_cached_color,
+ $mem_buffered_color,
+ $mem_swapped_color,
$mem_used_color,
$cpu_num_color,
$range,
@@ -21,7 +20,7 @@
$hostname = strip_domainname($hostname);
}
- $title = 'Memory';
+ $title = 'Memory';
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
} else {
@@ -46,15 +45,16 @@
."STACK:'bmem_shared'#$mem_shared_color:'Memory Shared' "
."STACK:'bmem_cached'#$mem_cached_color:'Memory Cached' "
."STACK:'bmem_buffers'#$mem_buffered_color:'Memory Buffered' ";
+
if (file_exists("$rrd_dir/swap_total.rrd")) {
$series .= "DEF:'swap_total'='${rrd_dir}/swap_total.rrd':'sum':AVERAGE "
."DEF:'swap_free'='${rrd_dir}/swap_free.rrd':'sum':AVERAGE "
."CDEF:'bmem_swapped'='swap_total','swap_free',-,1024,* "
."STACK:'bmem_swapped'#$mem_swapped_color:'Memory Swapped' ";
}
+
$series .= "LINE2:'bmem_total'#$cpu_num_color:'Total In-Core Memory' ";
-
$rrdtool_graph['series'] = $series;
return $rrdtool_graph;
Modified: trunk/monitor-core/web/graph.d/metric.php
===================================================================
--- trunk/monitor-core/web/graph.d/metric.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/metric.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -1,11 +1,12 @@
<?php
-// This report is used for specific metric graphs at the bottom of the cluster_view page.
+// This report is used for specific metric graphs at the bottom of the
+// cluster_view page.
/* Pass in by reference! */
function graph_metric ( &$rrdtool_graph ) {
- global $context,
+ global $context,
$default_metric_color,
$hostname,
$jobstart,
@@ -27,17 +28,16 @@
$hostname = strip_domainname($hostname);
}
- $rrdtool_graph['height'] += 0 ; //no fudge needed
+ //no fudge needed for rrdtool_graph['height']
switch ($context) {
case 'host':
-
+
if ($summary) {
$rrdtool_graph['title'] = $hostname;
$prefix = $metricname;
- }
- else {
+ } else {
$prefix = $hostname;
if ($metrictitle) {
$rrdtool_graph['title'] = $metrictitle;
@@ -47,9 +47,9 @@
}
$prefix = $summary ? $metricname : $hostname;
- $value = $value > 1000
- ? number_format($value)
- : number_format($value,2);
+ $value = ($value > 1000)
+ ? number_format($value)
+ : number_format($value, 2);
if ($range == 'job') {
$hrs = intval (-$jobrange / 3600);
@@ -64,11 +64,11 @@
}
break;
-
+
case 'meta':
$rrdtool_graph['title'] = "$meta_designator ". $rrdtool_graph['title'] ."last $range";
break;
-
+
case 'grid':
$rrdtool_graph['title'] = "$meta_designator ". $rrdtool_graph['title'] ."last $range";
break;
@@ -78,7 +78,6 @@
break;
default:
-
if ($size == 'small') {
$rrdtool_graph['title'] = $hostname;
} else if ($summary) {
@@ -86,44 +85,29 @@
} else {
$rrdtool_graph['title'] = $metricname;
}
-
break;
-
+
}
- if ($load_color)
+ if ($load_color)
$rrdtool_graph['color'] = "BACK#'$load_color'";
if (isset($max) && is_numeric($max))
$rrdtool_graph['upper-limit'] = $max;
-
+
if (isset($min) && is_numeric($min))
$rrdtool_graph['lower-limit'] = $min;
-
- if ($vlabel ) {
- // We should set $vlabel, even if it isn't used for spacing
- // and alignment reasons. This is mostly for aesthetics
- $temp_vlabel = trim($vlabel);
- $rrdtool_graph['vertical-label'] = strlen($temp_vlabel)
+
+ if ($vlabel) {
+ // We should set $vlabel, even if it isn't used for spacing
+ // and alignment reasons. This is mostly for aesthetics
+ $temp_vlabel = trim($vlabel);
+ $rrdtool_graph['vertical-label'] = strlen($temp_vlabel)
? $temp_vlabel
: ' ';
} else {
$rrdtool_graph['vertical-label'] = ' ';
}
- /* else if ( isset($rrdtool_graph['lower-limit']) or
- isset($rrdtool_graph['upper-limit']) ) {
- $max = $max > 1000
- ? number_format($max)
- : number_format($max,2);
- $min = $min = 0
- ? $min
- : number_format($min,2);
- $rrdtool_graph['vertical-label'] = "'$min - $max'";
- }
- else {
- $rrdtool_graph['vertical-label'] = "";
- }
- */
//# the actual graph...
$series = "DEF:'sum'='$rrd_dir/$metricname.rrd:sum':AVERAGE ";
@@ -132,8 +116,8 @@
if ($jobstart) {
$series .= "VRULE:$jobstart#$jobstart_color ";
- }
-
+ }
+
$rrdtool_graph['series'] = $series;
return $rrdtool_graph;
Modified: trunk/monitor-core/web/graph.d/network_report.php
===================================================================
--- trunk/monitor-core/web/graph.d/network_report.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/network_report.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -1,12 +1,11 @@
<?php
-
/* Pass in by reference! */
function graph_network_report ( &$rrdtool_graph ) {
- global $context,
+ global $context,
$hostname,
- $mem_cached_color,
+ $mem_cached_color,
$mem_used_color,
$cpu_num_color,
$range,
@@ -19,7 +18,7 @@
}
$title = 'Network';
- $rrdtool_graph['height'] += $size == 'medium' ? 28 : 0 ;
+ $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
} else {
Modified: trunk/monitor-core/web/graph.d/packet_report.php
===================================================================
--- trunk/monitor-core/web/graph.d/packet_report.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/packet_report.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -1,25 +1,24 @@
<?php
-
/* Pass in by reference! */
function graph_packet_report ( &$rrdtool_graph ) {
- global $context,
+ global $context,
$hostname,
- $mem_cached_color,
+ $mem_cached_color,
$mem_used_color,
$cpu_num_color,
$range,
$rrd_dir,
$size,
$strip_domainname;
-
+
if ($strip_domainname) {
$hostname = strip_domainname($hostname);
}
- $title = 'Packets';
- $rrdtool_graph['height'] += $size == 'medium' ? 28 : 0 ;
+ $title = 'Packets';
+ $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
} else {
Modified: trunk/monitor-core/web/graph.d/sample_report.php
===================================================================
--- trunk/monitor-core/web/graph.d/sample_report.php 2008-08-26 18:41:05 UTC (rev 1732)
+++ trunk/monitor-core/web/graph.d/sample_report.php 2008-08-27 21:38:33 UTC (rev 1733)
@@ -4,68 +4,74 @@
/* Instructions for adding custom reports
-1) Reports should have a primary function named: "<yourtesthere>_report". This
- fuction will be called from the graph.php script automatically.
+1) Reports should have a primary function named: "<yourtesthere>_report".
+ This fuction will be called from the graph.php script automatically.
-2) The *_report script should return an array that contains at least the variables
- listed below. Several have been pre-populated, and may not need to be changed.
- However, you will have to alter at least these: $series, $title, $vertical_label
-
-3) An array variable is passed to the function in order to make sure that certain
- variables are available for use. This is PASSED BY REFERENCE and CAN BE CHANGED
- by your report function.
-
+2) The *_report script should return an array that contains at least the
+ variables listed below. Several have been pre-populated, and may not need
+ to be changed.
+ However, you will have to alter at least these: $series, $title, and
+ $vertical_label
-NOTE: These are all actually keys in a hash, not specific variables by themselves.
+3) An array variable is passed to the function in order to make sure that
+ certain variables are available for use. This is PASSED BY REFERENCE
+ and CAN BE CHANGED by your report function.
+NOTE: These are all actually keys in a hash, not specific variables by
+ themselves.
+
A full list of variables that will be used:
-
$series (string: holds the meat of the rrdgraph definition)
$title (string: title of the report)
$vertical_label (label for Y-Axis.)
- $start (String: Start time of the graph, can usually be left alone)
- $end (String: End time of the graph, also can usually be left alone)
+ $start (string: Start time of the graph, can usually be
+ left alone)
+ $end (string: End time of the graph, also can usually be
+ left alone)
- $width (Strings: Width and height of *graph*, the actual image will be
- $height slightly larger due to text elements and padding. These
- are normally set automatically, depending on the graph size
- chosen from the web UI)
+ $width (strings: Width and height of *graph*, the actual image
+ $height will be slightly larger due to text elements
+ and padding. These are normally set
+ automatically, depending on the graph size
+ chosen from the web UI)
- $upper-limit (Strings: Maximum and minimum Y-value for the graph. RRDTool
- $lower-limit normally will auto-scale the Y min and max to fit the
- data. You may override this by setting these variables
- to specific limits. The default value is a null string,
- which will force the auto-scale behavior)
-
- $color (ARRAY: Sets one or more chart colors. Usually used for setting
- the background color of the chart. Valid array keys are
- BACK, CANVAS, SADEA, SHADEB, FONT, FRAME and ARROW. Usually,
- only BACK is set).
-
+ $upper-limit (strings: Maximum and minimum Y-value for the graph.
+ $lower-limit RRDTool normally will auto-scale the Y min
+ and max to fit the data. You may override
+ this by setting these variables to specific
+ limits. The default value is a null string,
+ which will force the auto-scale behavior)
+
+ $color (array: Sets one or more chart colors. Usually used
+ for setting the background color of the chart.
+ Valid array keys are BACK, CANVAS, SADEA,
+ SHADEB, FONT, FRAME and ARROW. Usually,
+ only BACK is set).
+
$extras (Any other custom rrdtool commands can be added to this
- this variable. For example, setting a different --base
+ variable. For example, setting a different --base
value or use a --logarithmic scale)
-
-
-For more information and specifics, see the man page for 'rrdgraph'.
-
+For more information and specifics, see the man page for 'rrdgraph'.
+
*/
-
function graph_sample_report ( &$rrdtool_graph ) {
-/* this is just the cpu_report (from revision r920) as an example, but with extra comments */
+/*
+ * this is just the cpu_report (from revision r920) as an example, but
+ * with extra comments
+ */
- // pull in a number of global variables, many set in conf.php (such as colors and $rrd_dir),
- // but other from elsewhere, such as get_context.php
+// pull in a number of global variables, many set in conf.php (such as colors
+// and $rrd_dir), but other from elsewhere, such as get_context.php
- global $context,
+ global $context,
$cpu_idle_color,
- $cpu_nice_color,
- $cpu_system_color,
+ $cpu_nice_color,
+ $cpu_system_color,
$cpu_user_color,
$cpu_wio_color,
$hostname,
@@ -79,28 +85,35 @@
}
//
- // You *MUST* set at least the 'title', 'vertical-label', and 'series' variables.
- // Otherwise, the graph *will not work*.
+ // You *MUST* set at least the 'title', 'vertical-label', and 'series'
+ // variables otherwise, the graph *will not work*.
//
$title = 'Sample';
if ($context != 'host') {
+ // This will be turned into: "Clustername $TITLE last $timerange",
+ // so keep it short
$rrdtool_graph['title'] = $title;
- // This will be turned into:
- // "Clustername $TITLE last $timerange", so keep it short
} else {
$rrdtool_graph['title'] = "$hostname $title last $range";
}
$rrdtool_graph['vertical-label'] = 'Sample Percent';
- $rrdtool_graph['height'] += $size == 'medium' ? 28 : 0 ; // Fudge to account for number of lines in the chart legend
+ // Fudge to account for number of lines in the chart legend
+ $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
$rrdtool_graph['upper-limit'] = '100';
$rrdtool_graph['lower-limit'] = '0';
$rrdtool_graph['extras'] = '--rigid';
- /* Here we actually build the chart series. This is moderately complicated
- to show off what you can do. For a simpler example, look at network_report.php */
+ /*
+ * Here we actually build the chart series. This is moderately complicated
+ * to show off what you can do. For a simpler example, look at
+ * network_report.php
+ */
if($context != "host" ) {
- /* If we are not in a host context, then we need to calculate the average */
+ /*
+ * If we are not in a host context, then we need to calculate
+ * the average
+ */
$series =
"DEF:'num_nodes'='${rrd_dir}/cpu_user.rrd':'num':AVERAGE "
. "DEF:'cpu_user'='${rrd_dir}/cpu_user.rrd':'sum':AVERAGE "
@@ -122,10 +135,10 @@
}
$series .= "STACK:'ccpu_idle'#$cpu_idle_color:'Idle CPU' ";
- }
- // Context is not "host"
- else {
+ } else {
+
+ // Context is not "host"
$series ="DEF:'cpu_user'='${rrd_dir}/cpu_user.rrd':'sum':AVERAGE "
. "DEF:'cpu_nice'='${rrd_dir}/cpu_nice.rrd':'sum':AVERAGE "
. "DEF:'cpu_system'='${rrd_dir}/cpu_system.rrd':'sum':AVERAGE "
@@ -142,7 +155,6 @@
$series .= "STACK:'cpu_idle'#$cpu_idle_color:'Idle CPU' ";
}
-
// We have everything now, so add it to the array, and go on our way.
$rrdtool_graph['series'] = $series;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|