slitaz-forge rev 561

makegraphs: align graphs
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu May 15 14:46:54 2014 +0000 (2014-05-15)
parents 20df77d05e17
children 1101197156d7
files mirror/info/bin/makegraphs pangolin/makegraphs tank/web/lib/makegraphs
line diff
     1.1 --- a/mirror/info/bin/makegraphs	Thu May 15 08:58:01 2014 +0000
     1.2 +++ b/mirror/info/bin/makegraphs	Thu May 15 14:46:54 2014 +0000
     1.3 @@ -45,6 +45,7 @@
     1.4  	info="$(echo "$info" | cut -d: -f2 | sed 's/ * / /g' | head -1)"
     1.5  	rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \
     1.6  		$rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \
     1.7 +		-v " " \
     1.8  		DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \
     1.9  		DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \
    1.10  		DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \
    1.11 @@ -79,6 +80,7 @@
    1.12  	rrdtool graph "$rrdgraph/memory-$period.png" --start -1$period \
    1.13  		$rrdgraphargs -l 0 -u 100 \
    1.14  		-t "memory usage per $period [ $info + $info2 swap ]" \
    1.15 +		-v " " \
    1.16  		DEF:used=$rrdlog/mem.rrd:memused:AVERAGE \
    1.17  		DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE \
    1.18  		DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE \
     2.1 --- a/pangolin/makegraphs	Thu May 15 08:58:01 2014 +0000
     2.2 +++ b/pangolin/makegraphs	Thu May 15 14:46:54 2014 +0000
     2.3 @@ -44,6 +44,7 @@
     2.4  END { if (n > 1) printf " %dx",n; print s }')"
     2.5  	rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \
     2.6  		$rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \
     2.7 +		-v " " \
     2.8  		DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \
     2.9  		DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \
    2.10  		DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \
    2.11 @@ -87,6 +88,7 @@
    2.12  	rrdtool graph "$rrdgraph/memory-$period.png" --start -1$period \
    2.13  		$rrdgraphargs -l 0 -u 100 \
    2.14  		-t "memory usage per $period [ $info + $info2 swap ]" \
    2.15 +		-v " " \
    2.16  		DEF:used=$rrdlog/mem.rrd:memused:AVERAGE \
    2.17  		DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE \
    2.18  		DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE \
     3.1 --- a/tank/web/lib/makegraphs	Thu May 15 08:58:01 2014 +0000
     3.2 +++ b/tank/web/lib/makegraphs	Thu May 15 14:46:54 2014 +0000
     3.3 @@ -44,6 +44,7 @@
     3.4  END { if (n > 1) printf " %dx",n; print s }')"
     3.5  	rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \
     3.6  		$rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \
     3.7 +		-v " " \
     3.8  		DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \
     3.9  		DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \
    3.10  		DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \
    3.11 @@ -87,6 +88,7 @@
    3.12  	rrdtool graph "$rrdgraph/memory-$period.png" --start -1$period \
    3.13  		$rrdgraphargs -l 0 -u 100 \
    3.14  		-t "memory usage per $period [ $info + $info2 swap ]" \
    3.15 +		-v " " \
    3.16  		DEF:used=$rrdlog/mem.rrd:memused:AVERAGE \
    3.17  		DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE \
    3.18  		DEF:shared=$rrdlog/mem.rrd:memshared:AVERAGE \