diff -crN before/HotSaNIC.pm after/HotSaNIC.pm
*** before/HotSaNIC.pm	Wed Jan 15 01:03:31 2003
--- after/HotSaNIC.pm	Wed Jan 15 01:02:57 2003
***************
*** 136,141 ****
--- 136,142 ----
    my ($range)=@_;
    my ($descr,$file,$build);
    if    ($range eq "1h")     { $descr="hour";    $file=$descr; $build=0; }
+   elsif ($range eq "3h")     { $descr="3 hours"; $file="3h";   $build=15; }
    elsif ($range eq "6h")     { $descr="6 hours"; $file="6h";   $build=30; }
    elsif ($range eq "1day")   { $descr="day";     $file=$descr; $build=120; }
    elsif ($range eq "1week")  { $descr="week";    $file=$descr; $build=1000; }
diff -crN before/data-system/diagrams after/data-system/diagrams
*** before/data-system/diagrams	Thu Jan  3 10:20:36 2002
--- after/data-system/diagrams	Tue Jan 21 21:50:26 2003
***************
*** 20,32 ****
  echo "creating graphs for loadavg ..."
  if [ -e "rrd/loadavg.rrd" ] ; then
    DEV=load
!   TIME=hour
    if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #  echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
!     BUILD=5
      echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!     $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -3600 -w $WIDTH -h $HEIGHT -u 2 -l 0 \
!       --title="system-load - last hour ($DATESTRING)" \
        DEF:ld1=rrd/loadavg.rrd:load1:AVERAGE \
        DEF:ld2=rrd/loadavg.rrd:load5:AVERAGE \
        DEF:ld3=rrd/loadavg.rrd:load15:AVERAGE \
--- 20,32 ----
  echo "creating graphs for loadavg ..."
  if [ -e "rrd/loadavg.rrd" ] ; then
    DEV=load
!   TIME=3h
    if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #  echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
!     BUILD=15
      echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!     $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -10800 -w $WIDTH -h $HEIGHT -u 1 -l 0 \
!       --title="system-load - last 3 hour ($DATESTRING)" \
        DEF:ld1=rrd/loadavg.rrd:load1:AVERAGE \
        DEF:ld2=rrd/loadavg.rrd:load5:AVERAGE \
        DEF:ld3=rrd/loadavg.rrd:load15:AVERAGE \
***************
*** 41,50 ****
        GPRINT:ld3:MAX:"max\:%1.2lf)\n" \
        HRULE:0#000000
  #"
!     mv -f tmp.$IMAGEFORMAT $OUTDIR/$DEV-hour.$IMAGEFORMAT
      fi
    
!   for TIME in day week year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #    echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
--- 41,50 ----
        GPRINT:ld3:MAX:"max\:%1.2lf)\n" \
        HRULE:0#000000
  #"
!     mv -f tmp.$IMAGEFORMAT $OUTDIR/$DEV-3h.$IMAGEFORMAT
      fi
    
!   for TIME in day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #    echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
***************
*** 53,59 ****
          year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -1$TIME -w $WIDTH -h $HEIGHT -u 2 -l 0 \
          --title="system-load - last $TIME ($DATESTRING)" \
          DEF:avg1=rrd/loadavg.rrd:load1:AVERAGE \
          DEF:min1=rrd/loadavg.rrd:load1:MIN \
--- 53,59 ----
          year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -1$TIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
          --title="system-load - last $TIME ($DATESTRING)" \
          DEF:avg1=rrd/loadavg.rrd:load1:AVERAGE \
          DEF:min1=rrd/loadavg.rrd:load1:MIN \
***************
*** 83,100 ****
  echo "creating graphs for processes ..."
  if [ -e "rrd/proc.rrd" ] ; then
    DEV=proc
!   for TIME in hour day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         hour) BUILD=5;;
!         day) BUILD=120;;
!         week) BUILD=1000;;
!         month) BUILD=4300;;
!         year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -1$TIME -w $WIDTH -h $HEIGHT -l 0 \
          --title="processes - last $TIME ($DATESTRING)" \
          DEF:slpavg=rrd/proc.rrd:procslp:AVERAGE \
          DEF:runavg=rrd/proc.rrd:procrun:AVERAGE \
--- 83,101 ----
  echo "creating graphs for processes ..."
  if [ -e "rrd/proc.rrd" ] ; then
    DEV=proc
