From patchwork Mon Apr 27 15:25:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 3014 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 499pW417nRz3xQy for ; Mon, 27 Apr 2020 15:25:20 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 499pW368PMz2M6; Mon, 27 Apr 2020 15:25:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 499pW35NSdz2yVN; Mon, 27 Apr 2020 15:25:19 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 499pW167Qsz2y3Z for ; Mon, 27 Apr 2020 15:25:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 499pW10BBvz1VR for ; Mon, 27 Apr 2020 15:25:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1588001117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5VO6zxEhQdSE4NrXHkfft7p9bmrIhhOY/xamFQldBzg=; b=zWI4TPTa4T+oRoruJXG+s7QaWZ2795bZ1Yo/LClayQ315QioacDSqovZo2xlqILwZFNDTX VoPQVL0xT9N9ECBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1588001117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5VO6zxEhQdSE4NrXHkfft7p9bmrIhhOY/xamFQldBzg=; b=rixrGMsUfQwm9beZByHGD25MJAQGa0XE3kNa4IOJ5haC+BvSvFG9f/hqkg5SQfl6y2XVO1 9gaaHCMtEqISyu7n8toDqSP04Nb4IBKvPIbb+Q732IR3oMwdBtxVL3EkhRZRTdWDK1LFsb gmxpY+qJ2oJPda0ldBL+AnxfRFbp4E4kt/sMthB3Vzs31OmkLN2agm++qEmZjIYtRtiDWD ApxyKKiaMKqqJNeElnJUIMc2Voq5ZxMj4xQhVlQEg3Nc5QMjYSRRR5rwfyyVETqrIiVWwO qgln93yeRkht5Ef9wCnE0u+jFyLTYNMWeDaIm7teitwHc8m75JDaK0g0vUVv/g== Subject: [PATCH 4/4] graphs.pl: use brackets instead of hypens To: "IPFire: Development-List" References: <5e1ca950-4738-3676-0de6-fb62d48c6ed6@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Mon, 27 Apr 2020 17:25:15 +0200 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=peter.mueller@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" This simply makes more sense in most languages, as INPUT, OUTPUT and FORWARD are special cases of firewall hits in general. Signed-off-by: Peter Müller Reviewed-by: Michael Tremer --- config/cfgroot/graphs.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 872e9bd7c..7b056d117 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -683,17 +683,17 @@ sub updatefwhitsgraph { "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), "COMMENT:".sprintf("%14s",$Lang::tr{'minimal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'current'})."\\j", - "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-OUTPUT"), + "AREA:output".$color{"color25"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (OUTPUT)"), "GPRINT:output:MAX:%8.1lf %sBps", "GPRINT:output:AVERAGE:%8.1lf %sBps", "GPRINT:output:MIN:%8.1lf %sBps", "GPRINT:output:LAST:%8.1lf %sBps\\j", - "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-FORWARD"), + "STACK:forward".$color{"color23"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (FORWARD)"), "GPRINT:forward:MAX:%8.1lf %sBps", "GPRINT:forward:AVERAGE:%8.1lf %sBps", "GPRINT:forward:MIN:%8.1lf %sBps", "GPRINT:forward:LAST:%8.1lf %sBps\\j", - "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}."-INPUT"), + "STACK:input".$color{"color24"}."A0:".sprintf("%-25s",$Lang::tr{'firewallhits'}." (INPUT)"), "GPRINT:input:MAX:%8.1lf %sBps", "GPRINT:input:AVERAGE:%8.1lf %sBps", "GPRINT:input:MIN:%8.1lf %sBps",