# HG changeset patch # User Pascal Bellard # Date 1400165214 0 # Node ID 5d839fde8a971a59683690c04b10a4370f425448 # Parent 20df77d05e1733019fb8754c0fb86ea51c30a4e9 makegraphs: align graphs diff -r 20df77d05e17 -r 5d839fde8a97 mirror/info/bin/makegraphs --- a/mirror/info/bin/makegraphs Thu May 15 08:58:01 2014 +0000 +++ b/mirror/info/bin/makegraphs Thu May 15 14:46:54 2014 +0000 @@ -45,6 +45,7 @@ info="$(echo "$info" | cut -d: -f2 | sed 's/ * / /g' | head -1)" rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \ $rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \ + -v " " \ DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \ DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \ DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \ @@ -79,6 +80,7 @@ rrdtool graph "$rrdgraph/memory-$period.png" --start -1$period \ $rrdgraphargs -l 0 -u 100 \ -t "memory usage per $period [ $info + $info2 swap ]" \ + -v " " \ DEF:used=$rrdlog/mem.rrd:memused:AVERAGE \ DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE \ DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE \ diff -r 20df77d05e17 -r 5d839fde8a97 pangolin/makegraphs --- a/pangolin/makegraphs Thu May 15 08:58:01 2014 +0000 +++ b/pangolin/makegraphs Thu May 15 14:46:54 2014 +0000 @@ -44,6 +44,7 @@ END { if (n > 1) printf " %dx",n; print s }')" rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \ $rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \ + -v " " \ DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \ DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \ DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \ @@ -87,6 +88,7 @@ rrdtool graph "$rrdgraph/memory-$period.png" --start -1$period \ $rrdgraphargs -l 0 -u 100 \ -t "memory usage per $period [ $info + $info2 swap ]" \ + -v " " \ DEF:used=$rrdlog/mem.rrd:memused:AVERAGE \ DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE \ DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE \ diff -r 20df77d05e17 -r 5d839fde8a97 tank/web/lib/makegraphs --- a/tank/web/lib/makegraphs Thu May 15 08:58:01 2014 +0000 +++ b/tank/web/lib/makegraphs Thu May 15 14:46:54 2014 +0000 @@ -44,6 +44,7 @@ END { if (n > 1) printf " %dx",n; print s }')" rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \ $rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \ + -v " " \ DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \ DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \ DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \ @@ -87,6 +88,7 @@ rrdtool graph "$rrdgraph/memory-$period.png" --start -1$period \ $rrdgraphargs -l 0 -u 100 \ -t "memory usage per $period [ $info + $info2 swap ]" \ + -v " " \ DEF:used=$rrdlog/mem.rrd:memused:AVERAGE \ DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE \ DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE \