From patchwork Mon Mar 13 07:29:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo-Andres Hofmann X-Patchwork-Id: 6694 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PZpGt6cDYz3wfH for ; Mon, 13 Mar 2023 07:30:46 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PZpGs0HTBzQS; Mon, 13 Mar 2023 07:30:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PZpGr5fNbz2yf4; Mon, 13 Mar 2023 07:30:44 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PZpGq497Mz2xGT for ; Mon, 13 Mar 2023 07:30:43 +0000 (UTC) Received: from arche.uberspace.de (arche.uberspace.de [185.26.156.147]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4PZpGj6c0pzMS for ; Mon, 13 Mar 2023 07:30:37 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=leo-andres.de header.s=uberspace header.b="hFxD/Mwn"; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de; dmarc=pass (policy=quarantine) header.from=leo-andres.de ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1678692638; a=rsa-sha256; cv=none; b=JLtorQYsnQKw0whSY81fo6AikHmIs5h0e2hMdABhQV8Lovs1hexyAYZ82eKQoo3uHW/oxm ctms8pep7cG0knFQCSfGgtapbdbAoCxQG4dx+XZZ7g2qVvxoELx9rX3RiXWlxnqy4Gwczd naA0alP1CuR7Un7B2INkuTuD7h1Zu359qhfjTOEDwzcDswFAVkPsKMaA8DnMWsvW6iaFwE WlORp/nZXb9nqvvSYmO8S56b+T7nb43jQMp6cv6IufbpY6F9UKpVAfcfjUaGGDKz91oJtQ +n2kjQoabulN8gpgNmsRCKUx7keiVZHpK2568dE3S1LJvCUARBj1q/90uOQ06w== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=leo-andres.de header.s=uberspace header.b="hFxD/Mwn"; spf=pass (mail01.ipfire.org: domain of hofmann@leo-andres.de designates 185.26.156.147 as permitted sender) smtp.mailfrom=hofmann@leo-andres.de; dmarc=pass (policy=quarantine) header.from=leo-andres.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1678692638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=Is24YL4TTGx9emRw81RalWrsAYEMyXmmMQ1KAGaOm8o=; b=lSTr/ccjf6QHkNfxuCszsnKQxatk9REmcxewkF3QkKYEEHEUIyAfTsh5wVYEP4E47Gqcmj p3m9rFGcIDgWQ+SuR6mn3oBm5UJ7AuWspszcH34tWaUuf7361qnvMoguNklgkX4JxnFZjr 439o5yI7FyAiCs6i03/SqYTXeiSOESJwWwM9YW+QdTumfsrdC6KxdgtlgzoT6SiTV8JEmn 6e1hdnkmc+yNIjlcZFIAwF9yWSq7CXySsxSxgsuTZFSQZFfnMWpM8rE0cuVbUULFJcHPQB GIYZz15+vChbHdUm2OkE8LXW3E4z5Tr1j5I1GmN3pLGLm6bxDn0T63NPhCVKxQ== Received: (qmail 21902 invoked by uid 990); 13 Mar 2023 07:30:36 -0000 From: Leo-Andres Hofmann 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> X-Mailer: git-send-email 2.37.1.windows.1 MIME-Version: 1.0 X-Rspamd-Bar: - X-Rspamd-Report: R_MISSING_CHARSET(0.5) MIME_GOOD(-0.1) MID_CONTAINS_FROM(1) BAYES_HAM(-3) X-Rspamd-Score: -1.6 Received: from unknown (HELO unkown) (::1) by arche.uberspace.de (Haraka/3.0.1) with ESMTPSA; Mon, 13 Mar 2023 08:30:36 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=leo-andres.de; s=uberspace; h=from; bh=OspKqS8P6VAJjjEBsKy3TWS9w2DakLpYHhDdQglnJLM=; b=hFxD/Mwn397zegxOiI9m92wf0gBxdV+fVb+TyW+n6cAVg0rBwehsiEXSJ7YxSEEr/aRjN+j+tI wDe6bvSoophHz7L1c04+76seUaLDLMMsWrpCj3NoIizmbrIpHcCvGbDFNrOA19DYoSt3OdJ7eYYi VlJMr1ZV3gXJCB7TM3ZqMToll/prIVvYePuTYD/ERyd0YyfcQqe8PC44fCVNyWkaK49RNERC9M4a coWwSkfgsmfpULjX7Wd0YCaDRsxaoumWR09WQM0ICpyXGerRW6icT4KFS+vmlB0vAC+kE1naiFOv gfTeoO0KC59SUiHTQehK9H3JHZmkmuqAotvSjcHPkb3GD7UsgnnOikJJ9sDPp8sz5tZrmSf5EZ5a 6DHz4Y1omH5pshTCv4/1g5w6uVT9+Uo9qHJhL0OEhB7JfO4W4D0kW7cnKA7K2YcMeZVnt5Ux9SOk qYC4JSP/4CPDh/amMGeBHZKNiWB85XnSJ46snilYTTCL5oM/s73cX9MkwREChe3eYyJtFOqNsjob jpkLYfJF0PRM4bFIijubmpLQKjHevegdZT6r4naQajyMpdw9+mmNAdh4i5AsoV2HVLOafX1doWmd Fptfd2PlOF0JjzstghDTnfOFpK5U2kIrZK492ZneWdXDe+tTiHRHV7PYkjLRIDHjVFhkAF8JAGTY s= X-Rspamd-Queue-Id: 4PZpGj6c0pzMS X-Spamd-Result: default: False [-3.00 / 11.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-0.997]; MX_INVALID(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[leo-andres.de,quarantine]; R_MISSING_CHARSET(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:185.26.156.0/24]; R_DKIM_ALLOW(-0.20)[leo-andres.de:s=uberspace]; MIME_GOOD(-0.10)[text/plain]; IP_REPUTATION_HAM(-0.00)[asn: 205766(0.00), country: DE(-0.00), ip: 185.26.156.147(0.00)]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[185.26.156.147:from]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; TO_DN_SOME(0.00)[]; ASN(0.00)[asn:205766, ipnet:185.26.156.0/24, country:DE]; DKIM_REPUTATION(0.00)[0]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[leo-andres.de:+]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Action: no action X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Entropy data isn't collected anymore. See 8000bc0 for reference. Signed-off-by: Leo-Andres Hofmann Reviewed-by: Michael Tremer --- 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") {