--- iog-1.03.orig/iog.cfg +++ iog-1.03/iog.cfg @@ -26,5 +26,7 @@ # [switch2:192.168.0.11:public:sysUpTime:/www/iog] # sw2-port20:192.168.0.11:public:ifHCInOctets.20:ifHCOutOctets.20:/www/iog/ # +[localhost:127.0.0.1:public:sysUpTime.0:/var/lib/iog] +localhost:127.0.0.1:public:ifInOctets.2:ifOutOctets.2:/var/lib/iog --- iog-1.03.orig/iog +++ iog-1.03/iog @@ -39,7 +39,7 @@ my($inoctets,$outoctets,$path,$iogver,$hostreset,$kbsize,$mbsize,$gbsize); $BER::pretty_print_timeticks="0"; -$cfgfile="$main::binpath"."iog.cfg"; +$cfgfile="/etc/iog.cfg"; $iogver="v1.03"; # Default Byte Sizes @@ -361,11 +361,11 @@ } sub footer { -print DHTML "


- -
IOG $iogver - Input Output Grapher
--
James Dogopoulos <jd\@dynw.com>
-Questions or comments to iog\@dynw.com +print DHTML "


+ +
\"iog\"IOG $iogver - Input Output Grapher
+-
James Dogopoulos <jd\@dynw.com>
+Questions or comments to iog\@dynw.com

"; } @@ -403,8 +403,10 @@ flock(DHTML, 2) or print "can't flock $name $host: $!"; truncate(DHTML, 0); + print DHTML qq(\n\n); print DHTML "IOG $iogver - $host - + "; } else { - $gstring = ""; } $inwidth = (sprintf("%.f", $inwidth) + 1); $outwidth = (sprintf("%.f", $outwidth) + 1); - print DHTML "\n"; + print DHTML "\n"; print DHTML $gstring; @@ -497,17 +499,17 @@ $intotal = sprintf("%.f", ($intotal / $mbsize)); $outtotal = sprintf("%.f", ($outtotal / $mbsize)); -print DHTML "
"; my $dexist = (-f "$path".$main::SL."$name"."-days.html"); @@ -412,32 +414,32 @@ if ($newday != "1") { if ($dexist && $mexist) { - print DHTML " [ Today | This Month - | Previous Months ]

"; + print DHTML " [ Today | This Month + | Previous Months ]

