Drop support for entropy graph

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

Signed-off-by: Leo-Andres Hofmann <hofmann@leo-andres.de>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 3368e5aad29583270d91b7c3d5f6d27db8973037..8a67354098d4fc6d49211b6aa257ff61e952bec6 100644 (file)
--- 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 6ec91cc92623102aa13a32088a34b66e79422f86..f80f0138f23dd74d8e25006c97a8fb48d2673abd 100644 (file)
--- 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") {