!   for TIME in 3h day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         3h) BUILD=15; WTIME=3hour;;
!         day) BUILD=120; WTIME=1day;;
! #       week) BUILD=1000; WTIME=1week; XGRID='-x HOUR:6:DAY:1:DAY:1:86400:%a';;
!         week) BUILD=1000; WTIME=1week;;
!         month) BUILD=4300; WTIME=1month;;
!         year) BUILD=52500; WTIME=1year;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -$WTIME -w $WIDTH -h $HEIGHT -l 0 $XGRID\
          --title="processes - last $TIME ($DATESTRING)" \
          DEF:slpavg=rrd/proc.rrd:procslp:AVERAGE \
          DEF:runavg=rrd/proc.rrd:procrun:AVERAGE \
***************
*** 140,158 ****
    else
      PERCENT="1";   SIGN="";     SIGN1=""
    fi
!   for TIME in hour day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         hour) BUILD=5;;
!         day) BUILD=120;;
!         week) BUILD=1000;;
!         month) BUILD=4300;;
!         year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
        if [ "$OSTYPE" = "Linux" ]; then
!         $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -1$TIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
            --title="CPU usage$SIGN - last $TIME ($DATESTRING)" \
            DEF:usrdat=rrd/$DEV.rrd:cpuusr:AVERAGE \
            DEF:nicdat=rrd/$DEV.rrd:cpunic:AVERAGE \
--- 141,159 ----
    else
      PERCENT="1";   SIGN="";     SIGN1=""
    fi
!   for TIME in 3h day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         3h) BUILD=15; WTIME=3hour;;
!         day) BUILD=120; WTIME=1day;;
!         week) BUILD=1000; WTIME=1week;;
!         month) BUILD=4300; WTIME=1month;;
!         year) BUILD=52500; WTIME=1year;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
        if [ "$OSTYPE" = "Linux" ]; then
!         $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -s -$WTIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
            --title="CPU usage$SIGN - last $TIME ($DATESTRING)" \
            DEF:usrdat=rrd/$DEV.rrd:cpuusr:AVERAGE \
            DEF:nicdat=rrd/$DEV.rrd:cpunic:AVERAGE \
***************
*** 251,269 ****
  echo "creating graphs for memory-usage ..."
  if [ -e "rrd/mem.rrd" ] ; then
    DEV=mem
!   for TIME in hour day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         hour) BUILD=5;;
!         day) BUILD=120;;
!         week) BUILD=1000;;
!         month) BUILD=4300;;
!         year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
        if [ "$OSTYPE" = "Linux" ]; then
!         $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v "bytes" -s -1$TIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
            --title="memory usage - last $TIME ($DATESTRING)" \
            DEF:memfre=rrd/mem.rrd:memfre:AVERAGE \
            DEF:memshr=rrd/mem.rrd:memshr:AVERAGE \
--- 252,270 ----
  echo "creating graphs for memory-usage ..."
  if [ -e "rrd/mem.rrd" ] ; then
    DEV=mem
!   for TIME in 3h day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         3h) BUILD=15; WTIME=3hour;;
!         day) BUILD=120; WTIME=1day;;
!         week) BUILD=1000; WTIME=1week;;
!         month) BUILD=4300; WTIME=1month;;
!         year) BUILD=52500; WTIME=1year;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
        if [ "$OSTYPE" = "Linux" ]; then
!         $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v "bytes" -s -$WTIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
            --title="memory usage - last $TIME ($DATESTRING)" \
            DEF:memfre=rrd/mem.rrd:memfre:AVERAGE \
            DEF:memshr=rrd/mem.rrd:memshr:AVERAGE \
***************
*** 354,371 ****
  echo "creating graphs for swapfile-usage ..."
  if [ -e "rrd/mem.rrd" ] ; then
    DEV=swap
!   for TIME in hour day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         hour) BUILD=5;;
!         day) BUILD=120;;
!         week) BUILD=1000;;
!         month) BUILD=4300;;
!         year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v "bytes" -s -1$TIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
          --title="swapfile usage - last $TIME ($DATESTRING)" \
          DEF:swpfre=rrd/mem.rrd:swpfre:AVERAGE \
          DEF:swpuse=rrd/mem.rrd:swpuse:AVERAGE \
--- 355,372 ----
  echo "creating graphs for swapfile-usage ..."
  if [ -e "rrd/mem.rrd" ] ; then
    DEV=swap
