diff mbox series

[3/3] rrdimage: Switch graphs.pl to the new graph scripts

Message ID	20210401133516.1058-3-hofmann@leo-andres.de
State	Accepted
Headers	From: Leo-Andres Hofmann <hofmann@leo-andres.de> To: development@lists.ipfire.org Subject: [PATCH 3/3] rrdimage: Switch graphs.pl to the new graph scripts Date: Thu, 1 Apr 2021 15:35:16 +0200 Message-Id: <20210401133516.1058-3-hofmann@leo-andres.de> In-Reply-To: <20210401133516.1058-1-hofmann@leo-andres.de> References: <20210401133516.1058-1-hofmann@leo-andres.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit country: DE(-0.01), ip: 185.26.156.147(-0.73)]; TO_DN_NONE(0.00)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; RCPT_COUNT_ONE(0.00)[1]; DMARC_NA(0.00)[leo-andres.de]; R_SPF_ALLOW(-0.20)[+mx]; MID_CONTAINS_FROM(1.00)[]; MIME_HTML_ONLY(0.20)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:~]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; RCVD_COUNT_TWO(0.00)[2]; BAYES_HAM(-3.00)[99.98%] Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[1/3] rrdimage: Add scripts for new graph display method \| [1/3] rrdimage: Add scripts for new graph display method [2/3] rrdimage: Add CSS and Javascript to ipfire theme [3/3] rrdimage: Switch graphs.pl to the new graph scripts

Commit Message

Leo-Andres Hofmann April 1, 2021, 1:35 p.m. UTC

  "makegraphbox" is modified to remove the old iframe method and output
a modern div container instead.
Graph errors are now returned, to be displayed by getrrdimage.cgi.

entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.

Add cache control HTTP header to image output.

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
---
 config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
 html/cgi-bin/entropy.cgi    |  2 +-
 html/cgi-bin/netovpnsrv.cgi |  2 +-
 3 files changed, 50 insertions(+), 40 deletions(-)

Comments

Michael Tremer April 7, 2021, 9:31 p.m. UTC | #1

Hello,

Is this meant to look like this?



> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de> wrote:
> 
> "makegraphbox" is modified to remove the old iframe method and output
> a modern div container instead.
> Graph errors are now returned, to be displayed by getrrdimage.cgi.
> 
> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
> 
> Add cache control HTTP header to image output.
> 
> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
> ---
> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
> html/cgi-bin/entropy.cgi    |  2 +-
> html/cgi-bin/netovpnsrv.cgi |  2 +-
> 3 files changed, 50 insertions(+), 40 deletions(-)
> 
> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
> index beddff032..cf4a30de3 100644
> --- a/config/cfgroot/graphs.pl
> +++ b/config/cfgroot/graphs.pl
> @@ -24,6 +24,7 @@ package Graphs;
> 
> use strict;
> use RRDs;
> +use experimental 'smartmatch';
> 
> require '/var/ipfire/general-functions.pl';
> require "${General::swroot}/lang.pl";
> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
> 
> # Generate a nice box for selection of time range in graphs
> -# this will generate a nice iframe for the cgi every klick for
> -# the graph will be handled inside the iframe
> +# this will generate a nice div box for the cgi every klick for
> +# the graph will be handled by javascript
> # 0 is the cgi refering to
> # 1 is the graph name
> -# 2 is the time range for the graph
> -# 3 if given is the height of the iframe default if nothing is given
> +# 2 is the time range for the graph (optional)
> 
> sub makegraphbox {
> -	print "<center>";
> -	print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
> -	print " - ";
> -	print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
> -	print " - ";
> -	print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
> -	print " - ";
> -	print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
> -	print " - ";
> -	print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
> -	print "<br></center>";
> -	print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
> +	my ($origin, $name, $default_range) = @_;
> +	
> +	# Optional time range: Default to "day" unless otherwise specified
> +	$default_range = "day" unless ($default_range ~~ @time_ranges);
> +
> +	print <<END;
> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
> +	<ul>
> +END
> +
> +	# Print range select buttons
> +	foreach my $range (@time_ranges) {
> +		print <<END;
> +		<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
> +END
> +	}
> +
> +	print <<END;
> +	</ul>
> +	<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
> +</div>
> +END
> }
> 
> # Generate the CPU Graph for the current period of time for values given by
> @@ -248,7 +258,7 @@ sub updatecpugraph {
> 
> 	RRDs::graph (@command);
> 	$ERROR = RRDs::error;
> -	print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
> +	return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Load Graph for the current period of time for values given by collecd
> @@ -280,7 +290,7 @@ sub updateloadgraph {
> 		"LINE1:load1".$color{"color18"},
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Memory Graph for the current period of time for values given by collecd
> @@ -336,7 +346,7 @@ sub updatememorygraph {
> 		"GPRINT:freepct:LAST:%3.2lf%%\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Swap Graph for the current period of time for values given by collecd
> @@ -385,7 +395,7 @@ sub updateswapgraph {
> 		"GPRINT:freepct:LAST:%3.2lf%%\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Process Cpu Graph for the current period of time for values given by collecd
> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
> 
> 		RRDs::graph (@command);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Process Memory Graph for the current period of time for values given by collecd
> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
> 
> 		RRDs::graph (@command);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Disk Graph for the current period of time for values given by collecd
> @@ -522,7 +532,7 @@ sub updatediskgraph {
> 		"GPRINT:write:LAST:%8.1lf %sBps\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Interface Graph for the current period of time for values given by collecd
> @@ -561,7 +571,7 @@ sub updateifgraph {
> 		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
> }
> 
> sub updatevpngraph {
> @@ -598,7 +608,7 @@ sub updatevpngraph {
> 		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
> }
> 
> sub updatevpnn2ngraph {
> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
> 		"GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Firewall Graph for the current period of time for values given by collecd
> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
> 		"GPRINT:portscan:LAST:%8.1lf %sBps\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Line Quality Graph for the current period of time for values given by collecd
> @@ -758,7 +768,7 @@ sub updatepinggraph {
> 		"GPRINT:roundtrip:LAST:%3.2lf ms\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
> }
> 
> sub updatewirelessgraph {
> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
> 		"GPRINT:power:LAST:%5.1lf %sdBm\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
> @@ -827,7 +837,7 @@ sub updatehddgraph {
> 		"GPRINT:temperature:LAST:%3.0lf °C\\j",
> 		);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
> 
> 		RRDs::graph (@command);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
> @@ -922,7 +932,7 @@ sub updatehwfangraph {
> 
> 		RRDs::graph (@command);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
> 
> 		RRDs::graph (@command);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
> }
> 
> 
> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
> 		}
> 		RRDs::graph (@command);
> 		$ERROR = RRDs::error;
> -		print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
> +		return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
> 
> 	RRDs::graph (@command);
> 	$ERROR = RRDs::error;
> -	print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
> +	return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
> }
> 
> # Generate the Thermal Zone Temp CPU Graph
> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
> 
> 	RRDs::graph (@command);
> 	$ERROR = RRDs::error;
> -	print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
> +	return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
> }
> 
> 
> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
> 	RRDs::graph (@command);
> 	$ERROR = RRDs::error;
> 
> -	print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
> +	return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
> }
> 
> sub updateconntrackgraph {
> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
> 	RRDs::graph(@command);
> 	$ERROR = RRDs::error;
> 
> -	print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
> +	return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
> }
> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
> index d7a9ca5d8..f8045db5a 100644
> --- a/html/cgi-bin/entropy.cgi
> +++ b/html/cgi-bin/entropy.cgi
> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
> 	&Header::openbigbox('100%', 'left');
> 
> 	&Header::openbox('100%', 'center', $Lang::tr{'entropy'});
> -	&Graphs::makegraphbox("entropy.cgi", "day");
> +	&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
> 	&Header::closebox();
> 
> 	# Check for hardware support.
> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
> index 77c69cddb..ab3548713 100755
> --- a/html/cgi-bin/netovpnsrv.cgi
> +++ b/html/cgi-bin/netovpnsrv.cgi
> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
> 	if (@vpns || %ipsecgraphs) {
> 		foreach my $name (sort keys %ipsecgraphs) {
> 			&Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
> -			&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
> +			&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
> 			&Header::closebox();
> 		}
> 
> -- 
> 2.27.0.windows.1
>
<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;">Hello,<div class=""><br class=""></div><div class="">Is this meant to look like this?</div><div class=""><br class=""></div><div class=""><img apple-inline="yes" id="7B9EB3BC-5024-4633-97EF-24A61A97454D" width="998" height="418" src="cid:9785CFB7-5DAE-4B3A-B427-A3EEE1577AF5" class=""><br class=""><br class=""><blockquote type="cite" class="">On 1 Apr 2021, at 14:35, Leo-Andres Hofmann &lt;<a href="mailto:hofmann@leo-andres.de" class="">hofmann@leo-andres.de</a>&gt; wrote:<br class=""><br class="">"makegraphbox" is modified to remove the old iframe method and output<br class="">a modern div container instead.<br class="">Graph errors are now returned, to be displayed by getrrdimage.cgi.<br class=""><br class="">entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.<br class=""><br class="">Add cache control HTTP header to image output.<br class=""><br class="">Signed-off-by: Leo-Andres Hofmann &lt;<a href="mailto:hofmann@leo-andres.de" class="">hofmann@leo-andres.de</a>&gt;<br class="">---<br class="">config/cfgroot/graphs.pl &nbsp; &nbsp;| 86 +++++++++++++++++++++----------------<br class="">html/cgi-bin/entropy.cgi &nbsp; &nbsp;| &nbsp;2 +-<br class="">html/cgi-bin/netovpnsrv.cgi | &nbsp;2 +-<br class="">3 files changed, 50 insertions(+), 40 deletions(-)<br class=""><br class="">diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl<br class="">index beddff032..cf4a30de3 100644<br class="">--- a/config/cfgroot/graphs.pl<br class="">+++ b/config/cfgroot/graphs.pl<br class="">@@ -24,6 +24,7 @@ package Graphs;<br class=""><br class="">use strict;<br class="">use RRDs;<br class="">+use experimental 'smartmatch';<br class=""><br class="">require '/var/ipfire/general-functions.pl';<br class="">require "${General::swroot}/lang.pl";<br class="">@@ -99,26 +100,35 @@ foreach (@sensorsdir){<br class="">&amp;General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);<br class=""><br class=""># Generate a nice box for selection of time range in graphs<br class="">-# this will generate a nice iframe for the cgi every klick for<br class="">-# the graph will be handled inside the iframe<br class="">+# this will generate a nice div box for the cgi every klick for<br class="">+# the graph will be handled by javascript<br class=""># 0 is the cgi refering to<br class=""># 1 is the graph name<br class="">-# 2 is the time range for the graph<br class="">-# 3 if given is the height of the iframe default if nothing is given<br class="">+# 2 is the time range for the graph (optional)<br class=""><br class="">sub makegraphbox {<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;center&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'&gt;&lt;b&gt;".$Lang::tr{'hour'}."&lt;/b&gt;&lt;/a&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print " - ";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'&gt;&lt;b&gt;".$Lang::tr{'day'}."&lt;/b&gt;&lt;/a&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print " - ";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'&gt;&lt;b&gt;".$Lang::tr{'week'}."&lt;/b&gt;&lt;/a&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print " - ";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'&gt;&lt;b&gt;".$Lang::tr{'month'}."&lt;/b&gt;&lt;/a&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print " - ";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'&gt;&lt;b&gt;".$Lang::tr{'year'}."&lt;/b&gt;&lt;/a&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;br&gt;&lt;/center&gt;";<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "&lt;iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'&gt;&lt;/iframe&gt;";<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>my ($origin, $name, $default_range) = @_;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span># Optional time range: Default to "day" unless otherwise specified<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>$default_range = "day" unless ($default_range ~~ @time_ranges);<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>print &lt;&lt;END;<br class="">+&lt;div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range"&gt;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>&lt;ul&gt;<br class="">+END<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span># Print range select buttons<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>foreach my $range (@time_ranges) {<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print &lt;&lt;END;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>&lt;li&gt;&lt;button data-range="$range" onclick="rrdimage_selectRange(this)"&gt;$Lang::tr{$range}&lt;/button&gt;&lt;/li&gt;<br class="">+END<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>}<br class="">+<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>print &lt;&lt;END;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>&lt;/ul&gt;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>&lt;img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&amp;graph=${name}&amp;range=${default_range}" alt="$Lang::tr{'graph'} ($name)"&gt;<br class="">+&lt;/div&gt;<br class="">+END<br class="">}<br class=""><br class=""># Generate the CPU Graph for the current period of time for values given by<br class="">@@ -248,7 +258,7 @@ sub updatecpugraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Load Graph for the current period of time for values given by collecd<br class="">@@ -280,7 +290,7 @@ sub updateloadgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"LINE1:load1".$color{"color18"},<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Memory Graph for the current period of time for values given by collecd<br class="">@@ -336,7 +346,7 @@ sub updatememorygraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:freepct:LAST:%3.2lf%%\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Swap Graph for the current period of time for values given by collecd<br class="">@@ -385,7 +395,7 @@ sub updateswapgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:freepct:LAST:%3.2lf%%\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Process Cpu Graph for the current period of time for values given by collecd<br class="">@@ -432,7 +442,7 @@ sub updateprocessescpugraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Process Memory Graph for the current period of time for values given by collecd<br class="">@@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Disk Graph for the current period of time for values given by collecd<br class="">@@ -522,7 +532,7 @@ sub updatediskgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:write:LAST:%8.1lf %sBps\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Interface Graph for the current period of time for values given by collecd<br class="">@@ -561,7 +571,7 @@ sub updateifgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class="">sub updatevpngraph {<br class="">@@ -598,7 +608,7 @@ sub updatevpngraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class="">sub updatevpnn2ngraph {<br class="">@@ -661,7 +671,7 @@ sub updatevpnn2ngraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:compression_out:LAST:%8.1lf %sBps\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Firewall Graph for the current period of time for values given by collecd<br class="">@@ -716,7 +726,7 @@ sub updatefwhitsgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:portscan:LAST:%8.1lf %sBps\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Line Quality Graph for the current period of time for values given by collecd<br class="">@@ -758,7 +768,7 @@ sub updatepinggraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:roundtrip:LAST:%3.2lf ms\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class="">sub updatewirelessgraph {<br class="">@@ -793,7 +803,7 @@ sub updatewirelessgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:power:LAST:%5.1lf %sdBm\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors<br class="">@@ -827,7 +837,7 @@ sub updatehddgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>"GPRINT:temperature:LAST:%3.0lf °C\\j",<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors<br class="">@@ -875,7 +885,7 @@ sub updatehwtempgraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors<br class="">@@ -922,7 +932,7 @@ sub updatehwfangraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors<br class="">@@ -969,7 +979,7 @@ sub updatehwvoltgraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""><br class="">@@ -1051,7 +1061,7 @@ sub updateqosgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>}<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors<br class="">@@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""># Generate the Thermal Zone Temp CPU Graph<br class="">@@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class=""><br class="">@@ -1174,7 +1184,7 @@ sub updateentropygraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph (@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class=""><br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;<br class="">}<br class=""><br class="">sub updateconntrackgraph {<br class="">@@ -1202,5 +1212,5 @@ sub updateconntrackgraph {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>RRDs::graph(@command);<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>$ERROR = RRDs::error;<br class=""><br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;<br class="">}<br class="">diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi<br class="">index d7a9ca5d8..f8045db5a 100644<br class="">--- a/html/cgi-bin/entropy.cgi<br class="">+++ b/html/cgi-bin/entropy.cgi<br class="">@@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Header::openbigbox('100%', 'left');<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Header::openbox('100%', 'center', $Lang::tr{'entropy'});<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Graphs::makegraphbox("entropy.cgi", "day");<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Graphs::makegraphbox("entropy.cgi", "entropy", "day");<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Header::closebox();<br class=""><br class=""><span class="Apple-tab-span" style="white-space:pre">	</span># Check for hardware support.<br class="">diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi<br class="">index 77c69cddb..ab3548713 100755<br class="">--- a/html/cgi-bin/netovpnsrv.cgi<br class="">+++ b/html/cgi-bin/netovpnsrv.cgi<br class="">@@ -75,7 +75,7 @@ if ( $querry[0] ne ""){<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span>if (@vpns || %ipsecgraphs) {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>foreach my $name (sort keys %ipsecgraphs) {<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");<br class="">-<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");<br class="">+<span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>&amp;Header::closebox();<br class=""><span class="Apple-tab-span" style="white-space:pre">	</span><span class="Apple-tab-span" style="white-space:pre">	</span>}<br class=""><br class="">--&nbsp;<br class="">2.27.0.windows.1<br class=""><br class=""></blockquote><br class=""></div></body></html>

Leo-Andres Hofmann April 7, 2021, 10:18 p.m. UTC | #2

Hello Michael,

No, of course not, that looks terrible!
Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.

Best regards,
Leo

Am 07.04.2021 um 23:31 schrieb Michael Tremer:
> Hello,
>
> Is this meant to look like this?
>
>
>
>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>
>> "makegraphbox" is modified to remove the old iframe method and output
>> a modern div container instead.
>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>
>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>
>> Add cache control HTTP header to image output.
>>
>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>> ---
>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>> html/cgi-bin/entropy.cgi    |  2 +-
>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>
>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>> index beddff032..cf4a30de3 100644
>> --- a/config/cfgroot/graphs.pl
>> +++ b/config/cfgroot/graphs.pl
>> @@ -24,6 +24,7 @@ package Graphs;
>>
>> use strict;
>> use RRDs;
>> +use experimental 'smartmatch';
>>
>> require '/var/ipfire/general-functions.pl';
>> require "${General::swroot}/lang.pl";
>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>
>> # Generate a nice box for selection of time range in graphs
>> -# this will generate a nice iframe for the cgi every klick for
>> -# the graph will be handled inside the iframe
>> +# this will generate a nice div box for the cgi every klick for
>> +# the graph will be handled by javascript
>> # 0 is the cgi refering to
>> # 1 is the graph name
>> -# 2 is the time range for the graph
>> -# 3 if given is the height of the iframe default if nothing is given
>> +# 2 is the time range for the graph (optional)
>>
>> sub makegraphbox {
>> -print "<center>";
>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>> -print " - ";
>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>> -print " - ";
>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>> -print " - ";
>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>> -print " - ";
>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>> -print "<br></center>";
>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>> +my ($origin, $name, $default_range) = @_;
>> +
>> +# Optional time range: Default to "day" unless otherwise specified
>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>> +
>> +print <<END;
>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>> +<ul>
>> +END
>> +
>> +# Print range select buttons
>> +foreach my $range (@time_ranges) {
>> +print <<END;
>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>> +END
>> +}
>> +
>> +print <<END;
>> +</ul>
>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>> +</div>
>> +END
>> }
>>
>> # Generate the CPU Graph for the current period of time for values given by
>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Load Graph for the current period of time for values given by collecd
>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>> "LINE1:load1".$color{"color18"},
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Memory Graph for the current period of time for values given by collecd
>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Swap Graph for the current period of time for values given by collecd
>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Disk Graph for the current period of time for values given by collecd
>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Interface Graph for the current period of time for values given by collecd
>> @@ -561,7 +571,7 @@ sub updateifgraph {
>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>> }
>>
>> sub updatevpngraph {
>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>> }
>>
>> sub updatevpnn2ngraph {
>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Firewall Graph for the current period of time for values given by collecd
>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>> }
>>
>> sub updatewirelessgraph {
>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>> );
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>> }
>>
>>
>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>> }
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>> }
>>
>> # Generate the Thermal Zone Temp CPU Graph
>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>> }
>>
>>
>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>> RRDs::graph (@command);
>> $ERROR = RRDs::error;
>>
>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>> }
>>
>> sub updateconntrackgraph {
>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>> RRDs::graph(@command);
>> $ERROR = RRDs::error;
>>
>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>> }
>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>> index d7a9ca5d8..f8045db5a 100644
>> --- a/html/cgi-bin/entropy.cgi
>> +++ b/html/cgi-bin/entropy.cgi
>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>> &Header::openbigbox('100%', 'left');
>>
>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>> -&Graphs::makegraphbox("entropy.cgi", "day");
>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>> &Header::closebox();
>>
>> # Check for hardware support.
>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>> index 77c69cddb..ab3548713 100755
>> --- a/html/cgi-bin/netovpnsrv.cgi
>> +++ b/html/cgi-bin/netovpnsrv.cgi
>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>> if (@vpns || %ipsecgraphs) {
>> foreach my $name (sort keys %ipsecgraphs) {
>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>> &Header::closebox();
>> }
>>
>> -- 
>> 2.27.0.windows.1
>>
>

Michael Tremer April 9, 2021, 10:57 a.m. UTC | #3

Hello,

That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.

Apart from that it works.

Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?

-Michael

> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
> 
> Hello Michael,
> 
> No, of course not, that looks terrible!
> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
> 
> Best regards,
> Leo
> 
> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>> Hello,
>> 
>> Is this meant to look like this?
>> 
>> 
>> 
>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>> 
>>> "makegraphbox" is modified to remove the old iframe method and output
>>> a modern div container instead.
>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>> 
>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>> 
>>> Add cache control HTTP header to image output.
>>> 
>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>> ---
>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>> html/cgi-bin/entropy.cgi    |  2 +-
>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>> 
>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>> index beddff032..cf4a30de3 100644
>>> --- a/config/cfgroot/graphs.pl
>>> +++ b/config/cfgroot/graphs.pl
>>> @@ -24,6 +24,7 @@ package Graphs;
>>> 
>>> use strict;
>>> use RRDs;
>>> +use experimental 'smartmatch';
>>> 
>>> require '/var/ipfire/general-functions.pl';
>>> require "${General::swroot}/lang.pl";
>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>> 
>>> # Generate a nice box for selection of time range in graphs
>>> -# this will generate a nice iframe for the cgi every klick for
>>> -# the graph will be handled inside the iframe
>>> +# this will generate a nice div box for the cgi every klick for
>>> +# the graph will be handled by javascript
>>> # 0 is the cgi refering to
>>> # 1 is the graph name
>>> -# 2 is the time range for the graph
>>> -# 3 if given is the height of the iframe default if nothing is given
>>> +# 2 is the time range for the graph (optional)
>>> 
>>> sub makegraphbox {
>>> -print "<center>";
>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>> -print " - ";
>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>> -print " - ";
>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>> -print " - ";
>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>> -print " - ";
>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>> -print "<br></center>";
>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>> +my ($origin, $name, $default_range) = @_;
>>> +
>>> +# Optional time range: Default to "day" unless otherwise specified
>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>> +
>>> +print <<END;
>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>> +<ul>
>>> +END
>>> +
>>> +# Print range select buttons
>>> +foreach my $range (@time_ranges) {
>>> +print <<END;
>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>> +END
>>> +}
>>> +
>>> +print <<END;
>>> +</ul>
>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>> +</div>
>>> +END
>>> }
>>> 
>>> # Generate the CPU Graph for the current period of time for values given by
>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Load Graph for the current period of time for values given by collecd
>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>> "LINE1:load1".$color{"color18"},
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> sub updatevpngraph {
>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> sub updatevpnn2ngraph {
>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> sub updatewirelessgraph {
>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>> );
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> 
>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>> }
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> # Generate the Thermal Zone Temp CPU Graph
>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>> 
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> 
>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>> RRDs::graph (@command);
>>> $ERROR = RRDs::error;
>>> 
>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>> }
>>> 
>>> sub updateconntrackgraph {
>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>> RRDs::graph(@command);
>>> $ERROR = RRDs::error;
>>> 
>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>> }
>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>> index d7a9ca5d8..f8045db5a 100644
>>> --- a/html/cgi-bin/entropy.cgi
>>> +++ b/html/cgi-bin/entropy.cgi
>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>> &Header::openbigbox('100%', 'left');
>>> 
>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>> &Header::closebox();
>>> 
>>> # Check for hardware support.
>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>> index 77c69cddb..ab3548713 100755
>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>> if (@vpns || %ipsecgraphs) {
>>> foreach my $name (sort keys %ipsecgraphs) {
>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>> &Header::closebox();
>>> }
>>> 
>>> -- 
>>> 2.27.0.windows.1
>>> 
>> 
> <rrdimg-css.png>

Leo-Andres Hofmann April 9, 2021, 5:45 p.m. UTC | #4

Hi,

I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?

I'll change the CSS and submit a patch soon!

Leo

Am 09.04.2021 um 12:57 schrieb Michael Tremer:
> Hello,
>
> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>
> Apart from that it works.
>
> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>
> -Michael
>
>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>
>> Hello Michael,
>>
>> No, of course not, that looks terrible!
>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>
>> Best regards,
>> Leo
>>
>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>> Hello,
>>>
>>> Is this meant to look like this?
>>>
>>>
>>>
>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>
>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>> a modern div container instead.
>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>
>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>
>>>> Add cache control HTTP header to image output.
>>>>
>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>> ---
>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>
>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>> index beddff032..cf4a30de3 100644
>>>> --- a/config/cfgroot/graphs.pl
>>>> +++ b/config/cfgroot/graphs.pl
>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>
>>>> use strict;
>>>> use RRDs;
>>>> +use experimental 'smartmatch';
>>>>
>>>> require '/var/ipfire/general-functions.pl';
>>>> require "${General::swroot}/lang.pl";
>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>
>>>> # Generate a nice box for selection of time range in graphs
>>>> -# this will generate a nice iframe for the cgi every klick for
>>>> -# the graph will be handled inside the iframe
>>>> +# this will generate a nice div box for the cgi every klick for
>>>> +# the graph will be handled by javascript
>>>> # 0 is the cgi refering to
>>>> # 1 is the graph name
>>>> -# 2 is the time range for the graph
>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>> +# 2 is the time range for the graph (optional)
>>>>
>>>> sub makegraphbox {
>>>> -print "<center>";
>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>> -print " - ";
>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>> -print " - ";
>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>> -print " - ";
>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>> -print " - ";
>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>> -print "<br></center>";
>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>> +my ($origin, $name, $default_range) = @_;
>>>> +
>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>> +
>>>> +print <<END;
>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>> +<ul>
>>>> +END
>>>> +
>>>> +# Print range select buttons
>>>> +foreach my $range (@time_ranges) {
>>>> +print <<END;
>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>> +END
>>>> +}
>>>> +
>>>> +print <<END;
>>>> +</ul>
>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>> +</div>
>>>> +END
>>>> }
>>>>
>>>> # Generate the CPU Graph for the current period of time for values given by
>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>> "LINE1:load1".$color{"color18"},
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> sub updatevpngraph {
>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> sub updatevpnn2ngraph {
>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> sub updatewirelessgraph {
>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>> );
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>>
>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>> }
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> # Generate the Thermal Zone Temp CPU Graph
>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>>
>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>> RRDs::graph (@command);
>>>> $ERROR = RRDs::error;
>>>>
>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>> }
>>>>
>>>> sub updateconntrackgraph {
>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>> RRDs::graph(@command);
>>>> $ERROR = RRDs::error;
>>>>
>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>> }
>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>> index d7a9ca5d8..f8045db5a 100644
>>>> --- a/html/cgi-bin/entropy.cgi
>>>> +++ b/html/cgi-bin/entropy.cgi
>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>> &Header::openbigbox('100%', 'left');
>>>>
>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>> &Header::closebox();
>>>>
>>>> # Check for hardware support.
>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>> index 77c69cddb..ab3548713 100755
>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>> if (@vpns || %ipsecgraphs) {
>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>> &Header::closebox();
>>>> }
>>>>
>>>> -- 
>>>> 2.27.0.windows.1
>>>>
>> <rrdimg-css.png>

Michael Tremer April 12, 2021, 9:52 a.m. UTC | #5

Hello,

Sorry for my late response. This is probably a little bit more urgent…

Our Apache configuration is here:

  https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD

And it does not have any aggressive caching enabled.

The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.

@Peter: Would you be up for rewriting the apache configuration?

Best,
-Michael

> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
> 
> Hi,
> 
> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
> 
> I'll change the CSS and submit a patch soon!
> 
> Leo
> 
> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>> Hello,
>> 
>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>> 
>> Apart from that it works.
>> 
>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>> 
>> -Michael
>> 
>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>> 
>>> Hello Michael,
>>> 
>>> No, of course not, that looks terrible!
>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>> 
>>> Best regards,
>>> Leo
>>> 
>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>> Hello,
>>>> 
>>>> Is this meant to look like this?
>>>> 
>>>> 
>>>> 
>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>> 
>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>> a modern div container instead.
>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>> 
>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>> 
>>>>> Add cache control HTTP header to image output.
>>>>> 
>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>> ---
>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>> 
>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>> index beddff032..cf4a30de3 100644
>>>>> --- a/config/cfgroot/graphs.pl
>>>>> +++ b/config/cfgroot/graphs.pl
>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>> 
>>>>> use strict;
>>>>> use RRDs;
>>>>> +use experimental 'smartmatch';
>>>>> 
>>>>> require '/var/ipfire/general-functions.pl';
>>>>> require "${General::swroot}/lang.pl";
>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>> 
>>>>> # Generate a nice box for selection of time range in graphs
>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>> -# the graph will be handled inside the iframe
>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>> +# the graph will be handled by javascript
>>>>> # 0 is the cgi refering to
>>>>> # 1 is the graph name
>>>>> -# 2 is the time range for the graph
>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>> +# 2 is the time range for the graph (optional)
>>>>> 
>>>>> sub makegraphbox {
>>>>> -print "<center>";
>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>> -print " - ";
>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>> -print " - ";
>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>> -print " - ";
>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>> -print " - ";
>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>> -print "<br></center>";
>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>> +my ($origin, $name, $default_range) = @_;
>>>>> +
>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>> +
>>>>> +print <<END;
>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>> +<ul>
>>>>> +END
>>>>> +
>>>>> +# Print range select buttons
>>>>> +foreach my $range (@time_ranges) {
>>>>> +print <<END;
>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>> +END
>>>>> +}
>>>>> +
>>>>> +print <<END;
>>>>> +</ul>
>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>> +</div>
>>>>> +END
>>>>> }
>>>>> 
>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>> "LINE1:load1".$color{"color18"},
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> sub updatevpngraph {
>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> sub updatevpnn2ngraph {
>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> sub updatewirelessgraph {
>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>> );
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> 
>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>> }
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>> 
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> 
>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>> RRDs::graph (@command);
>>>>> $ERROR = RRDs::error;
>>>>> 
>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>> }
>>>>> 
>>>>> sub updateconntrackgraph {
>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>> RRDs::graph(@command);
>>>>> $ERROR = RRDs::error;
>>>>> 
>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>> }
>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>> &Header::openbigbox('100%', 'left');
>>>>> 
>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>> &Header::closebox();
>>>>> 
>>>>> # Check for hardware support.
>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>> index 77c69cddb..ab3548713 100755
>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>> if (@vpns || %ipsecgraphs) {
>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>> &Header::closebox();
>>>>> }
>>>>> 
>>>>> -- 
>>>>> 2.27.0.windows.1
>>>>> 
>>> <rrdimg-css.png>

Peter Müller April 12, 2021, 9:06 p.m. UTC | #6

Good evening Michael,
good evening Leo,

> @Peter: Would you be up for rewriting the apache configuration?

voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941

This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
obsolete meanwhile.

Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
minutes to execute...

Thanks, and best regards,
Peter Müller


> Hello,
> 
> Sorry for my late response. This is probably a little bit more urgent…
> 
> Our Apache configuration is here:
> 
>   https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
> 
> And it does not have any aggressive caching enabled.
> 
> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
> 
> @Peter: Would you be up for rewriting the apache configuration?
> 
> Best,
> -Michael
> 
>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>
>> Hi,
>>
>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>
>> I'll change the CSS and submit a patch soon!
>>
>> Leo
>>
>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>> Hello,
>>>
>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>
>>> Apart from that it works.
>>>
>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>
>>> -Michael
>>>
>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>
>>>> Hello Michael,
>>>>
>>>> No, of course not, that looks terrible!
>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>
>>>> Best regards,
>>>> Leo
>>>>
>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>> Hello,
>>>>>
>>>>> Is this meant to look like this?
>>>>>
>>>>>
>>>>>
>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>
>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>> a modern div container instead.
>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>
>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>
>>>>>> Add cache control HTTP header to image output.
>>>>>>
>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>> ---
>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>
>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>> index beddff032..cf4a30de3 100644
>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>
>>>>>> use strict;
>>>>>> use RRDs;
>>>>>> +use experimental 'smartmatch';
>>>>>>
>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>> require "${General::swroot}/lang.pl";
>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>
>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>> -# the graph will be handled inside the iframe
>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>> +# the graph will be handled by javascript
>>>>>> # 0 is the cgi refering to
>>>>>> # 1 is the graph name
>>>>>> -# 2 is the time range for the graph
>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>
>>>>>> sub makegraphbox {
>>>>>> -print "<center>";
>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>> -print " - ";
>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>> -print " - ";
>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>> -print " - ";
>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>> -print " - ";
>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>> -print "<br></center>";
>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>> +
>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>> +
>>>>>> +print <<END;
>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>> +<ul>
>>>>>> +END
>>>>>> +
>>>>>> +# Print range select buttons
>>>>>> +foreach my $range (@time_ranges) {
>>>>>> +print <<END;
>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>> +END
>>>>>> +}
>>>>>> +
>>>>>> +print <<END;
>>>>>> +</ul>
>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>> +</div>
>>>>>> +END
>>>>>> }
>>>>>>
>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>> "LINE1:load1".$color{"color18"},
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> sub updatevpngraph {
>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> sub updatevpnn2ngraph {
>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> sub updatewirelessgraph {
>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>> );
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>>
>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>> }
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>>
>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>> RRDs::graph (@command);
>>>>>> $ERROR = RRDs::error;
>>>>>>
>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>> }
>>>>>>
>>>>>> sub updateconntrackgraph {
>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>> RRDs::graph(@command);
>>>>>> $ERROR = RRDs::error;
>>>>>>
>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>> }
>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>
>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>> &Header::closebox();
>>>>>>
>>>>>> # Check for hardware support.
>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>> index 77c69cddb..ab3548713 100755
>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>> &Header::closebox();
>>>>>> }
>>>>>>
>>>>>> -- 
>>>>>> 2.27.0.windows.1
>>>>>>
>>>> <rrdimg-css.png>
>

Leo-Andres Hofmann April 12, 2021, 9:55 p.m. UTC | #7

Hi Peter,

thank you for taking care of that! I didn't expect that my idea to modernise the graphs would cause so much work...
But I am glad that we were able to find and improve all these things.

Best regards,
Leo

Am 12.04.2021 um 23:06 schrieb Peter Müller:
> Good evening Michael,
> good evening Leo,
>
>> @Peter: Would you be up for rewriting the apache configuration?
> voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941
>
> This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
> penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
> can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
> obsolete meanwhile.
>
> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
> minutes to execute...
>
> Thanks, and best regards,
> Peter Müller
>
>
>> Hello,
>>
>> Sorry for my late response. This is probably a little bit more urgent…
>>
>> Our Apache configuration is here:
>>
>>    https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
>>
>> And it does not have any aggressive caching enabled.
>>
>> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
>>
>> @Peter: Would you be up for rewriting the apache configuration?
>>
>> Best,
>> -Michael
>>
>>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>
>>> Hi,
>>>
>>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>>
>>> I'll change the CSS and submit a patch soon!
>>>
>>> Leo
>>>
>>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>>> Hello,
>>>>
>>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>>
>>>> Apart from that it works.
>>>>
>>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>>
>>>> -Michael
>>>>
>>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>>
>>>>> Hello Michael,
>>>>>
>>>>> No, of course not, that looks terrible!
>>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>>
>>>>> Best regards,
>>>>> Leo
>>>>>
>>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>>> Hello,
>>>>>>
>>>>>> Is this meant to look like this?
>>>>>>
>>>>>>
>>>>>>
>>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>>
>>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>>> a modern div container instead.
>>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>>
>>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>>
>>>>>>> Add cache control HTTP header to image output.
>>>>>>>
>>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>>> ---
>>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>>
>>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>>> index beddff032..cf4a30de3 100644
>>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>>
>>>>>>> use strict;
>>>>>>> use RRDs;
>>>>>>> +use experimental 'smartmatch';
>>>>>>>
>>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>>> require "${General::swroot}/lang.pl";
>>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>>
>>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>>> -# the graph will be handled inside the iframe
>>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>>> +# the graph will be handled by javascript
>>>>>>> # 0 is the cgi refering to
>>>>>>> # 1 is the graph name
>>>>>>> -# 2 is the time range for the graph
>>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>>
>>>>>>> sub makegraphbox {
>>>>>>> -print "<center>";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>>> -print "<br></center>";
>>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>>> +
>>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>>> +
>>>>>>> +print <<END;
>>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>>> +<ul>
>>>>>>> +END
>>>>>>> +
>>>>>>> +# Print range select buttons
>>>>>>> +foreach my $range (@time_ranges) {
>>>>>>> +print <<END;
>>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>>> +END
>>>>>>> +}
>>>>>>> +
>>>>>>> +print <<END;
>>>>>>> +</ul>
>>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>>> +</div>
>>>>>>> +END
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>>> "LINE1:load1".$color{"color18"},
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> sub updatevpngraph {
>>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> sub updatevpnn2ngraph {
>>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> sub updatewirelessgraph {
>>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>>
>>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>>> }
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>>
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>>
>>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>>
>>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>>
>>>>>>> sub updateconntrackgraph {
>>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>>> RRDs::graph(@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>>
>>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>> }
>>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>>
>>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>>> &Header::closebox();
>>>>>>>
>>>>>>> # Check for hardware support.
>>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>>> index 77c69cddb..ab3548713 100755
>>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>>> &Header::closebox();
>>>>>>> }
>>>>>>>
>>>>>>> -- 
>>>>>>> 2.27.0.windows.1
>>>>>>>
>>>>> <rrdimg-css.png>

Jon Murphy April 12, 2021, 10:33 p.m. UTC | #8

> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
> minutes to execute...

What about when running openssl to generate a new key?  That one times out for me.

I believe its purpose is to generate as many periods as possible.   ;-)

> On Apr 12, 2021, at 4:06 PM, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Good evening Michael,
> good evening Leo,
> 
>> @Peter: Would you be up for rewriting the apache configuration?
> 
> voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941
> 
> This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
> penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
> can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
> obsolete meanwhile.
> 
> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
> minutes to execute...
> 
> Thanks, and best regards,
> Peter Müller
> 
> 
>> Hello,
>> 
>> Sorry for my late response. This is probably a little bit more urgent…
>> 
>> Our Apache configuration is here:
>> 
>> https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
>> 
>> And it does not have any aggressive caching enabled.
>> 
>> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
>> 
>> @Peter: Would you be up for rewriting the apache configuration?
>> 
>> Best,
>> -Michael
>> 
>>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>> 
>>> Hi,
>>> 
>>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>> 
>>> I'll change the CSS and submit a patch soon!
>>> 
>>> Leo
>>> 
>>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>>> Hello,
>>>> 
>>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>> 
>>>> Apart from that it works.
>>>> 
>>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>> 
>>>> -Michael
>>>> 
>>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>> 
>>>>> Hello Michael,
>>>>> 
>>>>> No, of course not, that looks terrible!
>>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>> 
>>>>> Best regards,
>>>>> Leo
>>>>> 
>>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>>> Hello,
>>>>>> 
>>>>>> Is this meant to look like this?
>>>>>> 
>>>>>> 
>>>>>> 
>>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>> 
>>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>>> a modern div container instead.
>>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>> 
>>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>> 
>>>>>>> Add cache control HTTP header to image output.
>>>>>>> 
>>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>>> ---
>>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>> 
>>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>>> index beddff032..cf4a30de3 100644
>>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>> 
>>>>>>> use strict;
>>>>>>> use RRDs;
>>>>>>> +use experimental 'smartmatch';
>>>>>>> 
>>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>>> require "${General::swroot}/lang.pl";
>>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>> 
>>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>>> -# the graph will be handled inside the iframe
>>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>>> +# the graph will be handled by javascript
>>>>>>> # 0 is the cgi refering to
>>>>>>> # 1 is the graph name
>>>>>>> -# 2 is the time range for the graph
>>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>> 
>>>>>>> sub makegraphbox {
>>>>>>> -print "<center>";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>>> -print " - ";
>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>>> -print "<br></center>";
>>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>>> +
>>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>>> +
>>>>>>> +print <<END;
>>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>>> +<ul>
>>>>>>> +END
>>>>>>> +
>>>>>>> +# Print range select buttons
>>>>>>> +foreach my $range (@time_ranges) {
>>>>>>> +print <<END;
>>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>>> +END
>>>>>>> +}
>>>>>>> +
>>>>>>> +print <<END;
>>>>>>> +</ul>
>>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>>> +</div>
>>>>>>> +END
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>>> "LINE1:load1".$color{"color18"},
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> sub updatevpngraph {
>>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> sub updatevpnn2ngraph {
>>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> sub updatewirelessgraph {
>>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>>> );
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> 
>>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>>> }
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>> 
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> 
>>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>>> RRDs::graph (@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> 
>>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>> }
>>>>>>> 
>>>>>>> sub updateconntrackgraph {
>>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>>> RRDs::graph(@command);
>>>>>>> $ERROR = RRDs::error;
>>>>>>> 
>>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>> }
>>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>> 
>>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>>> &Header::closebox();
>>>>>>> 
>>>>>>> # Check for hardware support.
>>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>>> index 77c69cddb..ab3548713 100755
>>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>>> &Header::closebox();
>>>>>>> }
>>>>>>> 
>>>>>>> -- 
>>>>>>> 2.27.0.windows.1
>>>>>>> 
>>>>> <rrdimg-css.png>
>>

Peter Müller April 13, 2021, 3:19 p.m. UTC | #9

Hello Leo,

thanks for your reply.

No worries, I eventually tried to get rid of the ETag header a while ago, but it eventually slipped my mind. :-)

Thanks, and best regards,
Peter Müller


> Hi Peter,
> 
> thank you for taking care of that! I didn't expect that my idea to modernise the graphs would cause so much work...
> But I am glad that we were able to find and improve all these things.
> 
> Best regards,
> Leo
> 
> Am 12.04.2021 um 23:06 schrieb Peter Müller:
>> Good evening Michael,
>> good evening Leo,
>>
>>> @Peter: Would you be up for rewriting the apache configuration?
>> voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941
>>
>> This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
>> penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
>> can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
>> obsolete meanwhile.
>>
>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>> minutes to execute...
>>
>> Thanks, and best regards,
>> Peter Müller
>>
>>
>>> Hello,
>>>
>>> Sorry for my late response. This is probably a little bit more urgent…
>>>
>>> Our Apache configuration is here:
>>>
>>>    https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
>>>
>>> And it does not have any aggressive caching enabled.
>>>
>>> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
>>>
>>> @Peter: Would you be up for rewriting the apache configuration?
>>>
>>> Best,
>>> -Michael
>>>
>>>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>
>>>> Hi,
>>>>
>>>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>>>
>>>> I'll change the CSS and submit a patch soon!
>>>>
>>>> Leo
>>>>
>>>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>>>> Hello,
>>>>>
>>>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>>>
>>>>> Apart from that it works.
>>>>>
>>>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>>>
>>>>> -Michael
>>>>>
>>>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>>>
>>>>>> Hello Michael,
>>>>>>
>>>>>> No, of course not, that looks terrible!
>>>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>>>
>>>>>> Best regards,
>>>>>> Leo
>>>>>>
>>>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>>>> Hello,
>>>>>>>
>>>>>>> Is this meant to look like this?
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>>>
>>>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>>>> a modern div container instead.
>>>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>>>
>>>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>>>
>>>>>>>> Add cache control HTTP header to image output.
>>>>>>>>
>>>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>>>> ---
>>>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>>>> index beddff032..cf4a30de3 100644
>>>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>>>
>>>>>>>> use strict;
>>>>>>>> use RRDs;
>>>>>>>> +use experimental 'smartmatch';
>>>>>>>>
>>>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>>>> require "${General::swroot}/lang.pl";
>>>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>>>
>>>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>>>> -# the graph will be handled inside the iframe
>>>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>>>> +# the graph will be handled by javascript
>>>>>>>> # 0 is the cgi refering to
>>>>>>>> # 1 is the graph name
>>>>>>>> -# 2 is the time range for the graph
>>>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>>>
>>>>>>>> sub makegraphbox {
>>>>>>>> -print "<center>";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>>>> -print "<br></center>";
>>>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>>>> +
>>>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>>>> +
>>>>>>>> +print <<END;
>>>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>>>> +<ul>
>>>>>>>> +END
>>>>>>>> +
>>>>>>>> +# Print range select buttons
>>>>>>>> +foreach my $range (@time_ranges) {
>>>>>>>> +print <<END;
>>>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>>>> +END
>>>>>>>> +}
>>>>>>>> +
>>>>>>>> +print <<END;
>>>>>>>> +</ul>
>>>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>>>> +</div>
>>>>>>>> +END
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>>>> "LINE1:load1".$color{"color18"},
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updatevpngraph {
>>>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updatevpnn2ngraph {
>>>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updatewirelessgraph {
>>>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>>
>>>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>>>> }
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>>
>>>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>
>>>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updateconntrackgraph {
>>>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>>>> RRDs::graph(@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>
>>>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>> }
>>>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>>>
>>>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>>>> &Header::closebox();
>>>>>>>>
>>>>>>>> # Check for hardware support.
>>>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>> index 77c69cddb..ab3548713 100755
>>>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>>>> &Header::closebox();
>>>>>>>> }
>>>>>>>>
>>>>>>>> -- 
>>>>>>>> 2.27.0.windows.1
>>>>>>>>
>>>>>> <rrdimg-css.png>

Peter Müller April 13, 2021, 3:24 p.m. UTC | #10

Hello Jon,

thanks for your reply.

Indeed, generating key files for OpenVPN or IPsec - and, worse, DH parameters for OpenVPN - was something
I did not have had in mind yesterday. These can take ages indeed, especially on slower hardware. As far as
I am aware, we are not there yet when it comes to ECC cryptography for both VPN subsystems.

In an ideal world, Apache would support two distinct types of timeouts: One for network interaction to the
client, where 60 seconds would be absolutely satisfying. The other one would be for server side applications
such as CGIs which may take longer.

At the moment, I would estimate a relatively small amount of connections to be sufficient to launch a DoS
against Apache as it comes in IPFire. Ultimately, tuning won't help here, if the offender is physically
present in the GREEN or BLUE network. So, in the end, my timeout thought probably does not really matter... :-)

Thanks, and best regards,
Peter Müller


>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>> minutes to execute...
> 
> What about when running openssl to generate a new key?  That one times out for me.
> 
> I believe its purpose is to generate as many periods as possible.   ;-)
> 
>> On Apr 12, 2021, at 4:06 PM, Peter Müller <peter.mueller@ipfire.org> wrote:
>>
>> Good evening Michael,
>> good evening Leo,
>>
>>> @Peter: Would you be up for rewriting the apache configuration?
>>
>> voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941
>>
>> This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
>> penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
>> can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
>> obsolete meanwhile.
>>
>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>> minutes to execute...
>>
>> Thanks, and best regards,
>> Peter Müller
>>
>>
>>> Hello,
>>>
>>> Sorry for my late response. This is probably a little bit more urgent…
>>>
>>> Our Apache configuration is here:
>>>
>>> https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
>>>
>>> And it does not have any aggressive caching enabled.
>>>
>>> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
>>>
>>> @Peter: Would you be up for rewriting the apache configuration?
>>>
>>> Best,
>>> -Michael
>>>
>>>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>
>>>> Hi,
>>>>
>>>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>>>
>>>> I'll change the CSS and submit a patch soon!
>>>>
>>>> Leo
>>>>
>>>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>>>> Hello,
>>>>>
>>>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>>>
>>>>> Apart from that it works.
>>>>>
>>>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>>>
>>>>> -Michael
>>>>>
>>>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>>>
>>>>>> Hello Michael,
>>>>>>
>>>>>> No, of course not, that looks terrible!
>>>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>>>
>>>>>> Best regards,
>>>>>> Leo
>>>>>>
>>>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>>>> Hello,
>>>>>>>
>>>>>>> Is this meant to look like this?
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>>>
>>>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>>>> a modern div container instead.
>>>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>>>
>>>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>>>
>>>>>>>> Add cache control HTTP header to image output.
>>>>>>>>
>>>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>>>> ---
>>>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>>>
>>>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>>>> index beddff032..cf4a30de3 100644
>>>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>>>
>>>>>>>> use strict;
>>>>>>>> use RRDs;
>>>>>>>> +use experimental 'smartmatch';
>>>>>>>>
>>>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>>>> require "${General::swroot}/lang.pl";
>>>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>>>
>>>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>>>> -# the graph will be handled inside the iframe
>>>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>>>> +# the graph will be handled by javascript
>>>>>>>> # 0 is the cgi refering to
>>>>>>>> # 1 is the graph name
>>>>>>>> -# 2 is the time range for the graph
>>>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>>>
>>>>>>>> sub makegraphbox {
>>>>>>>> -print "<center>";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>>>> -print " - ";
>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>>>> -print "<br></center>";
>>>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>>>> +
>>>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>>>> +
>>>>>>>> +print <<END;
>>>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>>>> +<ul>
>>>>>>>> +END
>>>>>>>> +
>>>>>>>> +# Print range select buttons
>>>>>>>> +foreach my $range (@time_ranges) {
>>>>>>>> +print <<END;
>>>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>>>> +END
>>>>>>>> +}
>>>>>>>> +
>>>>>>>> +print <<END;
>>>>>>>> +</ul>
>>>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>>>> +</div>
>>>>>>>> +END
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>>>> "LINE1:load1".$color{"color18"},
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updatevpngraph {
>>>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updatevpnn2ngraph {
>>>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updatewirelessgraph {
>>>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>>>> );
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>>
>>>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>>>> }
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>>>
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>>
>>>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>>>> RRDs::graph (@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>
>>>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>> }
>>>>>>>>
>>>>>>>> sub updateconntrackgraph {
>>>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>>>> RRDs::graph(@command);
>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>
>>>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>> }
>>>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>>>
>>>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>>>> &Header::closebox();
>>>>>>>>
>>>>>>>> # Check for hardware support.
>>>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>> index 77c69cddb..ab3548713 100755
>>>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>>>> &Header::closebox();
>>>>>>>> }
>>>>>>>>
>>>>>>>> -- 
>>>>>>>> 2.27.0.windows.1
>>>>>>>>
>>>>>> <rrdimg-css.png>
>>>
>

Tom Rymes April 13, 2021, 3:47 p.m. UTC | #11

Would it be possible to dump the key-generation task into the background in those instances and have the WUI report on the status? That way, the timeout does not have to be long enough for the entire process, just for however long it takes to submit the task for processing.

Kind of like Pakfire does, or even just submit the changes and have the WUI show that the process is still running if you, for example, navigate to the IPSec page, where the keys are displayed.

Tom

> On Apr 13, 2021, at 11:24 AM, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Hello Jon,
> 
> thanks for your reply.
> 
> Indeed, generating key files for OpenVPN or IPsec - and, worse, DH parameters for OpenVPN - was something
> I did not have had in mind yesterday. These can take ages indeed, especially on slower hardware. As far as
> I am aware, we are not there yet when it comes to ECC cryptography for both VPN subsystems.
> 
> In an ideal world, Apache would support two distinct types of timeouts: One for network interaction to the
> client, where 60 seconds would be absolutely satisfying. The other one would be for server side applications
> such as CGIs which may take longer.
> 
> At the moment, I would estimate a relatively small amount of connections to be sufficient to launch a DoS
> against Apache as it comes in IPFire. Ultimately, tuning won't help here, if the offender is physically
> present in the GREEN or BLUE network. So, in the end, my timeout thought probably does not really matter... :-)
> 
> Thanks, and best regards,
> Peter Müller
> 
> 
>>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>>> minutes to execute...
>> 
>> What about when running openssl to generate a new key?  That one times out for me.
>> 
>> I believe its purpose is to generate as many periods as possible.   ;-)
>> 
>>>> On Apr 12, 2021, at 4:06 PM, Peter Müller <peter.mueller@ipfire.org> wrote:
>>> 
>>> Good evening Michael,
>>> good evening Leo,
>>> 
>>>> @Peter: Would you be up for rewriting the apache configuration?
>>> 
>>> voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941
>>> 
>>> This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
>>> penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
>>> can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
>>> obsolete meanwhile.
>>> 
>>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>>> minutes to execute...
>>> 
>>> Thanks, and best regards,
>>> Peter Müller
>>> 
>>> 
>>>> Hello,
>>>> 
>>>> Sorry for my late response. This is probably a little bit more urgent…
>>>> 
>>>> Our Apache configuration is here:
>>>> 
>>>> https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
>>>> 
>>>> And it does not have any aggressive caching enabled.
>>>> 
>>>> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
>>>> 
>>>> @Peter: Would you be up for rewriting the apache configuration?
>>>> 
>>>> Best,
>>>> -Michael
>>>> 
>>>>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>> 
>>>>> Hi,
>>>>> 
>>>>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>>>> 
>>>>> I'll change the CSS and submit a patch soon!
>>>>> 
>>>>> Leo
>>>>> 
>>>>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>>>>> Hello,
>>>>>> 
>>>>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>>>> 
>>>>>> Apart from that it works.
>>>>>> 
>>>>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>>>> 
>>>>>> -Michael
>>>>>> 
>>>>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>>>> 
>>>>>>> Hello Michael,
>>>>>>> 
>>>>>>> No, of course not, that looks terrible!
>>>>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>>>> 
>>>>>>> Best regards,
>>>>>>> Leo
>>>>>>> 
>>>>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>>>>> Hello,
>>>>>>>> 
>>>>>>>> Is this meant to look like this?
>>>>>>>> 
>>>>>>>> 
>>>>>>>> 
>>>>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>>>> 
>>>>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>>>>> a modern div container instead.
>>>>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>>>> 
>>>>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>>>> 
>>>>>>>>> Add cache control HTTP header to image output.
>>>>>>>>> 
>>>>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>>>>> ---
>>>>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>>>> 
>>>>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>>>>> index beddff032..cf4a30de3 100644
>>>>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>>>> 
>>>>>>>>> use strict;
>>>>>>>>> use RRDs;
>>>>>>>>> +use experimental 'smartmatch';
>>>>>>>>> 
>>>>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>>>>> require "${General::swroot}/lang.pl";
>>>>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>>>> 
>>>>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>>>>> -# the graph will be handled inside the iframe
>>>>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>>>>> +# the graph will be handled by javascript
>>>>>>>>> # 0 is the cgi refering to
>>>>>>>>> # 1 is the graph name
>>>>>>>>> -# 2 is the time range for the graph
>>>>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>>>> 
>>>>>>>>> sub makegraphbox {
>>>>>>>>> -print "<center>";
>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>>>>> -print " - ";
>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>>>>> -print " - ";
>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>>>>> -print " - ";
>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>>>>> -print " - ";
>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>>>>> -print "<br></center>";
>>>>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>>>>> +
>>>>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>>>>> +
>>>>>>>>> +print <<END;
>>>>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>>>>> +<ul>
>>>>>>>>> +END
>>>>>>>>> +
>>>>>>>>> +# Print range select buttons
>>>>>>>>> +foreach my $range (@time_ranges) {
>>>>>>>>> +print <<END;
>>>>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>>>>> +END
>>>>>>>>> +}
>>>>>>>>> +
>>>>>>>>> +print <<END;
>>>>>>>>> +</ul>
>>>>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>>>>> +</div>
>>>>>>>>> +END
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>>>>> "LINE1:load1".$color{"color18"},
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> sub updatevpngraph {
>>>>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> sub updatevpnn2ngraph {
>>>>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> sub updatewirelessgraph {
>>>>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>>>>> );
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> 
>>>>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>>>>> }
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>>>> 
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> 
>>>>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>>>>> RRDs::graph (@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> 
>>>>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> sub updateconntrackgraph {
>>>>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>>>>> RRDs::graph(@command);
>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>> 
>>>>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>>> }
>>>>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>>>> 
>>>>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>>>>> &Header::closebox();
>>>>>>>>> 
>>>>>>>>> # Check for hardware support.
>>>>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>>> index 77c69cddb..ab3548713 100755
>>>>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>>>>> &Header::closebox();
>>>>>>>>> }
>>>>>>>>> 
>>>>>>>>> -- 
>>>>>>>>> 2.27.0.windows.1
>>>>>>>>> 
>>>>>>> <rrdimg-css.png>
>>>> 
>>

Michael Tremer April 15, 2021, 11:28 a.m. UTC | #12

Hello,

> On 13 Apr 2021, at 16:47, Tom Rymes <tom@rymes.net> wrote:
> 
> Would it be possible to dump the key-generation task into the background in those instances and have the WUI report on the status? That way, the timeout does not have to be long enough for the entire process, just for however long it takes to submit the task for processing.

This is quite difficult to do because the CGI script would lose control of the forked process.

We no longer know the PID at the next call of the CGI script unless we write that to some temporary file system and have a wrapper script run that removed the temporary data after the process is done. It would come with a lot of overhead.

But I generally agree that we need a solution. Keys are getting longer and longer and a reasonable RSA key takes a long time to generate. Especially with some people using SBCs, there is no chance to generate a cryptographically secure key in reasonable time.

> Kind of like Pakfire does, or even just submit the changes and have the WUI show that the process is still running if you, for example, navigate to the IPSec page, where the keys are displayed.

Pakfire is just launched in the background and we hope for the best. In the meantime we show the log. Not ideal, but the best we can do :)

-Michael

> Tom
> 
>> On Apr 13, 2021, at 11:24 AM, Peter Müller <peter.mueller@ipfire.org> wrote:
>> 
>> Hello Jon,
>> 
>> thanks for your reply.
>> 
>> Indeed, generating key files for OpenVPN or IPsec - and, worse, DH parameters for OpenVPN - was something
>> I did not have had in mind yesterday. These can take ages indeed, especially on slower hardware. As far as
>> I am aware, we are not there yet when it comes to ECC cryptography for both VPN subsystems.
>> 
>> In an ideal world, Apache would support two distinct types of timeouts: One for network interaction to the
>> client, where 60 seconds would be absolutely satisfying. The other one would be for server side applications
>> such as CGIs which may take longer.
>> 
>> At the moment, I would estimate a relatively small amount of connections to be sufficient to launch a DoS
>> against Apache as it comes in IPFire. Ultimately, tuning won't help here, if the offender is physically
>> present in the GREEN or BLUE network. So, in the end, my timeout thought probably does not really matter... :-)
>> 
>> Thanks, and best regards,
>> Peter Müller
>> 
>> 
>>>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>>>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>>>> minutes to execute...
>>> 
>>> What about when running openssl to generate a new key?  That one times out for me.
>>> 
>>> I believe its purpose is to generate as many periods as possible.   ;-)
>>> 
>>>>> On Apr 12, 2021, at 4:06 PM, Peter Müller <peter.mueller@ipfire.org> wrote:
>>>> 
>>>> Good evening Michael,
>>>> good evening Leo,
>>>> 
>>>>> @Peter: Would you be up for rewriting the apache configuration?
>>>> 
>>>> voila: https://patchwork.ipfire.org/project/ipfire/list/?series=1941
>>>> 
>>>> This configuration has been tested and audited using NSE, Nikto, and a bunch of other wonderful
>>>> penetration testing tools. To my surprise, HTTP TRACE is mandatory in HTTP 1.1 nowadays, and clients
>>>> can expect it to be enabled - I used to read the advice to keep it disabled, but that seems to be
>>>> obsolete meanwhile.
>>>> 
>>>> Is there any particular reason why we have a extremely long (5 minutes) timeout set? The Apache
>>>> documentation recommends 60 seconds, and I cannot think of an application on IPFire taking five
>>>> minutes to execute...
>>>> 
>>>> Thanks, and best regards,
>>>> Peter Müller
>>>> 
>>>> 
>>>>> Hello,
>>>>> 
>>>>> Sorry for my late response. This is probably a little bit more urgent…
>>>>> 
>>>>> Our Apache configuration is here:
>>>>> 
>>>>> https://git.ipfire.org/?p=ipfire-2.x.git;a=tree;f=config/httpd;hb=HEAD
>>>>> 
>>>>> And it does not have any aggressive caching enabled.
>>>>> 
>>>>> The ETag header is precisely there for validating content without transferring it again. We probably should overhaul the entire apache configuration and come up with something that guarantees that we are using modern features of the browser and Apache. Currently the configuration is full of directives for MS Internet Explorer and Java-based browsers. We wouldn’t support any of them - not even sure if they exist any more.
>>>>> 
>>>>> @Peter: Would you be up for rewriting the apache configuration?
>>>>> 
>>>>> Best,
>>>>> -Michael
>>>>> 
>>>>>> On 9 Apr 2021, at 18:45, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>>> 
>>>>>> Hi,
>>>>>> 
>>>>>> I found that disabling the HTTP ETag header solved the problem for me. Are there any Cache-Control headers configured for these static files?
>>>>>> 
>>>>>> I'll change the CSS and submit a patch soon!
>>>>>> 
>>>>>> Leo
>>>>>> 
>>>>>> Am 09.04.2021 um 12:57 schrieb Michael Tremer:
>>>>>>> Hello,
>>>>>>> 
>>>>>>> That was it. For some reason my browser did not validate the CSS file and used a cached version. This is probably something we should look into.
>>>>>>> 
>>>>>>> Apart from that it works.
>>>>>>> 
>>>>>>> Can we maybe change the background colour to something less yellow when a button is selected. Maybe just underlining the word is enough?
>>>>>>> 
>>>>>>> -Michael
>>>>>>> 
>>>>>>>> On 7 Apr 2021, at 23:18, Leo Hofmann <hofmann@leo-andres.de> wrote:
>>>>>>>> 
>>>>>>>> Hello Michael,
>>>>>>>> 
>>>>>>>> No, of course not, that looks terrible!
>>>>>>>> Could you please check/CTRL+F5 the CSS file /themes/ipfire/include/css/style.css? Patch 2 of this series should have added ~30 lines at the end.
>>>>>>>> Please have a look at the attached screenshot, there you can see how it is supposed to be. I have tested this with Firefox and Chrome.
>>>>>>>> 
>>>>>>>> Best regards,
>>>>>>>> Leo
>>>>>>>> 
>>>>>>>> Am 07.04.2021 um 23:31 schrieb Michael Tremer:
>>>>>>>>> Hello,
>>>>>>>>> 
>>>>>>>>> Is this meant to look like this?
>>>>>>>>> 
>>>>>>>>> 
>>>>>>>>> 
>>>>>>>>>> On 1 Apr 2021, at 14:35, Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>> wrote:
>>>>>>>>>> 
>>>>>>>>>> "makegraphbox" is modified to remove the old iframe method and output
>>>>>>>>>> a modern div container instead.
>>>>>>>>>> Graph errors are now returned, to be displayed by getrrdimage.cgi.
>>>>>>>>>> 
>>>>>>>>>> entropy.cgi and netovpnsrv.cgi are modified to ensure compatibility.
>>>>>>>>>> 
>>>>>>>>>> Add cache control HTTP header to image output.
>>>>>>>>>> 
>>>>>>>>>> Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de <mailto:hofmann@leo-andres.de>>
>>>>>>>>>> ---
>>>>>>>>>> config/cfgroot/graphs.pl    | 86 +++++++++++++++++++++----------------
>>>>>>>>>> html/cgi-bin/entropy.cgi    |  2 +-
>>>>>>>>>> html/cgi-bin/netovpnsrv.cgi |  2 +-
>>>>>>>>>> 3 files changed, 50 insertions(+), 40 deletions(-)
>>>>>>>>>> 
>>>>>>>>>> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
>>>>>>>>>> index beddff032..cf4a30de3 100644
>>>>>>>>>> --- a/config/cfgroot/graphs.pl
>>>>>>>>>> +++ b/config/cfgroot/graphs.pl
>>>>>>>>>> @@ -24,6 +24,7 @@ package Graphs;
>>>>>>>>>> 
>>>>>>>>>> use strict;
>>>>>>>>>> use RRDs;
>>>>>>>>>> +use experimental 'smartmatch';
>>>>>>>>>> 
>>>>>>>>>> require '/var/ipfire/general-functions.pl';
>>>>>>>>>> require "${General::swroot}/lang.pl";
>>>>>>>>>> @@ -99,26 +100,35 @@ foreach (@sensorsdir){
>>>>>>>>>> &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
>>>>>>>>>> 
>>>>>>>>>> # Generate a nice box for selection of time range in graphs
>>>>>>>>>> -# this will generate a nice iframe for the cgi every klick for
>>>>>>>>>> -# the graph will be handled inside the iframe
>>>>>>>>>> +# this will generate a nice div box for the cgi every klick for
>>>>>>>>>> +# the graph will be handled by javascript
>>>>>>>>>> # 0 is the cgi refering to
>>>>>>>>>> # 1 is the graph name
>>>>>>>>>> -# 2 is the time range for the graph
>>>>>>>>>> -# 3 if given is the height of the iframe default if nothing is given
>>>>>>>>>> +# 2 is the time range for the graph (optional)
>>>>>>>>>> 
>>>>>>>>>> sub makegraphbox {
>>>>>>>>>> -print "<center>";
>>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
>>>>>>>>>> -print " - ";
>>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
>>>>>>>>>> -print " - ";
>>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
>>>>>>>>>> -print " - ";
>>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
>>>>>>>>>> -print " - ";
>>>>>>>>>> -print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
>>>>>>>>>> -print "<br></center>";
>>>>>>>>>> -print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
>>>>>>>>>> +my ($origin, $name, $default_range) = @_;
>>>>>>>>>> +
>>>>>>>>>> +# Optional time range: Default to "day" unless otherwise specified
>>>>>>>>>> +$default_range = "day" unless ($default_range ~~ @time_ranges);
>>>>>>>>>> +
>>>>>>>>>> +print <<END;
>>>>>>>>>> +<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
>>>>>>>>>> +<ul>
>>>>>>>>>> +END
>>>>>>>>>> +
>>>>>>>>>> +# Print range select buttons
>>>>>>>>>> +foreach my $range (@time_ranges) {
>>>>>>>>>> +print <<END;
>>>>>>>>>> +<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
>>>>>>>>>> +END
>>>>>>>>>> +}
>>>>>>>>>> +
>>>>>>>>>> +print <<END;
>>>>>>>>>> +</ul>
>>>>>>>>>> +<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
>>>>>>>>>> +</div>
>>>>>>>>>> +END
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the CPU Graph for the current period of time for values given by
>>>>>>>>>> @@ -248,7 +258,7 @@ sub updatecpugraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Load Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -280,7 +290,7 @@ sub updateloadgraph {
>>>>>>>>>> "LINE1:load1".$color{"color18"},
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Memory Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -336,7 +346,7 @@ sub updatememorygraph {
>>>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Swap Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -385,7 +395,7 @@ sub updateswapgraph {
>>>>>>>>>> "GPRINT:freepct:LAST:%3.2lf%%\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Process Cpu Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -432,7 +442,7 @@ sub updateprocessescpugraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Process Memory Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -478,7 +488,7 @@ sub updateprocessesmemorygraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Disk Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -522,7 +532,7 @@ sub updatediskgraph {
>>>>>>>>>> "GPRINT:write:LAST:%8.1lf %sBps\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Interface Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -561,7 +571,7 @@ sub updateifgraph {
>>>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> sub updatevpngraph {
>>>>>>>>>> @@ -598,7 +608,7 @@ sub updatevpngraph {
>>>>>>>>>> "GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> sub updatevpnn2ngraph {
>>>>>>>>>> @@ -661,7 +671,7 @@ sub updatevpnn2ngraph {
>>>>>>>>>> "GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Firewall Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -716,7 +726,7 @@ sub updatefwhitsgraph {
>>>>>>>>>> "GPRINT:portscan:LAST:%8.1lf %sBps\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Line Quality Graph for the current period of time for values given by collecd
>>>>>>>>>> @@ -758,7 +768,7 @@ sub updatepinggraph {
>>>>>>>>>> "GPRINT:roundtrip:LAST:%3.2lf ms\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> sub updatewirelessgraph {
>>>>>>>>>> @@ -793,7 +803,7 @@ sub updatewirelessgraph {
>>>>>>>>>> "GPRINT:power:LAST:%5.1lf %sdBm\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>>> @@ -827,7 +837,7 @@ sub updatehddgraph {
>>>>>>>>>> "GPRINT:temperature:LAST:%3.0lf °C\\j",
>>>>>>>>>> );
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>>> @@ -875,7 +885,7 @@ sub updatehwtempgraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>>> @@ -922,7 +932,7 @@ sub updatehwfangraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
>>>>>>>>>> @@ -969,7 +979,7 @@ sub updatehwvoltgraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> 
>>>>>>>>>> @@ -1051,7 +1061,7 @@ sub updateqosgraph {
>>>>>>>>>> }
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
>>>>>>>>>> @@ -1090,7 +1100,7 @@ sub updatecpufreqgraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> # Generate the Thermal Zone Temp CPU Graph
>>>>>>>>>> @@ -1129,7 +1139,7 @@ sub updatethermaltempgraph {
>>>>>>>>>> 
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> -print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> 
>>>>>>>>>> @@ -1174,7 +1184,7 @@ sub updateentropygraph {
>>>>>>>>>> RRDs::graph (@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> 
>>>>>>>>>> -print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> sub updateconntrackgraph {
>>>>>>>>>> @@ -1202,5 +1212,5 @@ sub updateconntrackgraph {
>>>>>>>>>> RRDs::graph(@command);
>>>>>>>>>> $ERROR = RRDs::error;
>>>>>>>>>> 
>>>>>>>>>> -print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>>>> +return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
>>>>>>>>>> }
>>>>>>>>>> diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
>>>>>>>>>> index d7a9ca5d8..f8045db5a 100644
>>>>>>>>>> --- a/html/cgi-bin/entropy.cgi
>>>>>>>>>> +++ b/html/cgi-bin/entropy.cgi
>>>>>>>>>> @@ -45,7 +45,7 @@ if ( $querry[0] ne~ "") {
>>>>>>>>>> &Header::openbigbox('100%', 'left');
>>>>>>>>>> 
>>>>>>>>>> &Header::openbox('100%', 'center', $Lang::tr{'entropy'});
>>>>>>>>>> -&Graphs::makegraphbox("entropy.cgi", "day");
>>>>>>>>>> +&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
>>>>>>>>>> &Header::closebox();
>>>>>>>>>> 
>>>>>>>>>> # Check for hardware support.
>>>>>>>>>> diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>>>> index 77c69cddb..ab3548713 100755
>>>>>>>>>> --- a/html/cgi-bin/netovpnsrv.cgi
>>>>>>>>>> +++ b/html/cgi-bin/netovpnsrv.cgi
>>>>>>>>>> @@ -75,7 +75,7 @@ if ( $querry[0] ne ""){
>>>>>>>>>> if (@vpns || %ipsecgraphs) {
>>>>>>>>>> foreach my $name (sort keys %ipsecgraphs) {
>>>>>>>>>> &Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
>>>>>>>>>> -&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
>>>>>>>>>> +&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
>>>>>>>>>> &Header::closebox();
>>>>>>>>>> }
>>>>>>>>>> 
>>>>>>>>>> -- 
>>>>>>>>>> 2.27.0.windows.1
>>>>>>>>>> 
>>>>>>>> <rrdimg-css.png>
>>>>> 
>>>

diff mbox series

Patch

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index beddff032..cf4a30de3 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -24,6 +24,7 @@  package Graphs;
 
 use strict;
 use RRDs;
+use experimental 'smartmatch';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -99,26 +100,35 @@  foreach (@sensorsdir){
 &General::readhash("${General::swroot}/sensors/settings", \%sensorsettings);
 
 # Generate a nice box for selection of time range in graphs
-# this will generate a nice iframe for the cgi every klick for
-# the graph will be handled inside the iframe
+# this will generate a nice div box for the cgi every klick for
+# the graph will be handled by javascript
 # 0 is the cgi refering to
 # 1 is the graph name
-# 2 is the time range for the graph
-# 3 if given is the height of the iframe default if nothing is given
+# 2 is the time range for the graph (optional)
 
 sub makegraphbox {
-	print "<center>";
-	print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
-	print " - ";
-	print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
-	print " - ";
-	print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
-	print " - ";
-	print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
-	print " - ";
-	print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
-	print "<br></center>";
-	print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
+	my ($origin, $name, $default_range) = @_;
+	
+	# Optional time range: Default to "day" unless otherwise specified
+	$default_range = "day" unless ($default_range ~~ @time_ranges);
+
+	print <<END;
+<div class="rrdimage" id="rrdimg-$name" data-origin="$origin" data-graph="$name" data-default-range="$default_range">
+	<ul>
+END
+
+	# Print range select buttons
+	foreach my $range (@time_ranges) {
+		print <<END;
+		<li><button data-range="$range" onclick="rrdimage_selectRange(this)">$Lang::tr{$range}</button></li>
+END
+	}
+
+	print <<END;
+	</ul>
+	<img src="/cgi-bin/getrrdimage.cgi?origin=${origin}&graph=${name}&range=${default_range}" alt="$Lang::tr{'graph'} ($name)">
+</div>
+END
 }
 
 # Generate the CPU Graph for the current period of time for values given by
@@ -248,7 +258,7 @@  sub updatecpugraph {
 
 	RRDs::graph (@command);
 	$ERROR = RRDs::error;
-	print "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
+	return "Error in RRD::graph for cpu: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Load Graph for the current period of time for values given by collecd
@@ -280,7 +290,7 @@  sub updateloadgraph {
 		"LINE1:load1".$color{"color18"},
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for load: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Memory Graph for the current period of time for values given by collecd
@@ -336,7 +346,7 @@  sub updatememorygraph {
 		"GPRINT:freepct:LAST:%3.2lf%%\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Swap Graph for the current period of time for values given by collecd
@@ -385,7 +395,7 @@  sub updateswapgraph {
 		"GPRINT:freepct:LAST:%3.2lf%%\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for memory: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Process Cpu Graph for the current period of time for values given by collecd
@@ -432,7 +442,7 @@  sub updateprocessescpugraph {
 
 		RRDs::graph (@command);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for processes: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Process Memory Graph for the current period of time for values given by collecd
@@ -478,7 +488,7 @@  sub updateprocessesmemorygraph {
 
 		RRDs::graph (@command);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for processesmemory: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Disk Graph for the current period of time for values given by collecd
@@ -522,7 +532,7 @@  sub updatediskgraph {
 		"GPRINT:write:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for ".$disk.": ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Interface Graph for the current period of time for values given by collecd
@@ -561,7 +571,7 @@  sub updateifgraph {
 		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
 }
 
 sub updatevpngraph {
@@ -598,7 +608,7 @@  sub updatevpngraph {
 		"GPRINT:outgoing:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
 }
 
 sub updatevpnn2ngraph {
@@ -661,7 +671,7 @@  sub updatevpnn2ngraph {
 		"GPRINT:compression_out:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for ".$interface.": ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Firewall Graph for the current period of time for values given by collecd
@@ -716,7 +726,7 @@  sub updatefwhitsgraph {
 		"GPRINT:portscan:LAST:%8.1lf %sBps\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for firewallhits: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Line Quality Graph for the current period of time for values given by collecd
@@ -758,7 +768,7 @@  sub updatepinggraph {
 		"GPRINT:roundtrip:LAST:%3.2lf ms\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for link quality: ".$ERROR."\n" if $ERROR;
 }
 
 sub updatewirelessgraph {
@@ -793,7 +803,7 @@  sub updatewirelessgraph {
 		"GPRINT:power:LAST:%5.1lf %sdBm\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for wireless: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the HDD Temp Graph for the current period of time for values given by collecd and lm_sensors
@@ -827,7 +837,7 @@  sub updatehddgraph {
 		"GPRINT:temperature:LAST:%3.0lf °C\\j",
 		);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Temp Graph for the current period of time for values given by collecd and lm_sensors
@@ -875,7 +885,7 @@  sub updatehwtempgraph {
 
 		RRDs::graph (@command);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for HDD Temp: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Fan Graph for the current period of time for values given by collecd and lm_sensors
@@ -922,7 +932,7 @@  sub updatehwfangraph {
 
 		RRDs::graph (@command);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for Fan Speed: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Voltage Graph for the current period of time for values given by collecd and lm_sensors
@@ -969,7 +979,7 @@  sub updatehwvoltgraph {
 
 		RRDs::graph (@command);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for Voltage: ".$ERROR."\n" if $ERROR;
 }
 
 
@@ -1051,7 +1061,7 @@  sub updateqosgraph {
 		}
 		RRDs::graph (@command);
 		$ERROR = RRDs::error;
-		print "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
+		return "Error in RRD::graph for qos device ".$qossettings{'DEV'}.": ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the CPU Frequency Graph for the current period of time for values given by collectd an lm_sensors
@@ -1090,7 +1100,7 @@  sub updatecpufreqgraph {
 
 	RRDs::graph (@command);
 	$ERROR = RRDs::error;
-	print "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
+	return "Error in RRD::graph for cpu freq: ".$ERROR."\n" if $ERROR;
 }
 
 # Generate the Thermal Zone Temp CPU Graph
@@ -1129,7 +1139,7 @@  sub updatethermaltempgraph {
 
 	RRDs::graph (@command);
 	$ERROR = RRDs::error;
-	print "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
+	return "Error in RRD::graph for thermal temp: ".$ERROR."\n" if $ERROR;
 }
 
 
@@ -1174,7 +1184,7 @@  sub updateentropygraph {
 	RRDs::graph (@command);
 	$ERROR = RRDs::error;
 
-	print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
+	return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
 }
 
 sub updateconntrackgraph {
@@ -1202,5 +1212,5 @@  sub updateconntrackgraph {
 	RRDs::graph(@command);
 	$ERROR = RRDs::error;
 
-	print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
+	return "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
 }
diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
index d7a9ca5d8..f8045db5a 100644
--- a/html/cgi-bin/entropy.cgi
+++ b/html/cgi-bin/entropy.cgi
@@ -45,7 +45,7 @@  if ( $querry[0] ne~ "") {
 	&Header::openbigbox('100%', 'left');
 
 	&Header::openbox('100%', 'center', $Lang::tr{'entropy'});
-	&Graphs::makegraphbox("entropy.cgi", "day");
+	&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
 	&Header::closebox();
 
 	# Check for hardware support.
diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index 77c69cddb..ab3548713 100755
--- a/html/cgi-bin/netovpnsrv.cgi
+++ b/html/cgi-bin/netovpnsrv.cgi
@@ -75,7 +75,7 @@  if ( $querry[0] ne ""){
 	if (@vpns || %ipsecgraphs) {
 		foreach my $name (sort keys %ipsecgraphs) {
 			&Header::openbox('100%', 'center', "$Lang::tr{'ipsec connection'}: $name");
-			&Graphs::makegraphbox("netovpnsrv.cgi", $ipsecgraphs{$name}, "day");
+			&Graphs::makegraphbox("netovpnsrv.cgi", "ipsec-$ipsecgraphs{$name}", "day");
 			&Header::closebox();
 		}