From patchwork Mon Apr 4 20:33:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5434 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 4KXMtm0m8Yz3x1Y for ; Mon, 4 Apr 2022 20:33:52 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KXMtj3BPPzDR; Mon, 4 Apr 2022 20:33:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KXMtj25Pfz2yTP; Mon, 4 Apr 2022 20:33:49 +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 4KXMtg2Syvz2xqv for ; Mon, 4 Apr 2022 20:33:47 +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) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KXMtd6DWwzDR; Mon, 4 Apr 2022 20:33:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649104426; 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; bh=WcPgYZVFWGPu46FGLtLhtGhoDcHFNopb4UpebqlpZic=; b=VeIZJ86NdUm5a+LQURgvpEZM6F1gbRdmK+QwhNhOacqTFiacyWE7It+O73OCo+TmF/NWAB sJaoMA4h6S6HL5DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649104426; 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; bh=WcPgYZVFWGPu46FGLtLhtGhoDcHFNopb4UpebqlpZic=; b=F0QI/pGDqVuKofg9G1dYSy5HG16UjxfnRUCddNXNZqeO4wicBSgNSMW4jPnFHCC+SPM3Yf sW+dfQxo7QESwZRoR/ran5SWzBPEyxr7Y+ZLLJuGiTTph92p1lBPJFSBBVkaHlU1DZKUgj 9BwNQSqLNasDsOOfgT7BjaUWlTGaTJToAYR1Peizbh3yDynDnNy9yRUvWXgIl2nx0IV/aY 2twwJ7RNRyVAU6EkJDfVT3wP7uzS8Xme12BOHEqEK7DzJoLQe7WbNTPHCi/Gnh3nomCQo8 C7F6yxvw8uTN4joieaBiE3dNm+TebPsZBaqsnVn7BLsTd9wbAC9KSYIh/vvMcg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] collectd.conf: Change chain from HOSTILE to HOSTILE_DROP - fixes bug#12838 Date: Mon, 4 Apr 2022 22:33:30 +0200 Message-Id: <20220404203331.3612132-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" From: Bernhard Bitsch - Chain that was specified was HOSTILE but actual used is HOSTILE_DROP - Using HOSTILE caused no update fro the hostile data used in the Firewall Hits graph Fixes: bug#12838 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Reviewed-by: Bernhard Bitsch Acked-by: Bernhard Bitsch --- config/collectd/collectd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index 2a0237100..e34a97da1 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -52,7 +52,7 @@ include "/etc/collectd.precache" Chain filter POLICYOUT DROP_OUTPUT Chain filter POLICYIN DROP_INPUT Chain filter SPOOFED_MARTIAN DROP_SPOOFED_MARTIAN - Chain filter HOSTILE DROP_HOSTILE + Chain filter HOSTILE_DROP DROP_HOSTILE # From patchwork Mon Apr 4 20:33:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 5435 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 "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KXMv10ykCz3x1Y for ; Mon, 4 Apr 2022 20:34:05 +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 "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KXMv03Vpfz2cK; Mon, 4 Apr 2022 20:34:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KXMv03CjSz2xqv; Mon, 4 Apr 2022 20:34:04 +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 "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KXMtz1kZpz2xJj for ; Mon, 4 Apr 2022 20:34:03 +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) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KXMtz06s5z1Fn; Mon, 4 Apr 2022 20:34:02 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649104443; 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: in-reply-to:in-reply-to:references:references; bh=LgARG5lLv3KcANLvHQJmr36EFmyjcoRYWAu3IiLmfn8=; b=SkbVpkCRYjSgjhT/IRc3xlU9A1Id8ZNfcOUl6G98d5vYtizkWzM9QAzbFjfESyyMhOrb4v pRgRS47EHSDAFFAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649104443; 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: in-reply-to:in-reply-to:references:references; bh=LgARG5lLv3KcANLvHQJmr36EFmyjcoRYWAu3IiLmfn8=; b=YubIdRNs+9BC3ymUHufDYgrb7BZz+yOjmcjHh6iHzdpyfa6OsgMoYwrahfFFdxdUS3HPZK YP1M+UyYGVmMTgsWvQiYxlItIITryff9gFBD2OH/AGrHx6mUI5ivoDgewiFScCxUG2dRE+ Ce+llAyuQGS4FqKNnxr6Ksh/48UZUgKTOV3g3+TWRfN3wM9r/6hGYX/1zrQdRqh7moAB7V sYTXCfywqWnc6N98EnwCSM4SR45Jp8HwAQCxu9EiQVin8+zHV5JdNBPMcY26pryJquIzhT ODW/KlCKPp89h0LqOAruUpTNnkEg2n1Zbv0IV/Lp696tP7ef1WG6XoWKBMG8Ew== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] graphs.pl: Change directory name to replace HOSTILE with HOSTILE_DROP - fixes bug#12838 Date: Mon, 4 Apr 2022 22:33:31 +0200 Message-Id: <20220404203331.3612132-2-adolf.belka@ipfire.org> In-Reply-To: <20220404203331.3612132-1-adolf.belka@ipfire.org> References: <20220404203331.3612132-1-adolf.belka@ipfire.org> MIME-Version: 1.0 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" From: Bernhard Bitsch - The directory name for the hostile data was using HOSTILE while the chain was called HOSTILE_DROP. This resulted in the files in the directory not being updated. Fixes: bug#12838 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Reviewed-by: Bernhard Bitsch --- config/cfgroot/graphs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index b964f1e80..3368e5aad 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -693,7 +693,7 @@ sub updatefwhitsgraph { "DEF:newnotsyn=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-NEWNOTSYN/ipt_bytes-DROP_NEWNOTSYN.rrd:value:AVERAGE", "DEF:portscan=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-PSCAN/ipt_bytes-DROP_PScan.rrd:value:AVERAGE", "DEF:spoofedmartian=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-SPOOFED_MARTIAN/ipt_bytes-DROP_SPOOFED_MARTIAN.rrd:value:AVERAGE", - "DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", + "DEF:hostile=".$mainsettings{'RRDLOG'}."/collectd/localhost/iptables-filter-HOSTILE_DROP/ipt_bytes-DROP_HOSTILE.rrd:value:AVERAGE", "COMMENT:".sprintf("%-26s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}),