!   for TIME in 3h day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         3h) BUILD=15; WTIME=3hour;;
!         day) BUILD=120; WTIME=1day;;
!         week) BUILD=1000; WTIME=1week;;
!         month) BUILD=4300; WTIME=1month;;
!         year) BUILD=52500; WTIME=1year;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -v "bytes" -s -$WTIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
          --title="swapfile usage - last $TIME ($DATESTRING)" \
          DEF:swpfre=rrd/mem.rrd:swpfre:AVERAGE \
          DEF:swpuse=rrd/mem.rrd:swpuse:AVERAGE \
***************
*** 393,410 ****
  echo "creating graphs for user-stats ..."
  if [ -e "rrd/users.rrd" ] ; then
    DEV=users
!   for TIME in hour day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         hour) BUILD=5;;
!         day) BUILD=120;;
!         week) BUILD=1000;;
!         month) BUILD=4300;;
!         year) BUILD=52500;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -s -1$TIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
          --title="users - last $TIME ($DATESTRING)" \
          DEF:tty=rrd/users.rrd:tty:AVERAGE \
          DEF:pty=rrd/users.rrd:pty:AVERAGE \
--- 394,411 ----
  echo "creating graphs for user-stats ..."
  if [ -e "rrd/users.rrd" ] ; then
    DEV=users
!   for TIME in 3h day week month year; do
      if ! [ -e $OUTDIR/$DEV-$TIME.$IMAGEFORMAT ] || [ $(($(< expires/$DEV-$TIME.expire)-$DATE)) -lt 0 ] ; then
  #      echo $DEV-$TIME.$IMAGEFORMAT missing or expired, creating file ...
        case $TIME in
!         3h) BUILD=15; WTIME=3hour;;
!         day) BUILD=120; WTIME=1day;;
!         week) BUILD=1000; WTIME=1week;;
!         month) BUILD=4300; WTIME=1month;;
!         year) BUILD=52500; WTIME=1year;;
          esac
        echo $(($DATE+$BUILD)) > expires/$DEV-$TIME.expire
!       $BINPATH/rrdtool graph tmp.$IMAGEFORMAT -i -b 1024 -s -$WTIME -w $WIDTH -h $HEIGHT -u 1 -l 0 \
          --title="users - last $TIME ($DATESTRING)" \
          DEF:tty=rrd/users.rrd:tty:AVERAGE \
          DEF:pty=rrd/users.rrd:pty:AVERAGE \
diff -crN before/data-system/makeindex.pl after/data-system/makeindex.pl
*** before/data-system/makeindex.pl	Thu Dec 27 03:45:36 2001
--- after/data-system/makeindex.pl	Tue Jan 21 22:27:00 2003
***************
*** 24,30 ****
  
  # build time-based .html files
  #
! foreach $index ("hour","week") {
    open (FILE,">index/$index.html");
    print FILE "<html>\n";
    if ($REFRESH > 0) {
--- 24,30 ----
  
  # build time-based .html files
  #
! foreach $index ("3h","week") {
    open (FILE,">index/$index.html");
    print FILE "<html>\n";
    if ($REFRESH > 0) {
***************
*** 51,57 ****
  
  open (IDXFILE,">idxdata");
  print IDXFILE "0##    <td colspan=2 align=center> <font size=\"+3\">",$MODNAME,"</font><br>
! 0##      <a href=\"",$MODNAME,"/hour.html\">hour</a>
  0##      <a href=\"",$MODNAME,"/week.html\">week</a>
  0##      </td>
  1##    <td><a href=\"",$MODNAME,"/proc.html\"><img src=\"system/thumb-proc.",$IMAGEFORMAT,"\"></a></td>
--- 51,57 ----
  
  open (IDXFILE,">idxdata");
  print IDXFILE "0##    <td colspan=2 align=center> <font size=\"+3\">",$MODNAME,"</font><br>
! 0##      <a href=\"",$MODNAME,"/3h.html\">3 hour</a>
  0##      <a href=\"",$MODNAME,"/week.html\">week</a>
  0##      </td>
  1##    <td><a href=\"",$MODNAME,"/proc.html\"><img src=\"system/thumb-proc.",$IMAGEFORMAT,"\"></a></td>
***************
*** 77,84 ****
  <META HTTP-EQUIV=\"Refresh\" CONTENT=\"$REFRESH\">
  <META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n";
      }
!   print FILE "<body>\n<img src=\"",$index,"-hour.",$IMAGEFORMAT,"\">\n<img src=\"",$index,"-day.",$IMAGEFORMAT,"\">\n<img src=\"",$index,"-week.",$IMAGEFORMAT,"\">\n";
!   if ($index ne "load") { print FILE "<img src=\"",$index,"-month.",$IMAGEFORMAT,"\">\n"; }
    print FILE "<img src=\"",$index,"-year.",$IMAGEFORMAT,"\">\n</body>\n</html>\n";
    close FILE;
    }
--- 77,86 ----
  <META HTTP-EQUIV=\"Refresh\" CONTENT=\"$REFRESH\">
  <META HTTP-EQUIV=\"Pragma\" CONTENT=\"no-cache\">\n";
      }
!   print FILE "<body>\n<img src=\"",$index,"-3h.",$IMAGEFORMAT,"\">\n";
!   print FILE "<img src=\"",$index,"-day.",$IMAGEFORMAT,"\">\n";
!   print FILE "<img src=\"",$index,"-week.",$IMAGEFORMAT,"\">\n";
!   print FILE "<img src=\"",$index,"-month.",$IMAGEFORMAT,"\">\n";
    print FILE "<img src=\"",$index,"-year.",$IMAGEFORMAT,"\">\n</body>\n</html>\n";
    close FILE;
    }
