[PATCH 1/2] zabbix_agentd: Update to 6.0.35 (LTS)

[PATCH 1/2] zabbix_agentd: Update to 6.0.35 (LTS)

[Robin Roevens]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

- 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 <robin.roevens(a)disroot.org>
---
 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)
 
-- 
2.47.0

[PATCH 2/2] zabbix_agentd: Add IPS throughput and guardian blocked IP count items

[Robin Roevens]

[-- Attachment #1: Type: text/plain, Size: 2176 bytes --]

- 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 <robin.roevens(a)disroot.org>
---
 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
-- 
2.47.0