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 [thread overview]
Message-ID: <20230313072917.772-1-hofmann@leo-andres.de> (raw)
[-- 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
next reply other threads:[~2023-03-13 7:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 7:29 Leo-Andres Hofmann [this message]
2023-03-13 9:21 ` Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230313072917.772-1-hofmann@leo-andres.de \
--to=hofmann@leo-andres.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox