Better graphs

graph

@@ -327,21 +327,14 @@ else
 		-w $graph_width					\
 		-v $graph					\
 		-s $start -e $end				\
-		DEF:data=$rrdfile:$graph:AVERAGE:step=3600	\
-		DEF:predict=$rrdfile:$graph:HWPREDICT		\
-		DEF:dev=$rrdfile:$graph:DEVPREDICT		\
+		DEF:data=$rrdfile:$graph:AVERAGE:step=3600${datastart+:start=$datastart}	\
 		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,+	\
+		CDEF:trend=data,POP,COUNT,growth,*,intercept,+	\
+		CDEF:pred=TIME,NOW,GE,trend,UNKN,IF		\
+		LINE1:trend#FFFF00:Trend\\t			\
 		"${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				\