diff -crN before/data-sensors/diagrams after/data-sensors/diagrams *** before/data-sensors/diagrams Tue Dec 4 23:33:41 2001 --- after/data-sensors/diagrams Sun Feb 2 14:20:47 2003 *************** *** 26,45 **** LEGEND=$(eval $(echo echo "\$LEGEND"$DEV)) echo "creating graphs for $DEV ..." - $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v $LEGEND -s -3600 \ - -w $WIDTH -h $HEIGHT -l 0 --alt-autoscale-max \ - --title="$HEAD - last hour ($DATESTRING)" \ - DEF:avg="rrd/$DEV".rrd:data:AVERAGE \ - AREA:avg#d0d0d0:"" \ - LINE1:avg#00a000:" " \ - GPRINT:avg:AVERAGE:"avg\:%1.2lf %s $LEGEND" \ - GPRINT:avg:MAX:"max\:%1.2lf %s $LEGEND\n" \ - HRULE:0#000000 - mv -f tmp.$IMAGEFORMAT $OUTDIR/$DEV-hour.$IMAGEFORMAT ! for RANGE in 6h 1day 1week 1month 1year ; do case $RANGE in ! 6h) DESCR="6 hours" ; FILE="6h" ; BUILD=30 ;; 1day) DESCR="day" ; FILE=$DESCR ; BUILD=120 ;; 1week) DESCR="week" ; FILE=$DESCR ; BUILD=1000 ;; 1month) DESCR="month" ; FILE=$DESCR ; BUILD=4300 ;; --- 26,35 ---- LEGEND=$(eval $(echo echo "\$LEGEND"$DEV)) echo "creating graphs for $DEV ..." ! for RANGE in 3h 1day 1week 1month 1year ; do case $RANGE in ! 3h) DESCR="3 hours" ; FILE="3h" ; BUILD=15 ;; 1day) DESCR="day" ; FILE=$DESCR ; BUILD=120 ;; 1week) DESCR="week" ; FILE=$DESCR ; BUILD=1000 ;; 1month) DESCR="month" ; FILE=$DESCR ; BUILD=4300 ;; *************** *** 51,69 **** $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v $LEGEND \ -s -$RANGE -w $WIDTH -h $HEIGHT --alt-autoscale --alt-y-grid \ --title="$HEAD - last $DESCR ($DATESTRING)" \ ! DEF:avg="rrd/$DEV".rrd:data:AVERAGE \ ! DEF:max="rrd/$DEV".rrd:data:MAX \ ! DEF:min="rrd/$DEV".rrd:data:MIN \ ! AREA:max#c0ffc0:"min/max" \ ! LINE1:max#a0a0a0:"" \ ! AREA:min#ffffff:"" \ ! LINE1:min#a0a0a0:"" \ ! GPRINT:min:MIN:"(min\:%1.2lf %s" \ ! GPRINT:max:MAX:"max\:%1.2lf %s $LEGEND)" \ ! LINE2:avg#00a000:"avg" \ ! GPRINT:avg:MIN:"(min\:%1.2lf %s" \ ! GPRINT:avg:AVERAGE:"avg\:%1.2lf %s" \ ! GPRINT:avg:MAX:"max\:%1.2lf %s $LEGEND)\n" \ HRULE:0#000000 mv -f tmp.$IMAGEFORMAT $OUTDIR/$DEV-$FILE.$IMAGEFORMAT fi --- 41,75 ---- $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v $LEGEND \ -s -$RANGE -w $WIDTH -h $HEIGHT --alt-autoscale --alt-y-grid \ --title="$HEAD - last $DESCR ($DATESTRING)" \ ! DEF:temp0="rrd/$DEV".rrd:temp0:AVERAGE \ ! DEF:vc0="rrd/$DEV".rrd:vc0:AVERAGE \ ! DEF:v33="rrd/$DEV".rrd:v33:AVERAGE \ ! DEF:v50p="rrd/$DEV".rrd:v50p:AVERAGE \ ! DEF:v12p="rrd/$DEV".rrd:v12p:AVERAGE \ ! "CDEF:vc0_draw=vc0,-1,*" \ ! "CDEF:v33_draw=v33,-1,*" \ ! "CDEF:v50p_draw=v50p,-1,*" \ ! "CDEF:v12p_draw=v12p,-1,*" \ ! AREA:temp0#ff9900:"temp0 avg [c]" \ ! GPRINT:temp0:MIN:"(min\:%1.2lf %s," \ ! GPRINT:temp0:AVERAGE:"avg\:%1.2lf %s," \ ! GPRINT:temp0:MAX:"max\:%1.2lf %s)\n" \ ! AREA:v12p#ffff00:"v12p avg [v]" \ ! GPRINT:v12p:MIN:"(min\:%1.2lf %s," \ ! GPRINT:v12p:AVERAGE:"avg\:%1.2lf %s," \ ! GPRINT:v12p:MAX:"max\:%1.2lf %s)\n" \ ! AREA:v50p#ff0000:"v50p avg [v]" \ ! GPRINT:v50p:MIN:"(min\:%1.2lf %s," \ ! GPRINT:v50p:AVERAGE:"avg\:%1.2lf %s," \ ! GPRINT:v50p:MAX:"max\:%1.2lf %s)\n" \ ! AREA:v33#6600ff:"v33 avg [v]" \ ! GPRINT:v33:MIN:"(min\:%1.2lf %s," \ ! GPRINT:v33:AVERAGE:"avg\:%1.2lf %s," \ ! GPRINT:v33:MAX:"max\:%1.2lf %s)\n" \ ! AREA:vc0#339900:"vc0 avg [v]" \ ! GPRINT:vc0:MIN:"(min\:%1.2lf %s," \ ! GPRINT:vc0:AVERAGE:"avg\:%1.2lf %s," \ ! GPRINT:vc0:MAX:"max\:%1.2lf %s)\n" \ HRULE:0#000000 mv -f tmp.$IMAGEFORMAT $OUTDIR/$DEV-$FILE.$IMAGEFORMAT fi diff -crN before/data-sensors/makeindex.pl after/data-sensors/makeindex.pl *** before/data-sensors/makeindex.pl Mon Dec 17 23:38:21 2001 --- after/data-sensors/makeindex.pl Sat Feb 1 18:44:52 2003 *************** *** 26,37 **** } } close FILE; ! @DIAGRAMS=("hour","6h","day","week","month","year"); ! @TIMES=("6h","week"); # build time-based .html files # ! foreach $index ("6h","week") { open (FILE,">index/$index.html"); print FILE "\n"; if ($REFRESH > 0) { --- 26,37 ---- } } close FILE; ! @DIAGRAMS=("3h","day","week","month","year"); ! @TIMES=("3h","week"); # build time-based .html files # ! foreach $index ("3h","week") { open (FILE,">index/$index.html"); print FILE "\n"; if ($REFRESH > 0) { diff -crN before/rrdtimer after/rrdtimer *** before/rrdtimer Wed Jan 15 17:28:31 2003 --- after/rrdtimer Sat Feb 1 09:32:32 2003 *************** *** 286,292 **** # sub call_module_read { my ($modulepath,$parameters)=@_; ! if (-e "$modulepath/read-data") { system("cd \"$modulepath\"; nice -5 ./read-data $parameters"); } else { system("cd \"$modulepath\"; nice -5 ./read-data.pl $parameters"); } } --- 286,293 ---- # sub call_module_read { my ($modulepath,$parameters)=@_; ! if ($modulepath =~ "data-sensors") { system("cd \"$modulepath\"; nice -5 ./mbmon-rrd.pl rrd/mbmon.rrd"); } ! elsif (-e "$modulepath/read-data") { system("cd \"$modulepath\"; nice -5 ./read-data $parameters"); } else { system("cd \"$modulepath\"; nice -5 ./read-data.pl $parameters"); } }