From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephan Feddersen To: development@lists.ipfire.org Subject: [PATCH] WIO - shutdown function removed, adjustments to IPsec status display Date: Sun, 28 Jun 2020 12:47:01 +0200 Message-ID: <20200628104701.28739-1-sfeddersen@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8716184116500918362==" List-Id: --===============8716184116500918362== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable --- src/wio/wio-graphs.pl | 97 ++++++++++++++----------------------------- 1 file changed, 32 insertions(+), 65 deletions(-) diff --git a/src/wio/wio-graphs.pl b/src/wio/wio-graphs.pl index af5c52062..0cfac20d6 100644 --- a/src/wio/wio-graphs.pl +++ b/src/wio/wio-graphs.pl @@ -3,7 +3,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2017-2018 Stephan Feddersen = # +# Copyright (C) 2017-2020 Stephan Feddersen = # # All Rights Reserved. = # # = # # This program is free software: you can redistribute it and/or modify = # @@ -21,9 +21,9 @@ # = # ############################################################################= ### # -# Version: 2017/07/11 21:32:23 +# Version: 2020/05/26 10:34:23 # -# This wio-graphs.pl is based on the Code from the IPCop WIO Addon +# This wio-graphs.pl is based on the code from the IPCop WIO Addon # and is extremly adapted to work with IPFire. # # Autor: Stephan Feddersen @@ -45,18 +45,35 @@ require '/var/ipfire/lang.pl'; my ( %mainsettings, %color ) =3D (); =20 &General::readhash('/var/ipfire/main/settings', \%mainsettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/i= nclude/colors.txt", \%color); +&General::readhash('/srv/web/ipfire/html/themes/'.$mainsettings{'THEME'}.'/i= nclude/colors.txt', \%color); =20 -sub wio { - my $hostid =3D $_[0]; - my $hostname =3D $_[1]; - my $period =3D $_[2]; +sub wiograph { + my $hostid =3D $_[0]; + my $host =3D $_[1]; + my $period =3D $_[2]; + + my $title =3D "$host ($Lang::tr{$period})\n"; =20 my @rrd =3D (); =20 push @rrd, ("-"); - push @rrd, @{&header($period, "$hostname ($Lang::tr{$period})")}; - push @rrd, @{&body($hostid)}; + push @rrd, ("--title", "$title"); + push @rrd, ("--start", "-1$period", "-aPNG", "-i", "-z"); + push @rrd, ("--border", "0"); + push @rrd, ("--full-size-mode"); + push @rrd, ("--slope-mode"); + push @rrd, ("--pango-markup"); + push @rrd, ("--alt-y-grid", "-w 910", "-h 300"); + if ( $period eq 'day' ) { push @rrd, ("--x-grid", "MINUTE:30:HOUR:1:HOUR:2:= 0:%H:%M"); } + push @rrd, ("--color", "SHADEA".$color{"color19"}); + push @rrd, ("--color", "SHADEB".$color{"color19"}); + push @rrd, ("--color", "BACK".$color{"color21"}); + push @rrd, "DEF:mode=3D/var/log/rrd/wio/$hostid.rrd:mode:AVERAGE"; + push @rrd, "CDEF:online=3Dmode,UN,0,mode,IF,50,GT,100,0,IF"; + push @rrd, "CDEF:offline=3Dmode,UN,100,mode,IF,50,LT,100,0,IF"; + push @rrd, "AREA:online".$color{"color12"}.":$Lang::tr{'wio up'}\\j"; + push @rrd, "AREA:offline".$color{"color13"}.":$Lang::tr{'wio down'}\\j"; + push @rrd, "-W www.ipfire.org"; =20 RRDs::graph (@rrd); =20 @@ -64,64 +81,14 @@ sub wio { print "Error in RRD::graph for Who Is Online: $error\n" if $error; } =20 -sub body { - my $hostid =3D shift; - my $result =3D []; - - push @$result, "DEF:mode=3D/var/log/rrd/wio/$hostid.rrd:mode:AVERAGE"; - push @$result, "CDEF:online=3Dmode,UN,0,mode,IF,50,GT,100,0,IF"; - push @$result, "CDEF:offline=3Dmode,UN,100,mode,IF,50,LT,100,0,IF"; - push @$result, "AREA:online".$color{"color12"}.":$Lang::tr{'wio up'}\\j"; - push @$result, "AREA:offline".$color{"color13"}.":$Lang::tr{'wio down'}\\j"; - push @$result, "COMMENT:\r$Lang::tr{'wio_last_update= '}\\: ". lastupdate(scalar localtime()) ."\\r"; - - return $result; -} - -sub lastupdate { - my $text =3D shift; - - return undef if not defined $text; - $text =3D~ s/\\/\\\\/g; - $text =3D~ s/:/\\:/g; - - return $text; -} - -sub header { - my $period =3D shift; - my $title =3D shift; - my $result =3D []; - - push @$result, ("--title", "$title"); - push @$result, ("--start", "-1$period", "-aPNG", "-i", "-z"); - push @$result, ("--border", "0"); - push @$result, ("--full-size-mode"); - push @$result, ("--slope-mode"); - push @$result, ("--pango-markup"); - push @$result, ("--alt-y-grid", "-w 910", "-h 300"); - if ( $period eq 'day' ) { push @$result, ("--x-grid", "MINUTE:30:HOUR:1:HOU= R:2:0:%H:%M"); } - push @$result, ("--color", "SHADEA".$color{"color19"}); - push @$result, ("--color", "SHADEB".$color{"color19"}); - push @$result, ("--color", "BACK".$color{"color21"}); - - return $result; -} - sub wiographbox { - print "
"; - print ""; - print ""; - print ""; + print "
".$Lang::tr{'hou= r'}."
"; + print ""; print ""; print ""; print ""; - print ""; - print ""; - print "
".$Lang::t= r{'hour'}."".$Lang::tr{'day'= }."".$Lang::tr{'wee= k'}."".$Lang::tr{'mo= nth'}."".$Lang::tr{'yea= r'}."
"; - print ""; - print ""; - print ""; + print ""; + print ""; + print ""; print "
 
".$Lang::tr{'yea= r'}."
 
"; - print "
"; } --=20 2.17.1 --===============8716184116500918362==--