Show min/max values in aggregated viewHEADmaster

1 files changed, 43 insertions, 32 deletions

diff --git a/make_graph.sh b/make_graph.sh
index 5cd3074..0af9a0a 100755
--- a/make_graph.sh
+++ b/make_graph.sh
@@ -23,26 +23,35 @@
 rsync -i stg.chd.sx:out.rrd /tmp/
 
 statements="
-DEF:ds0=/tmp/out.rrd:rx:AVERAGE
-DEF:ds1=/tmp/out.rrd:tx:AVERAGE
-DEF:ds2=/tmp/out.rrd:rx:MAX
-DEF:ds3=/tmp/out.rrd:tx:MAX
-CDEF:ds0b=ds0,8,*
-CDEF:ds1b=ds1,8,*
-CDEF:ds2b=ds2,8,*
-CDEF:ds3b=ds3,8,*
-CDEF:inbound=ds0b,-1,*
-CDEF:outbound=ds1b,1,*
-CDEF:in_peak=ds2b,-1,*
-CDEF:out_peak=ds3b,1,*
-VDEF:ds0max=ds0b,MAXIMUM
-VDEF:ds0avg=ds0b,AVERAGE
-VDEF:ds0pct=ds0b,95,PERCENT
-VDEF:ds1max=ds1b,MAXIMUM
-VDEF:ds1avg=ds1b,AVERAGE
-VDEF:ds1pct=ds1b,95,PERCENT
-VDEF:ds2max=ds2b,MAXIMUM
-VDEF:ds3max=ds3b,MAXIMUM
+DEF:dsrxavg=/tmp/out.rrd:rx:AVERAGE
+DEF:dstxavg=/tmp/out.rrd:tx:AVERAGE
+DEF:dsrxmax=/tmp/out.rrd:rx:MAX
+DEF:dstxmax=/tmp/out.rrd:tx:MAX
+DEF:dsrxmin=/tmp/out.rrd:rx:MIN
+DEF:dstxmin=/tmp/out.rrd:tx:MIN
+
+CDEF:dsrxavgb=dsrxavg,8,*
+CDEF:dstxavgb=dstxavg,8,*
+CDEF:dsrxmaxb=dsrxmax,8,*
+CDEF:dstxmaxb=dstxmax,8,*
+CDEF:dsrxminb=dsrxmin,8,*
+CDEF:dstxminb=dstxmin,8,*
+
+CDEF:inbound=dsrxavgb,-1,*
+CDEF:outbound=dstxavgb,1,*
+CDEF:in_max=dsrxmaxb,-1,*
+CDEF:out_max=dstxmaxb,1,*
+CDEF:in_min=dsrxminb,-1,*
+CDEF:out_min=dstxminb,1,*
+
+VDEF:totrxavgmax=dsrxavgb,MAXIMUM
+VDEF:totrxavgavg=dsrxavgb,AVERAGE
+VDEF:totrxavgpct=dsrxavgb,95,PERCENT
+VDEF:tottxavgmax=dstxavgb,MAXIMUM
+VDEF:tottxavgavg=dstxavgb,AVERAGE
+VDEF:tottxavgpct=dstxavgb,95,PERCENT
+VDEF:totrxmaxmax=dsrxmaxb,MAXIMUM
+VDEF:tottxmaxmax=dstxmaxb,MAXIMUM
 
 LINE1:0#cccc00
 
@@ -51,22 +60,24 @@ COMMENT:Maximum    
 COMMENT:Average    
 COMMENT:95th%tile\l
 
-AREA:inbound#0099ff:inbound  
-GPRINT:ds0max:%6.2lf %Sbps
-GPRINT:ds0avg:%6.2lf %Sbps
-GPRINT:ds0pct:%6.2lf %Sbps\l
+AREA:in_max#0099ff:in_max  
+GPRINT:totrxmaxmax:%6.2lf %Sbps\l
 
-AREA:outbound#44ff44:outbound 
-GPRINT:ds1max:%6.2lf %Sbps
-GPRINT:ds1avg:%6.2lf %Sbps
-GPRINT:ds1pct:%6.2lf %Sbps\l
+AREA:out_max#44ff44:out_max 
+GPRINT:tottxmaxmax:%6.2lf %Sbps\l
 
-LINE1:in_peak#0066bb:in_peak  
-GPRINT:ds2max:%6.2lf %Sbps\l
+AREA:in_min#ffffff:
+AREA:out_min#ffffff:
 
-LINE1:out_peak#00aa00:out_peak 
-GPRINT:ds3max:%6.2lf %Sbps\l
+LINE1:inbound#0066bb:inbound  
+GPRINT:totrxavgmax:%6.2lf %Sbps
+GPRINT:totrxavgavg:%6.2lf %Sbps
+GPRINT:totrxavgpct:%6.2lf %Sbps\l
 
+LINE1:outbound#00aa00:outbound 
+GPRINT:tottxavgmax:%6.2lf %Sbps
+GPRINT:tottxavgavg:%6.2lf %Sbps
+GPRINT:tottxavgpct:%6.2lf %Sbps\l
 "
 
 if [ $# -eq 1 ]