From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 09/11] graphs.pl: Display spoofed and hostile traffic in firewall hits diagram as well Date: Sat, 18 Dec 2021 14:49:56 +0100 Message-ID: In-Reply-To: <34588df1-b2b7-9dfc-1fa4-54a2476d1d7f@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0929195281315908371==" List-Id: --===============0929195281315908371== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Peter M=C3=BCller --- config/cfgroot/graphs.pl | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 02341eb45..b964f1e80 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -3,7 +3,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2005-2010 IPFire Team = # +# Copyright (C) 2005-2021 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -106,7 +106,7 @@ foreach (@sensorsdir){ =20 sub makegraphbox { my ($origin, $name, $default_range) =3D @_; -=09 + # Optional time range: Default to "day" unless otherwise specified $default_range =3D "day" unless ($default_range ~~ @time_ranges); =20 @@ -154,7 +154,7 @@ sub updatecpugraph { "COMMENT:".sprintf("%15s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j" ); -=09 + my $nice =3D "CDEF:nice=3D"; my $interrupt =3D "CDEF:interrupt=3D"; my $steal =3D "CDEF:steal=3D"; @@ -164,7 +164,7 @@ sub updatecpugraph { my $iowait =3D "CDEF:iowait=3D"; my $irq =3D "CDEF:irq=3D"; my $addstring =3D ""; -=09 + for(my $i =3D 0; $i < $cpucount; $i++) { push(@command,"DEF:iowait".$i."=3D".$mainsettings{'RRDLOG'}."/collectd/loc= alhost/cpu-".$i."/cpu-wait.rrd:value:AVERAGE" ,"DEF:nice".$i."=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/cpu-".= $i."/cpu-nice.rrd:value:AVERAGE" @@ -184,7 +184,7 @@ sub updatecpugraph { $iowait .=3D "iowait".$i.","; $irq .=3D "irq".$i.","; } -=09 + for(my $i =3D 2; $i < $cpucount; $i++) { $addstring .=3D "ADDNAN,"; } @@ -692,6 +692,8 @@ sub updatefwhitsgraph { "DEF:forward=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-fil= ter-POLICYFWD/ipt_bytes-DROP_FORWARD.rrd:value:AVERAGE", "DEF:newnotsyn=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-f= ilter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE", "DEF:portscan=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-fi= lter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE", + "DEF:spoofedmartian=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptab= les-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE", + "DEF:hostile=3D".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-fil= ter-HOSTILE/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), @@ -722,6 +724,16 @@ sub updatefwhitsgraph { "GPRINT:portscan:AVERAGE:%8.1lf %sBps", "GPRINT:portscan:MIN:%8.1lf %sBps", "GPRINT:portscan:LAST:%8.1lf %sBps\\j", + "STACK:spoofedmartian".$color{"color12"}."A0:".sprintf("%-25s",$Lang::tr{'= spoofed or martians'}), + "GPRINT:spoofedmartian:MAX:%8.1lf %sBps", + "GPRINT:spoofedmartian:AVERAGE:%8.1lf %sBps", + "GPRINT:spoofedmartian:MIN:%8.1lf %sBps", + "GPRINT:spoofedmartian:LAST:%8.1lf %sBps\\j", + "STACK:hostile".$color{"color13"}."A0:".sprintf("%-25s",$Lang::tr{'hostile= networks'}), + "GPRINT:hostile:MAX:%8.1lf %sBps", + "GPRINT:hostile:AVERAGE:%8.1lf %sBps", + "GPRINT:hostile:MIN:%8.1lf %sBps", + "GPRINT:hostile:LAST:%8.1lf %sBps\\j", ); $ERROR =3D RRDs::error; return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR; --=20 2.26.2 --===============0929195281315908371==--