--- mrtg Thu Jul 26 09:12:22 2001 +++ mrtg.1minute_interval Thu Jul 26 09:03:43 2001 @@ -1,4 +1,4 @@ -#! /usr/sepp/bin/perl +#! /usr/bin/perl # -*- mode: Perl -*- ################################################################### @@ -196,7 +196,7 @@ # set meta expires if there is an index file # 2000/05/03 Bill McGonigle if (defined $cfg{'writeexpires'}) { - my $exp = &expistr($cfg{'interval'} ? $cfg{'interval'} : 5); + my $exp = &expistr($cfg{'interval'} ? $cfg{'interval'} : 1); my $fil; $fil = "$cfg{'htmldir'}index.html" if -e "$cfg{'htmldir'}index.html"; $fil = "$cfg{'htmldir'}index.htm" if -e "$cfg{'htmldir'}index.htm"; @@ -408,20 +408,21 @@ debug('base',"create $rrd"); # create the rrd if it doesn't exist # don't fail if interval is not set - my $interval = $$cfg{interval} || 5; + my $interval = $$cfg{interval} || 1; + $interval = 1; my $minhb = int($$cfg{interval} * 60)*2; $minhb = 600 if ($minhb <600); my @args = ($rrd, '-b', $time-10, '-s', int($interval * 60), "DS:ds0:$up_abs:$minhb:0:$absi", "DS:ds1:$up_abs:$minhb:0:$abso", - "RRA:AVERAGE:0.5:1:600", - "RRA:AVERAGE:0.5:6:700", - "RRA:AVERAGE:0.5:24:775", - "RRA:AVERAGE:0.5:288:797", - "RRA:MAX:0.5:1:600", - "RRA:MAX:0.5:6:700", - "RRA:MAX:0.5:24:775", - "RRA:MAX:0.5:288:797"); + "RRA:AVERAGE:0.5:1:1440", + "RRA:AVERAGE:0.5:10:1008", + "RRA:AVERAGE:0.5:60:768", + "RRA:AVERAGE:0.5:1440:797", + "RRA:MAX:0.5:1:1440", + "RRA:MAX:0.5:10:1008", + "RRA:MAX:0.5:60:768", + "RRA:MAX:0.5:1440:797"); RRDs::create(@args); my $e = RRDs::error(); die "ERROR: Cannot create logfile: $e\n" if $e; @@ -510,7 +511,7 @@ my $growright = 0+($$rcfg{'options'}{'growright'}{$router} or 0); my $bits = 0+($$rcfg{'options'}{'bits'}{$router} or 0); my $integer = 0+($$rcfg{'options'}{'integer'}{$router} or 0); - my $step = 5*60; + my $step = 1 * 60; my $rop; my $ytics = $$rcfg{'ytics'}{$router}; my $yticsf= $$rcfg{'yticsfactor'}{$router}; @@ -549,7 +550,7 @@ $sign*$maxvi, $sign*$maxvo, $maxx, $maxy, ,$xscale, $yscale, $growright, $step, $bits, $ytics, $yticsf); @mxvls = ("d"); push (@metas, "$$cfg{'imagedir'}$$rcfg{'directory'}{$router}${router}-day.${main::GRAPHFMT}", - $$cfg{'interval'} ? $$cfg{'interval'} : 5); + $$cfg{'interval'} ? $$cfg{'interval'} : 1); } my $SAGE = (time - $main::STARTTIME) / 3600 / 24; # current script age @@ -841,12 +842,12 @@ if ($$rcfg{'legend3'}{$router}) { $leg3 = $$rcfg{'legend3'}{$router}; } else { - $leg3 = &$LOC("Maximal 5 Minute Incoming Traffic"); + $leg3 = &$LOC("Maximal 1 Minute Incoming Traffic"); } if ($$rcfg{'legend4'}{$router}) { $leg4 = $$rcfg{'legend4'}{$router}; } else { - $leg4 = &$LOC("Maximal 5 Minute Outgoing Traffic"); + $leg4 = &$LOC("Maximal 1 Minute Outgoing Traffic"); } if ($$rcfg{'legend5'}{$router}) { $leg5 = $$rcfg{'legend5'}{$router}; @@ -870,9 +871,9 @@ print HTML "\n"; print HTML '' . "\n"; print HTML "\n"; - my $interval =$$cfg{'interval'} ? $$cfg{'interval'} : 5; + my $interval =$$cfg{'interval'} ? $$cfg{'interval'} : 1; my $expiration = &expistr($interval); - my $refresh = $$cfg{'refresh'} ? $$cfg{'refresh'} : 300; + my $refresh = $$cfg{'refresh'} ? $$cfg{'refresh'} : 60; my $namestring = &$LOC("the device"); print HTML <<"TEXT";