webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-14 21:12:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Nochmal korrigiert und fwhits auf eine Graphenart eingestellt

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@574 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-05-22 19:14:06 +00:00
parent b05768be3b
commit d55341424f
3 changed files with 5 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/cfgroot/graphs.pl
View File

@@ -269,26 +269,6 @@ sub updatefwhitsgraph {
"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
$ERROR = RRDs::error;
print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
RRDs::graph ("$graphs/firewallhits-$interval-line.png",
"--start", "-1$interval", "-aPNG", "-i", "-z",
"--alt-y-grid", "-w 600", "-h 200",
"--color", "SHADEA".$color{"color19"},
"--color", "SHADEB".$color{"color19"},
"--color", "BACK".$color{"color21"},
"-t firewall hits over the last $interval",
"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
"LINE2:amount".$color{"color24"}.":firewallhits",
"GPRINT:amount:MAX: $tr{'maximal'}\\: %2.2lf %S",
"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
"GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
"LINE2:portamount".$color{"color25"}.":portscans",
"GPRINT:portamount:MAX: $tr{'maximal'}\\: %2.2lf %S",
"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
$ERROR = RRDs::error;
print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
}
sub updatelqgraph {

44
html/cgi-bin/fwhits.cgi
View File

@@ -34,50 +34,8 @@ my @LOCALCHECK=();
my $errormessage="";
&Header::openpage($Lang::tr{'firewall graphs'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
print <<END;
<table width="100%" align="center">
<tr>
<td align="left">
<a href=/cgi-bin/fwhits.cgi?graph=line>$Lang::tr{'show lines'}</a>
&nbsp;
<a href=/cgi-bin/fwhits.cgi?graph=area>$Lang::tr{'show areas'}</a>
</td>
</tr>
</table>
END
if ($cgigraphs[1] eq "line") {
&Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-day-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-day-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"weekly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-week-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-week-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"monthly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-month-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-month-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
&Header::openbox('100%', 'center', $Lang::tr{"yearly firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-year-line.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<img alt='' src='/graphs/firewallhits-year-line.png' border='0' />";
print "<br />\n";
&Header::closebox();
}
else
{
&Header::openbox('100%', 'center', $Lang::tr{"daily firewallhits"});
my $ftime = localtime((stat("$graphdir/firewallhits-day-area.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
@@ -105,8 +63,6 @@ else
print "<img alt='' src='/graphs/firewallhits-year-area.png' border='0' />";
print "<br />\n";
&Header::closebox();
}
&Header::closebigbox();
&Header::closepage();

10
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -10,8 +10,8 @@
use strict;
# enable only the following on debugging purpose
# use warnings;
# use CGI::Carp 'fatalsToBrowser';
use warnings;
use CGI::Carp 'fatalsToBrowser';
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
@@ -156,9 +156,9 @@ if ($cgigraphs[1] =~ /hddtemp/){
foreach (@devices) {
my $device = $_;
chomp($device);
&Graphs::updatehddgraph ($disk,"week");
&Graphs::updatehddgraph ($disk,"month");
&Graphs::updatehddgraph ($disk,"year");}}
&Graphs::updatehddgraph ($device,"week");
&Graphs::updatehddgraph ($device,"month");
&Graphs::updatehddgraph ($device,"year");}}
my $graph = $cgigraphs[1];
my $graphname = $Lang::tr{"mbmon $cgigraphs[1]"};