ScriptFanix/IngRRD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into prod

Browse Source
This commit is contained in:
Vincent Riquer 2014-06-18 17:10:23 +02:00
commit 85c5a09e57
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
graph
View File

@ -474,24 +474,25 @@ else
(( end > 0 )) && end="+$end" (( end > 0 )) && end="+$end"
(( datastart > 0 )) && datastart="+$datastart" (( datastart > 0 )) && datastart="+$datastart"
rrdtool graph - \ rrdtool graph - \
-a PNG \ -a PNG \
-w $graph_width \ -w $graph_width \
-v $graph \ -v $graph \
-s $start -e $end \ -s $start -e $end \
DEF:data=$rrdfile:$graph:AVERAGE:step=3600${datastart+:start=$datastart}${dataend+:end=$dataend} \ DEF:data=$rrdfile:$graph:AVERAGE:step=3600${datastart+:start=$datastart}${dataend+:end=$dataend} \
DEF:fail=$rrdfile:$graph:FAILURES \ DEF:fail=$rrdfile:$graph:FAILURES \
VDEF:last=data,LAST \ VDEF:last=data,LAST \
VDEF:intercept=data,LSLINT \ VDEF:intercept=data,LSLINT \
VDEF:growth=data,LSLSLOPE \ VDEF:growth=data,LSLSLOPE \
CDEF:trend=data,POP,COUNT,growth,*,intercept,+ \ CDEF:trend=data,POP,COUNT,growth,*,intercept,+ \
CDEF:pred=TIME,NOW,GE,trend,UNKN,IF \ CDEF:trendline=trend,0,GT,trend,UNKN,IF \
LINE1:trend#FFFF00:Trend\\t \ CDEF:pred=TIME,NOW,GE,trend,UNKN,IF \
"${draw[@]:-AREA:data#00BD27}" \ LINE1:trendline#FFFF00:Trend\\t \
"${thresholds[@]}" \ "${draw[@]:-AREA:data#00BD27}" \
TICK:fail#ffffa0:1.0 \ "${thresholds[@]}" \
VRULE:$now#000000 \ TICK:fail#ffffa0:1.0 \
'GPRINT:data:MIN:min %6.2lf%S' \ VRULE:$now#000000 \
'GPRINT:data:MAX:\tmax %6.2lf%S' \ 'GPRINT:data:MIN:min %6.2lf%S' \
'GPRINT:data:MAX:\tmax %6.2lf%S' \
"${next[@]}" "${next[@]}"
fi fi