diff --git a/graph b/graph index 39f9228..d3b9f13 100755 --- a/graph +++ b/graph @@ -307,21 +307,28 @@ else rrdtool graph - \ -E -a PNG \ -w $graph_width \ - -v $graph \ + -v $graph \ -s $start -e $end \ - DEF:data=$rrdfile:$graph:MAX:step=3600 \ - DEF:predict=$rrdfile:$graph:HWPREDICT \ - DEF:fail=$rrdfile:$graph:FAILURES \ + DEF:data=$rrdfile:$graph:AVERAGE:step=3600 \ + DEF:predict=$rrdfile:$graph:HWPREDICT \ + DEF:dev=$rrdfile:$graph:DEVPREDICT \ + DEF:fail=$rrdfile:$graph:FAILURES \ + CDEF:predup=predict,dev,2,*,+ \ + CDEF:predlow=predict,dev,2,*,- \ + CDEF:predarea=predup,predlow,- \ VDEF:intercept=data,LSLINT \ VDEF:growth=data,LSLSLOPE \ CDEF:pred=data,POP,COUNT,growth,*,intercept,+ \ - "${thresholds[@]}" \ - LINE1:predict#000000 \ - LINE1:pred#FFFF00 \ "${draw[@]:-AREA:data#00BD27}" \ + LINE1:predlow#00A0A0::dashes=on \ + AREA:predarea#00A0A030:Pred:STACK \ + LINE1:predup#00A0A0::dashes=on \ + LINE1:pred#FFFF00:Trend\\n \ + "${thresholds[@]}" \ TICK:fail#ffffa0:1.0 \ VRULE:$now#000000 \ - 'GPRINT:data:MIN:min %6.2lf%S' \ + 'GPRINT:data:MIN:min %6.2lf%S' \ + 'GPRINT:data:AVERAGE:\tavg %6.2lf%S' \ 'GPRINT:data:MAX:\tmax %6.2lf%S' \ 'GPRINT:growth:\tgrowth %6.2lf%s/h\n' fi