From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo-Andres Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: [PATCH] Drop support for entropy graph
Date: Mon, 13 Mar 2023 08:29:17 +0100
Message-ID: <20230313072917.772-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5457508159978698187=="
List-Id: <development.lists.ipfire.org>

--===============5457508159978698187==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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;
 }
=20
-sub updateentropygraph {
-	my $period    =3D $_[0];
-	my @command =3D (
-		@GRAPH_ARGS,
-		"-",
-		"--start",
-		"-1".$period,
-		"-r",
-		"--lower-limit","0",
-		"-t ".$Lang::tr{'entropy'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$perio=
d."-graph"},
-		"-v $Lang::tr{'bit'}",
-		"DEF:entropy=3D$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.=
rrd:entropy:AVERAGE",
-		"LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
-		"VDEF:entrmin=3Dentropy,MINIMUM",
-		"VDEF:entrmax=3Dentropy,MAXIMUM",
-		"VDEF:entravg=3Dentropy,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=3DBACK".$color{"color21"},
-	);
-
-	RRDs::graph (@command);
-	$ERROR =3D RRDs::error;
-
-	return "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
-}
-
 sub updateconntrackgraph {
 	my $period =3D $_[0];
 	my @command =3D (
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";
=20
 # List of graph origins that getrrdimage.cgi can process directly
 # (unknown origins are forwarded to ensure compatibility)
-my @supported_origins =3D ("entropy.cgi", "hardwaregraphs.cgi", "media.cgi",
+my @supported_origins =3D ("hardwaregraphs.cgi", "media.cgi",
 	"memory.cgi", "netexternal.cgi", "netinternal.cgi", "netother.cgi",
 	"netovpnrw.cgi", "netovpnsrv.cgi", "qos.cgi", "services.cgi", "system.cgi");
=20
@@ -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 =3D '';
-if($origin eq "entropy.cgi") {				## entropy.cgi
-	$graphstatus =3D Graphs::updateentropygraph($range);
-# ------
-
-} elsif($origin eq "hardwaregraphs.cgi") {	## hardwaregraphs.cgi
+if($origin eq "hardwaregraphs.cgi") {		## hardwaregraphs.cgi
 	if($graph eq "hwtemp") {
 		$graphstatus =3D Graphs::updatehwtempgraph($range);
 	} elsif($graph eq "hwfan") {
--=20
2.37.1.windows.1


--===============5457508159978698187==--