diff -crN before/data-traffic/diagrams.pl after/data-traffic/diagrams.pl
*** before/data-traffic/diagrams.pl	Wed Jan 15 17:49:14 2003
--- after/data-traffic/diagrams.pl	Wed Jan 15 17:27:07 2003
***************
*** 73,82 ****
      $maxout*=$MULT;
      $IOMIN=1000*$MULT;
  
!     foreach $range ("1h","6h","1day","1week","1month","1year") {
        ($descr,$file,$build)=get_diagram_properties($range);
!       if ($range eq "1h") { draw_hourly($name,$device,$STYLE,$MULT,$IOMIN,$maxin,$maxout,$IMGFMT); }
!       else { draw_other($range,$name,$device,$descr,$file,$build,$STYLE,$MULT,$IOMIN,$maxin,$maxout,$IMGFMT); }
        }
      }
    else { print "  No database found\n  Please check if the daemon is running.\n";next; }
--- 73,81 ----
      $maxout*=$MULT;
      $IOMIN=1000*$MULT;
  
!     foreach $range ("3h","1day","1week","1month","1year") {
        ($descr,$file,$build)=get_diagram_properties($range);
!       draw_other($range,$name,$device,$descr,$file,$build,$STYLE,$MULT,$IOMIN,$maxin,$maxout,$IMGFMT);
        }
      }
    else { print "  No database found\n  Please check if the daemon is running.\n";next; }
diff -crN before/data-traffic/makeindex.pl after/data-traffic/makeindex.pl
*** before/data-traffic/makeindex.pl	Mon Dec 17 23:38:21 2001
--- after/data-traffic/makeindex.pl	Wed Jan 15 10:01:25 2003
***************
*** 25,32 ****
      }
    }
  close FILE;
! @DIAGRAMS=("hour","6h","day","week","month","year");
! @TIMES=("6h","week");
  
  # build time-based .html files
  #
--- 25,32 ----
      }
    }
  close FILE;
! @DIAGRAMS=("3h","day","week","month","year");
! @TIMES=("3h","week");
  
  # build time-based .html files
  #
***************
*** 53,59 ****
  #
  open (IDXFILE,">idxdata");
  print IDXFILE "0##    <td colspan=2 align=center valign=top> <font size=\"+3\">",$MODNAME,"</font><br>
! 0##      <a href=\"",$MODNAME,"/6h.html\">6 hours</a>
  0##      <a href=\"",$MODNAME,"/week.html\">week</a>
  0##      </td>\n";
  $nn=0;
--- 53,59 ----
  #
  open (IDXFILE,">idxdata");
  print IDXFILE "0##    <td colspan=2 align=center valign=top> <font size=\"+3\">",$MODNAME,"</font><br>
! 0##      <a href=\"",$MODNAME,"/3h.html\">3 hours</a>
  0##      <a href=\"",$MODNAME,"/week.html\">week</a>
  0##      </td>\n";
  $nn=0;
diff -crN before/rrdtimer after/rrdtimer
*** before/rrdtimer	Wed Jan 15 01:10:00 2003
--- after/rrdtimer	Wed Jan 15 17:28:31 2003
***************
*** 127,133 ****
  
    while () {
      $now=time;
!     if ($last+10 <= $now) {
        if ($debuglevel > 0) { print $now,": main loop running\n"; }
    
        # scan directory for rrdgraph-modules.
--- 127,133 ----
  
    while () {
      $now=time;
!     if ($last+60 <= $now) {
        if ($debuglevel > 0) { print $now,": main loop running\n"; }
    
        # scan directory for rrdgraph-modules.