"; } else { if ($dexist && !$mexist) { - print DHTML " [ Today | This + print DHTML " [ Today | This Month | Previous Months ]

"; } else { if (!$dexist && $mexist) { print DHTML " [ Today | This Month - | Previous Months ]

"; + | Previous Months ]

"; } else { print DHTML "[ Today | This Month | Previous Months ]"; } } } } else { if ($dexist && $mexist) { - print DHTML " [ This Month - | Previous Months ]

"; + print DHTML " [ This Month + | Previous Months ]

"; } else { if ($dexist && !$mexist) { - print DHTML " [ This + print DHTML " [ This Month | Previous Months ]

"; } else { if (!$dexist && $mexist) { print DHTML " [ This Month - | Previous Months ]

"; + | Previous Months ]

"; } } } @@ -473,21 +475,21 @@ $gbin = sprintf("%.1f", $mbin / $gbsize); $gbout = sprintf("%.1f", $mbout / $gbsize); - $gstring = "		In: $gbin GB - ($mbin MB)
Out: $gbout GB ($mbout MB) + $gstring = "		In: $gbin GB + ($mbin MB)
Out: $gbout GB ($mbout MB)
In: $mbin MB (". - sprintf("%.f", $inoct / $kbsize)." KB)
Out: $mbout - MB (".sprintf("%.f", $outoct / $kbsize)." KB)"; + $gstring = "		In: $mbin MB (". + sprintf("%.f", $inoct / $kbsize)." KB)
Out: $mbout + MB (".sprintf("%.f", $outoct / $kbsize)." KB)
"."$count".":00
\n"; - print DHTML "
"."$count".":00\"in\"
\n"; + print DHTML "\"out\"

"; +print DHTML "
"; if ($intotal > $gbsize or $outtotal > $gbsize) { my $gbtotal = sprintf("%.1f", ($intotal + $outtotal) / $gbsize); - print DHTML "Today's Total: $gbtotal GB
-In: $intotal MB - Out: + print DHTML "Today's Total: $gbtotal GB
+In: $intotal MB - Out: $outtotal MB
"; } else { print DHTML "Today's Total: ".($intotal + $outtotal)." MB
-In: $intotal MB - Out: +In: $intotal MB - Out: $outtotal MB
"; } @@ -543,16 +545,18 @@ flock(DHTML, 2) or print "can't flock $name $host : $!"; truncate(DHTML, 0); -print DHTML "IOG $iogver - $host +print DHTML qq(\n\n); +print DHTML "IOG $iogver - $host "; $inwidth = (sprintf("%.f", $inwidth) + 1); $outwidth = (sprintf("%.f", $outwidth) + 1); if (-f "$path".$main::SL."$name"."-month".($count + "1").".html") { - $mlink = "$months[$count]"; + $mlink = "$months[$count]"; } else { $mlink = "$months[$count]"; } print DHTML "\n"; +
\n"; + print DHTML "
\n"; print DHTML $gstring; @@ -652,14 +656,16 @@ flock(DHTML, 2) or print "can't flock $name $host : $!"; truncate(DHTML, 0); -print DHTML "IOG $iogver - $host +print DHTML qq(\n\n); +print DHTML "IOG $iogver - $host
"; my $dexist = (-f "$path".$main::SL."$name"."-days.html"); if ($dexist) { -print DHTML "[ Today | -This Month | Previous Months ]

"; +print DHTML "[ Today | +This Month | Previous Months ]

"; } else { -print DHTML "[ Today | +print DHTML "[ Today | This Month | Previous Months ]

"; } @@ -583,20 +587,20 @@ $gbout = sprintf("%.1f", $mbout / $gbsize); $gbtotal = sprintf("%.1f", ($gbin + $gbout)); - $gstring = "		In: $gbin GB - ($mbin MB)
Out: $gbout GB ($mbout MB) + $gstring = "		In: $gbin GB + ($mbin MB)
Out: $gbout GB ($mbout MB)
$mlink
$gbtotal GB		 -
\n"; - print DHTML "
"; } else { - $gstring = ""; } $inwidth = (sprintf("%.f", $inwidth) + 1); @@ -707,12 +713,12 @@ if (-f "$path".$main::SL."$name"."-day".$count.".html" && $lastday eq "0" && ($newmon ne "1")) { - $pday = "$pday"; + $pday = "$pday"; } print DHTML "\n"; +
\n"; + print DHTML "
\n"; print DHTML $gstring; $count++; @@ -723,9 +729,9 @@ my $gbtotal = sprintf("%.1f", (($intotal + $outtotal) / $gbsize)); -print DHTML "
"; if (-f "$path".$main::SL."$name"."-months.html") { - print DHTML "[ Today | - This Month | Previous Months ]

"; + print DHTML "[ Today | + This Month | Previous Months ]

"; } else { - print DHTML "[ Today | This Month + print DHTML "[ Today | This Month | Previous Months ]

"; } @@ -690,14 +696,14 @@ $gbin = sprintf("%.1f", $mbin / $gbsize); $gbout = sprintf("%.1f", $mbout / $gbsize); - $gstring = "		In: $gbin GB - ($mbin MB)
Out: $gbout GB ($mbout MB) + $gstring = "		In: $gbin GB + ($mbin MB)
Out: $gbout GB ($mbout MB)
In: $mbin MB (". - sprintf("%.f", $inoct / $kbsize)." KB)
Out: $mbout - MB (".sprintf("%.f", $outoct / $kbsize)." KB)"; + $gstring = "		In: $mbin MB (". + sprintf("%.f", $inoct / $kbsize)." KB)
Out: $mbout + MB (".sprintf("%.f", $outoct / $kbsize)." KB)
$pday -
\n"; - print DHTML "

"; -print DHTML "Monthly Total: $gbtotal GB
-In: $intotal MB - Out: $outtotal MB
"; +print DHTML "
"; +print DHTML "Monthly Total: $gbtotal GB
+In: $intotal MB - Out: $outtotal MB
"; footer();