On Sat, Oct 18, 2008 at 01:14:32PM -0400, Jesse Becker wrote:
> Just a note that I've added a backport proposal for bugzilla ID#206
> into the 3.1.x branch STATUS file.
great, since Timothy did most of the work for it, I am sure he will be
interested in commenting about it so inlining the path below for discussion
> I've
> consolidated several patches from trunk into a single patch, and
> posted it. Please review, test and vote.
was just looking at that and I have to admit I am not sure why a consolidated
patch that diverts from trunk will be needed.
couldn't just a merge from all relevant patches in trunk be used for
backport?, if there are few "minor textual changes" why not include them as
well to avoid having later conflicts when trying to merge further stuff from
trunk?
if the changes that were skipped were not good for 3.1, then they are not good
for trunk either and that could be fixed with further patches in trunk than
then could be added to the list of patches from 3.1 for backport.
Carlo
---
Index: graph.d/mem_report.php
===================================================================
--- graph.d/mem_report.php (revision 1868)
+++ graph.d/mem_report.php (working copy)
@@ -30,30 +30,44 @@
$rrdtool_graph['vertical-label'] = 'Bytes';
$rrdtool_graph['extras'] = '--rigid --base 1024';
- $series = "DEF:'mem_total'='${rrd_dir}/mem_total.rrd':'sum':AVERAGE "
- ."CDEF:'bmem_total'=mem_total,1024,* "
- ."DEF:'mem_shared'='${rrd_dir}/mem_shared.rrd':'sum':AVERAGE "
- ."CDEF:'bmem_shared'=mem_shared,1024,* "
- ."DEF:'mem_free'='${rrd_dir}/mem_free.rrd':'sum':AVERAGE "
- ."CDEF:'bmem_free'=mem_free,1024,* "
- ."DEF:'mem_cached'='${rrd_dir}/mem_cached.rrd':'sum':AVERAGE "
- ."CDEF:'bmem_cached'=mem_cached,1024,* "
- ."DEF:'mem_buffers'='${rrd_dir}/mem_buffers.rrd':'sum':AVERAGE "
- ."CDEF:'bmem_buffers'=mem_buffers,1024,* "
-
."CDEF:'bmem_used'='bmem_total','bmem_shared',-,'bmem_free',-,'bmem_cached',-,'bmem_buffers',-
"
- ."AREA:'bmem_used'#$mem_used_color:'Memory Used' "
- ."STACK:'bmem_shared'#$mem_shared_color:'Memory Shared' "
- ."STACK:'bmem_cached'#$mem_cached_color:'Memory Cached' "
- ."STACK:'bmem_buffers'#$mem_buffered_color:'Memory Buffered' ";
+ $fmt = '%.1lf';
+ $series = "'DEF:mem_total=${rrd_dir}/mem_total.rrd:sum:AVERAGE' "
+ . "'CDEF:bmem_total=mem_total,1024,*' "
+ . "'DEF:mem_shared=${rrd_dir}/mem_shared.rrd:sum:AVERAGE' "
+ . "'CDEF:bmem_shared=mem_shared,1024,*' "
+ . "'DEF:mem_free=${rrd_dir}/mem_free.rrd:sum:AVERAGE' "
+ . "'CDEF:bmem_free=mem_free,1024,*' "
+ . "'DEF:mem_cached=${rrd_dir}/mem_cached.rrd:sum:AVERAGE' "
+ . "'CDEF:bmem_cached=mem_cached,1024,*' "
+ . "'DEF:mem_buffers=${rrd_dir}/mem_buffers.rrd:sum:AVERAGE' "
+ . "'CDEF:bmem_buffers=mem_buffers,1024,*' "
+ .
"'CDEF:bmem_used=bmem_total,bmem_shared,-,bmem_free,-,bmem_cached,-,bmem_buffers,-'
"
+ . "'AREA:bmem_used#$mem_used_color:Used' "
+ . "'GPRINT:bmem_used:AVERAGE:$fmt%S' "
+ . "'STACK:bmem_shared#$mem_shared_color:Shared' "
+ . "'GPRINT:bmem_shared:AVERAGE:$fmt%S' "
+ . "'STACK:bmem_cached#$mem_cached_color:Cached' "
+ . "'GPRINT:bmem_cached:AVERAGE:$fmt%S\\l' "
+ . "'STACK:bmem_buffers#$mem_buffered_color:Buffered' "
+ . "'GPRINT:bmem_buffers:AVERAGE:$fmt%S' ";
+
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 .= "'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:Swapped' "
+ . "'GPRINT:bmem_swapped:AVERAGE:$fmt%S\\g' "
+ . "'CDEF:bswap_total=swap_total,1024,*' "
+ . "'GPRINT:bswap_total:AVERAGE:/$fmt%S\\g' "
+ . "'CDEF:swap_util=swap_total,swap_free,-,swap_total,/,100,*' "
+ . "'GPRINT:swap_util:AVERAGE: ($fmt%%)\\l' ";
}
- $series .= "LINE2:'bmem_total'#$cpu_num_color:'Total In-Core Memory' ";
+ $series .= "'LINE2:bmem_total#$cpu_num_color:Total In-Core' ";
+ $series .= "'GPRINT:bmem_total:AVERAGE:$fmt%S' "
+ . "'CDEF:util=bmem_total,bmem_free,-,bmem_total,/,100,*' "
+ . "'GPRINT:util:AVERAGE:($fmt%% Real Memory Used)\\l' ";
$rrdtool_graph['series'] = $series;
Index: graph.d/load_report.php
===================================================================
--- graph.d/load_report.php (revision 1868)
+++ graph.d/load_report.php (working copy)
@@ -19,7 +19,7 @@
$hostname = strip_domainname($hostname);
}
- $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
+ $rrdtool_graph['height'] += ($size != 'small') ? 14 : 0;
$title = 'Load';
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
@@ -30,19 +30,33 @@
$rrdtool_graph['vertical-label'] = 'Load/Procs';
$rrdtool_graph['extras'] = '--rigid';
- $series = "DEF:'load_one'='${rrd_dir}/load_one.rrd':'sum':AVERAGE "
- ."DEF:'proc_run'='${rrd_dir}/proc_run.rrd':'sum':AVERAGE "
- ."DEF:'cpu_num'='${rrd_dir}/cpu_num.rrd':'sum':AVERAGE ";
+ $pctfmt = '%3.0lf';
+ $numfmt = '%7.1lf';
+ $intfmt = '%5.0lf';
- $series .="AREA:'load_one'#$load_one_color:'1-min Load' ";
+ $series = "'DEF:load_one=${rrd_dir}/load_one.rrd:sum:AVERAGE' "
+ . "'DEF:proc_run=${rrd_dir}/proc_run.rrd:sum:AVERAGE' "
+ . "'DEF:cpu_num=${rrd_dir}/cpu_num.rrd:sum:AVERAGE' ";
+ $series .= "'AREA:load_one#$load_one_color:1-min Load ' ";
+ $series .= "'GPRINT:load_one:AVERAGE:$numfmt' ";
+ $series .= "'CDEF:util=load_one,cpu_num,/,100,*' ";
+ $series .= "'GPRINT:util:AVERAGE:($pctfmt%%)' ";
+
+ $series .= "'LINE2:cpu_num#$cpu_num_color:CPUs ' ";
+ $series .= "'GPRINT:cpu_num:AVERAGE:$intfmt\\l' ";
+
+ $series .= "'LINE2:proc_run#$proc_run_color:Running Procs' ";
+ $series .= "'GPRINT:proc_run:AVERAGE:$numfmt' ";
+ $series .= "'CDEF:util2=proc_run,cpu_num,/,100,*' ";
+ $series .= "'GPRINT:util2:AVERAGE:($pctfmt%%)' ";
+
if( $context != 'host' ) {
- $series .="DEF:'num_nodes'='${rrd_dir}/cpu_num.rrd':'num':AVERAGE ";
- $series .= "LINE2:'num_nodes'#$num_nodes_color:'Nodes' ";
+ $series .= "'DEF:num_nodes=${rrd_dir}/cpu_num.rrd:num:AVERAGE' ";
+ $series .= "'LINE2:num_nodes#$num_nodes_color:Nodes' ";
+ $series .= "'GPRINT:num_nodes:AVERAGE:$intfmt' ";
}
- $series .="LINE2:'cpu_num'#$cpu_num_color:'CPUs' ";
- $series .="LINE2:'proc_run'#$proc_run_color:'Running Processes' ";
$rrdtool_graph['series'] = $series;
Index: graph.d/cpu_report.php
===================================================================
--- graph.d/cpu_report.php (revision 1868)
+++ graph.d/cpu_report.php (working copy)
@@ -19,7 +19,7 @@
$hostname = strip_domainname($hostname);
}
- $rrdtool_graph['height'] += ($size == 'medium') ? 14 : 0;
+ $rrdtool_graph['height'] += ($size != 'small') ? 14 : 0;
$title = 'CPU';
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
@@ -31,53 +31,68 @@
$rrdtool_graph['vertical-label'] = 'Percent';
$rrdtool_graph['extras'] = '--rigid';
- if($context != "host" ) {
+ $fmt = '%5.1lf';
+ if($context != "host") {
+
/*
* 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 "
- . "CDEF:'ccpu_user'=cpu_user,num_nodes,/ "
- . "DEF:'cpu_nice'='${rrd_dir}/cpu_nice.rrd':'sum':AVERAGE "
- . "CDEF:'ccpu_nice'=cpu_nice,num_nodes,/ "
- . "DEF:'cpu_system'='${rrd_dir}/cpu_system.rrd':'sum':AVERAGE "
- . "CDEF:'ccpu_system'=cpu_system,num_nodes,/ "
- . "DEF:'cpu_idle'='${rrd_dir}/cpu_idle.rrd':'sum':AVERAGE "
- . "CDEF:'ccpu_idle'=cpu_idle,num_nodes,/ "
- . "AREA:'ccpu_user'#$cpu_user_color:'User CPU' "
- . "STACK:'ccpu_nice'#$cpu_nice_color:'Nice CPU' "
- . "STACK:'ccpu_system'#$cpu_system_color:'System CPU' ";
+ "'DEF:num_nodes=${rrd_dir}/cpu_user.rrd:num:AVERAGE' "
+ . "'DEF:cpu_user=${rrd_dir}/cpu_user.rrd:sum:AVERAGE' "
+ . "'CDEF:ccpu_user=cpu_user,num_nodes,/,0,110,LIMIT' "
+ . "'DEF:cpu_nice=${rrd_dir}/cpu_nice.rrd:sum:AVERAGE' "
+ . "'CDEF:ccpu_nice=cpu_nice,num_nodes,/,0,110,LIMIT' "
+ . "'DEF:cpu_system=${rrd_dir}/cpu_system.rrd:sum:AVERAGE' "
+ . "'CDEF:ccpu_system=cpu_system,num_nodes,/,0,110,LIMIT' "
+ . "'DEF:cpu_idle=${rrd_dir}/cpu_idle.rrd:sum:AVERAGE' "
+ . "'CDEF:ccpu_idle=cpu_idle,num_nodes,/,0,110,LIMIT' "
+ . "'AREA:ccpu_user#$cpu_user_color:User' "
+ . "'GPRINT:ccpu_user:AVERAGE:$fmt%%' "
+ . "'STACK:ccpu_nice#$cpu_nice_color:Nice' "
+ . "'GPRINT:ccpu_nice:AVERAGE:$fmt%%' "
+ . "'STACK:ccpu_system#$cpu_system_color:System' "
+ . "'GPRINT:ccpu_system:AVERAGE:$fmt%%\\l' ";
if (file_exists("$rrd_dir/cpu_wio.rrd")) {
- $series .= "DEF:'cpu_wio'='${rrd_dir}/cpu_wio.rrd':'sum':AVERAGE "
- ."CDEF:'ccpu_wio'=cpu_wio,num_nodes,/ "
- ."STACK:'ccpu_wio'#$cpu_wio_color:'WAIT CPU' ";
+ $series .= "'DEF:cpu_wio=${rrd_dir}/cpu_wio.rrd:sum:AVERAGE' "
+ . "'CDEF:ccpu_wio=cpu_wio,num_nodes,/,0,110,LIMIT' "
+ . "'STACK:ccpu_wio#$cpu_wio_color:Wait' "
+ . "'GPRINT:ccpu_wio:AVERAGE:$fmt%%' ";
}
- $series .= "STACK:'ccpu_idle'#$cpu_idle_color:'Idle CPU' ";
+ $series .= "'STACK:ccpu_idle#$cpu_idle_color:Idle' ";
+ $series .= "'GPRINT:ccpu_idle:AVERAGE:$fmt%%' ";
+ $series .= "'CDEF:util=100,ccpu_idle,-,0,110,LIMIT' ";
} else {
- /* Context is not "host" */
+ /* Context is "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 "
- ."DEF:'cpu_idle'='${rrd_dir}/cpu_idle.rrd':'sum':AVERAGE "
- ."AREA:'cpu_user'#$cpu_user_color:'User CPU' "
- ."STACK:'cpu_nice'#$cpu_nice_color:'Nice CPU' "
- ."STACK:'cpu_system'#$cpu_system_color:'System CPU' ";
+ $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' "
+ . "'DEF:cpu_idle=${rrd_dir}/cpu_idle.rrd:sum:AVERAGE' "
+ . "'AREA:cpu_user#$cpu_user_color:User' "
+ . "'GPRINT:cpu_user:AVERAGE:$fmt%%' "
+ . "'STACK:cpu_nice#$cpu_nice_color:Nice' "
+ . "'GPRINT:cpu_nice:AVERAGE:$fmt%%' "
+ . "'STACK:cpu_system#$cpu_system_color:System' "
+ . "'GPRINT:cpu_system:AVERAGE:$fmt%%\\l' ";
if (file_exists("$rrd_dir/cpu_wio.rrd")) {
- $series .= "DEF:'cpu_wio'='${rrd_dir}/cpu_wio.rrd':'sum':AVERAGE ";
- $series .= "STACK:'cpu_wio'#$cpu_wio_color:'WAIT CPU' ";
+ $series .= "'DEF:cpu_wio=${rrd_dir}/cpu_wio.rrd:sum:AVERAGE' ";
+ $series .= "'STACK:cpu_wio#$cpu_wio_color:WAIT' ";
+ $series .= "'GPRINT:cpu_wio:AVERAGE:$fmt%%' ";
}
- $series .= "STACK:'cpu_idle'#$cpu_idle_color:'Idle CPU' ";
+ $series .= "'STACK:cpu_idle#$cpu_idle_color:Idle' ";
+ $series .= "'GPRINT:cpu_idle:AVERAGE:$fmt%%' ";
+ $series .= "'CDEF:util=100,cpu_idle,-' ";
}
+ $series .= "'GPRINT:util:AVERAGE:($fmt%% Avg Usage)\\l' ";
$rrdtool_graph['series'] = $series;
Index: graph.d/packet_report.php
===================================================================
--- graph.d/packet_report.php (revision 1868)
+++ graph.d/packet_report.php (working copy)
@@ -18,7 +18,7 @@
}
$title = 'Packets';
- $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
+ $rrdtool_graph['height'] += ($size != 'small') ? 14 : 0;
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
} else {
@@ -28,10 +28,17 @@
$rrdtool_graph['vertical-label'] = 'Packets/sec';
$rrdtool_graph['extras'] = '--rigid --base 1024';
- $series = "DEF:'bytes_in'='${rrd_dir}/pkts_in.rrd':'sum':AVERAGE "
- ."DEF:'bytes_out'='${rrd_dir}/pkts_out.rrd':'sum':AVERAGE "
- ."LINE2:'bytes_in'#$mem_cached_color:'In' "
- ."LINE2:'bytes_out'#$mem_used_color:'Out' ";
+ $fmt = '%5.1lf';
+ $series = "'DEF:bytes_in=${rrd_dir}/pkts_in.rrd:sum:AVERAGE' "
+ . "'DEF:bytes_out=${rrd_dir}/pkts_out.rrd:sum:AVERAGE' "
+ . "'LINE2:bytes_in#$mem_cached_color:In ' "
+ . "'GPRINT:bytes_in:MIN:(Min\:$fmt%s' "
+ . "'GPRINT:bytes_in:AVERAGE:Avg\:$fmt%s' "
+ . "'GPRINT:bytes_in:MAX:Max\:$fmt%s)\\l' "
+ . "'LINE2:bytes_out#$mem_used_color:Out' "
+ . "'GPRINT:bytes_out:MIN:(Min\:$fmt%s' "
+ . "'GPRINT:bytes_out:AVERAGE:Avg\:$fmt%s' "
+ . "'GPRINT:bytes_out:MAX:Max\:$fmt%s)\\l' ";
$rrdtool_graph['series'] = $series;
Index: graph.d/network_report.php
===================================================================
--- graph.d/network_report.php (revision 1868)
+++ graph.d/network_report.php (working copy)
@@ -18,7 +18,7 @@
}
$title = 'Network';
- $rrdtool_graph['height'] += ($size == 'medium') ? 28 : 0;
+ $rrdtool_graph['height'] += ($size != 'small' ) ? 14 : 0;
if ($context != 'host') {
$rrdtool_graph['title'] = $title;
} else {
@@ -28,10 +28,17 @@
$rrdtool_graph['vertical-label'] = 'Bytes/sec';
$rrdtool_graph['extras'] = '--rigid --base 1024';
- $series = "DEF:'bytes_in'='${rrd_dir}/bytes_in.rrd':'sum':AVERAGE "
- ."DEF:'bytes_out'='${rrd_dir}/bytes_out.rrd':'sum':AVERAGE "
- ."LINE2:'bytes_in'#$mem_cached_color:'In' "
- ."LINE2:'bytes_out'#$mem_used_color:'Out' ";
+ $fmt = '%5.1lf';
+ $series = "'DEF:bytes_in=${rrd_dir}/bytes_in.rrd:sum:AVERAGE' "
+ . "'DEF:bytes_out=${rrd_dir}/bytes_out.rrd:sum:AVERAGE' "
+ . "'LINE2:bytes_in#$mem_cached_color:In ' "
+ . "'GPRINT:bytes_in:MIN:(Min\:$fmt%s' "
+ . "'GPRINT:bytes_in:AVERAGE:Avg\:$fmt%s' "
+ . "'GPRINT:bytes_in:MAX:Max\:$fmt%s)\\l' "
+ . "'LINE2:bytes_out#$mem_used_color:Out' "
+ . "'GPRINT:bytes_out:MIN:(Min\:$fmt%s' "
+ . "'GPRINT:bytes_out:AVERAGE:Avg\:$fmt%s' "
+ . "'GPRINT:bytes_out:MAX:Max\:$fmt%s)\\l' ";
$rrdtool_graph['series'] = $series;
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Ganglia-developers mailing list
Ganglia-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ganglia-developers
