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

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

[Robin Roevens]

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

- Update from version 6.0.21 to 6.0.22
- Update of rootfile not required

Bugs fixed:
- ZBX-23417: Fixed possible memory leak when checking modbus.get[] item
New Features and Improvements:
- ZBXNEXT-6554:	Increased remote command execution limits to 16MB

Full changelogs since 6.0.21:
- https://www.zabbix.com/rn/rn6.0.22
---
 lfs/zabbix_agentd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
index 7c0d01150..0033d9a2c 100644
--- a/lfs/zabbix_agentd
+++ b/lfs/zabbix_agentd
@@ -26,7 +26,7 @@ include Config
 
 SUMMARY    = Zabbix Agent
 
-VER        = 6.0.21
+VER        = 6.0.22
 
 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    = 10
+PAK_VER    = 11
 
 DEPS       = fping
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 0928695a5f2729765a5b1fa31df410d585b50ef40a9d8379d6243c256c88234ac916bfaf13f62a8e28bb8fb4be48e83c1aecfd01f66dc45d4e25a20761d8ef82
+$(DL_FILE)_BLAKE2 = bba7911a24b00827c58d84938b5786d07f1eb44cbcad94cddf68b484ac9a2f514beb60225d006b8cefc5bbf92e51da27f26d9f6681e10f6322ed0841394e8d9d
 
 install : $(TARGET)
 
-- 
2.41.0


-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.

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

[Robin Roevens]

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

For reference, the download link for the zabbix_agentd source used in
this patch:
https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.22.tar.gz

Regards

Robin

Robin Roevens schreef op vr 27-10-2023 om 21:40 [+0200]:
> - Update from version 6.0.21 to 6.0.22
> - Update of rootfile not required
> 
> Bugs fixed:
> - ZBX-23417: Fixed possible memory leak when checking modbus.get[]
> item
> New Features and Improvements:
> - ZBXNEXT-6554: Increased remote command execution limits to 16MB
> 
> Full changelogs since 6.0.21:
> - https://www.zabbix.com/rn/rn6.0.22
> ---
>  lfs/zabbix_agentd | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
> index 7c0d01150..0033d9a2c 100644
> --- a/lfs/zabbix_agentd
> +++ b/lfs/zabbix_agentd
> @@ -26,7 +26,7 @@ include Config
>  
>  SUMMARY    = Zabbix Agent
>  
> -VER        = 6.0.21
> +VER        = 6.0.22
>  
>  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    = 10
> +PAK_VER    = 11
>  
>  DEPS       = fping
>  
> @@ -48,7 +48,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_BLAKE2 =
> 0928695a5f2729765a5b1fa31df410d585b50ef40a9d8379d6243c256c88234ac916b
> faf13f62a8e28bb8fb4be48e83c1aecfd01f66dc45d4e25a20761d8ef82
> +$(DL_FILE)_BLAKE2 =
> bba7911a24b00827c58d84938b5786d07f1eb44cbcad94cddf68b484ac9a2f514beb6
> 0225d006b8cefc5bbf92e51da27f26d9f6681e10f6322ed0841394e8d9d
>  
>  install : $(TARGET)
>  
> -- 
> 2.41.0
> 
> 

-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.

[PATCH 2/2] zabbix_agentd: Fix ipfire.net.gateway.ping

[Robin Roevens]

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

Fixes custom IPFire Zabbix Agent userparameter ipfire.net.gateway.ping
returning 1 (success) when fping failed for other reasons (rc 2,3 or 4)
than host unreachable (rc 0).
---
 config/zabbix_agentd/userparameter_ipfire.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf
index b8b512d82..ba0c6c2ca 100644
--- a/config/zabbix_agentd/userparameter_ipfire.conf
+++ b/config/zabbix_agentd/userparameter_ipfire.conf
@@ -3,7 +3,7 @@
 # Internet Gateway ping timings, can be used to measure "Internet Line Quality"
 UserParameter=ipfire.net.gateway.pingtime,sudo /usr/sbin/fping -c 3 gateway 2>&1 | tail -n 1 | awk '{print $NF}' | cut -d '/' -f2
 # Internet Gateway availability, can be used to check Internet connection
-UserParameter=ipfire.net.gateway.ping,sudo /usr/sbin/fping -q -r 3 gateway; [ ! $? ]; echo $?
+UserParameter=ipfire.net.gateway.ping,sudo /usr/sbin/fping -q -r 3 gateway; [ ! $? == 0 ]; echo $?
 # Firewall Filter Forward chain drops in bytes/chain (JSON), can be used for discovery of firewall chains and monitoring of firewall hits on each chain
 UserParameter=ipfire.net.fw.hits.raw,sudo /usr/local/bin/getipstat -xf | grep "/\* DROP_.* \*/$" | awk 'BEGIN { ORS = ""; print "["} { printf "%s{\"chain\": \"%s\", \"bytes\": \"%s\"}", separator, substr($11, 6), $2; separator = ", "; } END { print"]" }'
 # Number of currently Active DHCP leases
-- 
2.41.0


-- 
Dit bericht is gescanned op virussen en andere gevaarlijke
inhoud door MailScanner en lijkt schoon te zijn.

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

[Michael Tremer]

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

Thank you. Merged!

> On 27 Oct 2023, at 20:44, Robin Roevens <robin.roevens(a)disroot.org> wrote:
> 
> For reference, the download link for the zabbix_agentd source used in
> this patch:
> https://cdn.zabbix.com/zabbix/sources/stable/6.0/zabbix-6.0.22.tar.gz
> 
> Regards
> 
> Robin
> 
> Robin Roevens schreef op vr 27-10-2023 om 21:40 [+0200]:
>> - Update from version 6.0.21 to 6.0.22
>> - Update of rootfile not required
>> 
>> Bugs fixed:
>> - ZBX-23417: Fixed possible memory leak when checking modbus.get[]
>> item
>> New Features and Improvements:
>> - ZBXNEXT-6554: Increased remote command execution limits to 16MB
>> 
>> Full changelogs since 6.0.21:
>> - https://www.zabbix.com/rn/rn6.0.22
>> ---
>>  lfs/zabbix_agentd | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
>> 
>> diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd
>> index 7c0d01150..0033d9a2c 100644
>> --- a/lfs/zabbix_agentd
>> +++ b/lfs/zabbix_agentd
>> @@ -26,7 +26,7 @@ include Config
>>  
>>  SUMMARY    = Zabbix Agent
>>  
>> -VER        = 6.0.21
>> +VER        = 6.0.22
>>  
>>  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    = 10
>> +PAK_VER    = 11
>>  
>>  DEPS       = fping
>>  
>> @@ -48,7 +48,7 @@ objects = $(DL_FILE)
>>  
>>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>  
>> -$(DL_FILE)_BLAKE2 =
>> 0928695a5f2729765a5b1fa31df410d585b50ef40a9d8379d6243c256c88234ac916b
>> faf13f62a8e28bb8fb4be48e83c1aecfd01f66dc45d4e25a20761d8ef82
>> +$(DL_FILE)_BLAKE2 =
>> bba7911a24b00827c58d84938b5786d07f1eb44cbcad94cddf68b484ac9a2f514beb6
>> 0225d006b8cefc5bbf92e51da27f26d9f6681e10f6322ed0841394e8d9d
>>  
>>  install : $(TARGET)
>>  
>> -- 
>> 2.41.0
>> 
>> 
> 
> -- 
> Dit bericht is gescanned op virussen en andere gevaarlijke
> inhoud door MailScanner en lijkt schoon te zijn.
>