[PATCH] Drop support for entropy graph

[PATCH] Drop support for entropy graph

[Leo-Andres Hofmann]

[-- Attachment #1: Type: text/plain, Size: 2820 bytes --]

Entropy data isn't collected anymore. See 8000bc0 for reference.

Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
---
 config/cfgroot/graphs.pl     | 28 ----------------------------
 html/cgi-bin/getrrdimage.cgi |  8 ++------
 2 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 3368e5aad..8a6735409 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -1169,34 +1169,6 @@ sub getprocesses {
 	return @processesgraph;
 }
 
-sub updateentropygraph {
-	my $period    = $_[0];
-	my @command = (
-		@GRAPH_ARGS,
-		"-",
-		"--start",
-		"-1".$period,
-		"-r",
-		"--lower-limit","0",
-		"-t ".$Lang::tr{'entropy'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
-		"-v $Lang::tr{'bit'}",
-		"DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE",
-		"LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
-		"VDEF:entrmin=entropy,MINIMUM",
-		"VDEF:entrmax=entropy,MAXIMUM",
-		"VDEF:entravg=entropy,AVERAGE",
-		"GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
-		"GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
-		"GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
-		"--color=BACK".$color{"color21"},
-	);
-
-	RRDs::graph (@command);
-	$ERROR = RRDs::error;
-
-	return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
-}
-
 sub updateconntrackgraph {
 	my $period = $_[0];
 	my @command = (
diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi
index 6ec91cc92..f80f0138f 100644
--- a/html/cgi-bin/getrrdimage.cgi
+++ b/html/cgi-bin/getrrdimage.cgi
@@ -35,7 +35,7 @@ require "${General::swroot}/graphs.pl";
 
 # List of graph origins that getrrdimage.cgi can process directly
 # (unknown origins are forwarded to ensure compatibility)
-my @supported_origins = ("entropy.cgi", "hardwaregraphs.cgi", "media.cgi",
+my @supported_origins = ("hardwaregraphs.cgi", "media.cgi",
 	"memory.cgi", "netexternal.cgi", "netinternal.cgi", "netother.cgi",
 	"netovpnrw.cgi", "netovpnsrv.cgi", "qos.cgi", "services.cgi", "system.cgi");
 
@@ -80,11 +80,7 @@ _start_svg_output();
 # Graphs are first grouped by their origin.
 # This is because some graph categories require special parameter handling.
 my $graphstatus = '';
-if($origin eq "entropy.cgi") {				## entropy.cgi
-	$graphstatus = Graphs::updateentropygraph($range);
-# ------
-
-} elsif($origin eq "hardwaregraphs.cgi") {	## hardwaregraphs.cgi
+if($origin eq "hardwaregraphs.cgi") {		## hardwaregraphs.cgi
 	if($graph eq "hwtemp") {
 		$graphstatus = Graphs::updatehwtempgraph($range);
 	} elsif($graph eq "hwfan") {
-- 
2.37.1.windows.1

Re: [PATCH] Drop support for entropy graph

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 3069 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 13 Mar 2023, at 07:29, Leo-Andres Hofmann <hofmann(a)leo-andres.de> wrote:
> 
> Entropy data isn't collected anymore. See 8000bc0 for reference.
> 
> Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
> ---
> config/cfgroot/graphs.pl     | 28 ----------------------------
> html/cgi-bin/getrrdimage.cgi |  8 ++------
> 2 files changed, 2 insertions(+), 34 deletions(-)
> 
> diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
> index 3368e5aad..8a6735409 100644
> --- a/config/cfgroot/graphs.pl
> +++ b/config/cfgroot/graphs.pl
> @@ -1169,34 +1169,6 @@ sub getprocesses {
> return @processesgraph;
> }
> 
> -sub updateentropygraph {
> - my $period    = $_[0];
> - my @command = (
> - @GRAPH_ARGS,
> - "-",
> - "--start",
> - "-1".$period,
> - "-r",
> - "--lower-limit","0",
> - "-t ".$Lang::tr{'entropy'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
> - "-v $Lang::tr{'bit'}",
> - "DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE",
> - "LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
> - "VDEF:entrmin=entropy,MINIMUM",
> - "VDEF:entrmax=entropy,MAXIMUM",
> - "VDEF:entravg=entropy,AVERAGE",
> - "GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
> - "GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
> - "GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
> - "--color=BACK".$color{"color21"},
> - );
> -
> - RRDs::graph (@command);
> - $ERROR = RRDs::error;
> -
> - return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
> -}
> -
> sub updateconntrackgraph {
> my $period = $_[0];
> my @command = (
> diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi
> index 6ec91cc92..f80f0138f 100644
> --- a/html/cgi-bin/getrrdimage.cgi
> +++ b/html/cgi-bin/getrrdimage.cgi
> @@ -35,7 +35,7 @@ require "${General::swroot}/graphs.pl";
> 
> # List of graph origins that getrrdimage.cgi can process directly
> # (unknown origins are forwarded to ensure compatibility)
> -my @supported_origins = ("entropy.cgi", "hardwaregraphs.cgi", "media.cgi",
> +my @supported_origins = ("hardwaregraphs.cgi", "media.cgi",
> "memory.cgi", "netexternal.cgi", "netinternal.cgi", "netother.cgi",
> "netovpnrw.cgi", "netovpnsrv.cgi", "qos.cgi", "services.cgi", "system.cgi");
> 
> @@ -80,11 +80,7 @@ _start_svg_output();
> # Graphs are first grouped by their origin.
> # This is because some graph categories require special parameter handling.
> my $graphstatus = '';
> -if($origin eq "entropy.cgi") { ## entropy.cgi
> - $graphstatus = Graphs::updateentropygraph($range);
> -# ------
> -
> -} elsif($origin eq "hardwaregraphs.cgi") { ## hardwaregraphs.cgi
> +if($origin eq "hardwaregraphs.cgi") { ## hardwaregraphs.cgi
> if($graph eq "hwtemp") {
> $graphstatus = Graphs::updatehwtempgraph($range);
> } elsif($graph eq "hwfan") {
> -- 
> 2.37.1.windows.1
>