From patchwork Tue Nov 5 22:36:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 8205 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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Xjjqt5pN3z3x5y for ; Tue, 5 Nov 2024 22:36:42 +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 RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xjjqp2HLNz1wh; Tue, 5 Nov 2024 22:36:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Xjjqp0qnNz34Hf; Tue, 5 Nov 2024 22:36:38 +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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Xjjqm1kHmz2yNc for ; Tue, 5 Nov 2024 22:36:36 +0000 (UTC) Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xjjql3rmbz1wh for ; Tue, 5 Nov 2024 22:36:35 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b="ZGJtwtk/"; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=reject) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1730846195; 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=u+nzVLrJhi4u/zOKI55l923rgHfr/eDiicjnpLgiAMc=; b=MGq7/ruxyqjY7/Av4UXyX8CQTQyrNS/B+LPSwrx7GY8dROKGbhxy16f8ANEvIf9Yzvci2/ b4yYxK6XqVA6PUl6K9Mhf7GWz4/lZ0hCTkGT2kba0wHRa08icFJdx4MfGLiC9dLX/q1tBp nKliZDjwDrOGT5Y40oeyXrtzG38Lz7mjsnINcZNzMFXDIP2iqfbnjKk/TKzREKxXzf1ifU 0I2ISY9LanN44e3c26Y3CL51AmG+wh2zVgo9MJ6BQXhc886Zxndwz4iEj/dwPWziaW5n3Y XK8r998+G1+GKYkVyhcxtmqvYvl4TFrcIBTGn0J2USS66n/6s5M8hZ/Jv+ZdwQ== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1730846195; a=rsa-sha256; cv=none; b=vMq+e4NYwrJy49oemAqkwAfM8oCZq5mBxNHR+KC8hiJ7XAO77IUOp8WfPm56oWWfDb0dag 8KVYU7oSZ4saQzNsbSqFdO34tYmtdlcfQh/LHeqMMYxRqdoBF15cjarHrhWQSjBM3QBBlw UDi+ddRlPwjiyBpOgKcZdVeN5LfrnJweksfp2zCq4DjmcSjn/gsvwOL5S+67boMAXjrQv8 pIos/ri0H8y66Bq5CwiqneMcmTSeL0uILAeM+Odt/oW5DFf5CBcybP8tuyzU8kljPsZdfs AgOW3mncB2mZliYIWvAkIjPHesWU34dP4JZi1pyMNWABWanLN5eXCiVX91OXrw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b="ZGJtwtk/"; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=reject) header.from=disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1139A24AC6 for ; Tue, 5 Nov 2024 23:36:34 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id pM58mxaFt2CD for ; Tue, 5 Nov 2024 23:36:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1730846189; bh=8St42W1YDnbwOc9jSK3my3FYVb3NGNm0UjzOQ00lxLs=; h=From:To:Cc:Subject:Date; b=ZGJtwtk/m0uWrseKL0KOyWFpYO/5vzWgW20ENaKnz4JzfKGapDH0gG2tTfKDhXrP3 ALLk5I288Qkyi6xspMChic3S0PkvXebYk6nt6gPyqfjkVkQV+r262kFkwNEmLeIh/s ShOgPv+DGv8RCd1ng0ocdbl2DWCemmXWQZ39hHqb/FIFFng4RmeEL27e65XRBIu/TP eI5iRFB9FQDO/RaOxtU22fBVn8gqlN4t4SMNValGiKIcSDq1t/DEHs4mHZXfS5I09m ipg47mFiwv8cAJcWwvJsYIzguSWo6B9r9vsCCNET1SQdyt8QSop82B5eh0/4kU31lk wEI1EBMoIpzNA== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 1/2] zabbix_agentd: Update to 6.0.35 (LTS) Date: Tue, 5 Nov 2024 23:36:17 +0100 Message-ID: <20241105223618.4086546-1-robin.roevens@disroot.org> MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4Xjjql3rmbz1wh X-Spamd-Result: default: False [0.60 / 11.00]; BAYES_HAM(-2.95)[99.80%]; SPF_REPUTATION_SPAM(2.06)[0.68799890087892]; RBL_VIRUSFREE_BOTNET(2.00)[178.21.23.139:from]; RBL_SENDERSCORE_REPUT_9(-1.00)[178.21.23.139:from]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-0.999]; R_MISSING_CHARSET(0.50)[]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.00)[asn: 50673(0.00), country: NL(-0.00), ip: 178.21.23.139(0.00)]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_ALLOW(0.00)[disroot.org:s=mail]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DMARC_POLICY_ALLOW(0.00)[disroot.org,reject]; DKIM_TRACE(0.00)[disroot.org:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; DKIM_REPUTATION(0.00)[0]; R_SPF_ALLOW(0.00)[+a:c]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; FROM_HAS_DN(0.00)[] Message-ID-Hash: EZRFEUURG2VPOLVSEVLONGHOAINI5CYT X-Message-ID-Hash: EZRFEUURG2VPOLVSEVLONGHOAINI5CYT X-MailFrom: robin.roevens@disroot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Update from version 6.0.33 to 6.0.35 - Update of rootfile not required Bugs fixed: - ZBX-25127: Fixed crash in JSON library due to null pointer arithmetic - ZBX-24273: Fixed potential crash for vfs.fs.get item - ZBX-25029: Fixed initiating HA failover in the case of invalid server response Full changelogs since 6.0.33: - https://www.zabbix.com/rn/rn6.0.34 - https://www.zabbix.com/rn/rn6.0.35 Signed-off-by: Robin Roevens --- lfs/zabbix_agentd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index dd593ecf1..8e2cd1cb6 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -26,7 +26,7 @@ include Config SUMMARY = Zabbix Agent -VER = 6.0.33 +VER = 6.0.35 THISAPP = zabbix-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 14 +PAK_VER = 15 DEPS = fping @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = 736c5b46193e7e7f93dfa00eb56c65fdf3fa6e36a647d0f910118923950114dbbbe9382563e96db4d8ee6199b4e0342037fb8ec6ec8d349884612f5ef18db966 +$(DL_FILE)_BLAKE2 = 82f76fefeb45450a02f04f1fd51a68cfb3c73e727e0dccbe77e9afb0c21d847ab2894954fb4bb56b0101614ef922a11910721c302e3cd8b51d79eb905cbd0b3d install : $(TARGET) From patchwork Tue Nov 5 22:36:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Roevens X-Patchwork-Id: 8206 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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Xjjqy4bpbz3x5y for ; Tue, 5 Nov 2024 22:36: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 RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xjjqp5dc2z4bK; Tue, 5 Nov 2024 22:36:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Xjjqp29gbz34Kw; Tue, 5 Nov 2024 22:36:38 +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 (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Xjjqm23Hnz342Q for ; Tue, 5 Nov 2024 22:36:36 +0000 (UTC) Received: from layka.disroot.org (layka.disroot.org [178.21.23.139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Xjjql15PLz1Zd for ; Tue, 5 Nov 2024 22:36:35 +0000 (UTC) Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=B4j7SNqU; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=reject) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1730846195; 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:dkim-signature; bh=0++LWyXMwyI8RNCLyRCrGDMC9GS+cYTSv+qr8/9EQHg=; b=GHMtkWNb+A08Z8YtwO3QPeiTiS5VSjzA2xsgdQDKS2K5OisFZtdnRI2zmyvaev0bS2XdTn 2jSMpGK4qBoy7RoHHHBO80L/RvxLHFwmyP5Jgo3iO1yLr5him0THyrwHiOd5kyqTbq/ACL QRSWmZ/is7Gx+dSmk64tNouUWH8YUWuJq57zgohmy7KK59WAwOKqfQ8s/XamqgFqdDqJpA zAHqvG5AkkY9WyeRb59eoNbzKScjS4JZWoeVH8xUGVrd+bHSyiUzoONCo7rEAWjJggry8H FxhOK5hSd5al2zlYm0XkyTd3J7rds1F5o27MCpH7ngYcZC/gDsVHtLAw5E6FzQ== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1730846195; a=rsa-sha256; cv=none; b=HjPjynQaHUHJp1JoENCrXt4XXA9LkUNpA+9lOs2kNUNyxVgVG6FSjm3h5DzEtXI0tBTOKD Cfn8p2+Wpo+LQNl4LCPngVBI2hp6mhSQgtsEpoD60oaXH1J/iuaznmhGaTfym2xSUHIqbR 7vpF668ypJriOUC8Q9ZZcUihd0J6mLDLFmy60llYIysGOea8tmumzHjBS+vYTqJ2Yzb9Vq CRpln1vLlYEKnBlA3naKvl9K7yPyyGfii1e/+ZmQ24LPjfrIsEWcvff0o0w905cACZO7oh eHnwxapRfjuchYwHqYFWnGHZ8WwRVlPlybOSxDx7/XJoryU3r5lwPbigXcDhHw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=B4j7SNqU; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=reject) header.from=disroot.org Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0441124CD6 for ; Tue, 5 Nov 2024 23:36:34 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qOQJyoJ_xwy6 for ; Tue, 5 Nov 2024 23:36:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1730846189; bh=kSwt/DzvgO2+XOy44PDIKQduuxHbi22o2lwetU0/KpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B4j7SNqUifkYG0Q5lti0bTYMZCpjbGqG/Wo382PhaYQB3Te9y0HWTHUUSHZwlEY6G nrAUcRIkSDaeKwiGDoSDsPsd/lNw4ytZz7C2Jpph0PaGRatvp+Ng4ac3pdlQI5wNYn YQt5ijICa20UK2EYnYGjcoh1O1OLJGt+RHBROc7uCMsAacXlAHeTyvkW700gfo1mvM lSpdc0BGLI5wXCXVMBRLPrcNVBSVHCjLvIYRngZLy/HU/6IMcIErHC+F8pSVKuI7s7 fELgG1E4g1k8PVmmhyiQvRy53MhgUS2tl6nezu9WdUg6Cbp1ZVo+9/spAMUPo8ubnp YaqZudUptsa5w== From: Robin Roevens To: development@lists.ipfire.org Subject: [PATCH 2/2] zabbix_agentd: Add IPS throughput and guardian blocked IP count items Date: Tue, 5 Nov 2024 23:36:18 +0100 Message-ID: <20241105223618.4086546-2-robin.roevens@disroot.org> In-Reply-To: <20241105223618.4086546-1-robin.roevens@disroot.org> References: <20241105223618.4086546-1-robin.roevens@disroot.org> MIME-Version: 1.0 X-Rspamd-Action: no action X-Rspamd-Server: mail01.haj.ipfire.org X-Rspamd-Queue-Id: 4Xjjql15PLz1Zd X-Spamd-Result: default: False [0.55 / 11.00]; BAYES_HAM(-3.00)[99.99%]; SPF_REPUTATION_SPAM(2.06)[0.68799890087892]; RBL_VIRUSFREE_BOTNET(2.00)[178.21.23.139:from]; RBL_SENDERSCORE_REPUT_9(-1.00)[178.21.23.139:from]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-0.999]; R_MISSING_CHARSET(0.50)[]; BAD_REP_POLICIES(0.10)[]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; IP_REPUTATION_HAM(-0.00)[asn: 50673(0.00), country: NL(-0.00), ip: 178.21.23.139(0.00)]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_ALLOW(0.00)[disroot.org:s=mail]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DMARC_POLICY_ALLOW(0.00)[disroot.org,reject]; DKIM_TRACE(0.00)[disroot.org:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; R_SPF_ALLOW(0.00)[+a]; DKIM_REPUTATION(0.00)[0]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; FROM_HAS_DN(0.00)[] Message-ID-Hash: ZJKX5QK24Q2WIDDNJQLA7ELWKIVEMX6X X-Message-ID-Hash: ZJKX5QK24Q2WIDDNJQLA7ELWKIVEMX6X X-MailFrom: robin.roevens@disroot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Adds Zabbix Agent userparameter `ipfire.ips.throughput.get` for the agent to get details about IPS throughput bypassed/scanned/whitelisted in bytes (JSON) - Adds Zabbix Agent userparameter `ipfire.guardian.blocked.count` for the agent to get the number of currently blocked IP's by Addon: Guardian. Signed-off-by: Robin Roevens --- config/zabbix_agentd/userparameter_ipfire.conf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf index cc0bd9f8e..c8ead1608 100644 --- a/config/zabbix_agentd/userparameter_ipfire.conf +++ b/config/zabbix_agentd/userparameter_ipfire.conf @@ -11,4 +11,12 @@ UserParameter=ipfire.dhcpd.clients,grep -s -E 'lease|bind' /var/state/dhcp/dhcpd # Number of Captive Portal clients UserParameter=ipfire.captive.clients,awk -F ',' 'length($2) == 17 {sum += 1} END {if (length(sum) == 0) print 0; else print sum}' /var/ipfire/captive/clients # Services list and state -UserParameter=ipfire.services.get,sudo /var/ipfire/zabbix_agentd/scripts/ipfire_services.pl \ No newline at end of file +UserParameter=ipfire.services.get,sudo /var/ipfire/zabbix_agentd/scripts/ipfire_services.pl +# IPS throughput bypassed/scanned/whitelisted in bytes/type (JSON) +UserParameter=ipfire.ips.throughput.get,sudo /usr/local/bin/getipstat -xm | awk 'BEGIN{ORS="";print "{"}/Chain IPS/{f=1}/BYPASSED/&&f{printf "\"bypassed\":%s",$2}/SCANNED/&&f{printf ",\"scanned\":%s",$2}/WHITELISTED/&&f{printf ",\"whitelisted\":%s",$2}/^$/{f=0}END{print "}"}' +# Addon: Guardian: Number of currently blocked IP's +UserParameter=ipfire.guardian.blocked.count,sudo /usr/local/bin/getipstat | awk 'BEGIN{ORS="";c=0}/Chain GUARDIAN/{f=1}/DROP/&&f{c++}/^$/{f=0}END{print c}' +# +# Allow item key to be called with (unused) parameters. This allows the #SINGLETON method of discovering this item only when specific service is active +Alias=ipfire.ips.throughput.get[]:ipfire.ips.throughput.get +Alias=ipfire.guardian.blocked.count[]:ipfire.guardian.blocked.count \ No newline at end of file