From: Robin Roevens Date: Fri, 27 Oct 2023 19:49:01 +0000 (+0200) Subject: zabbix_agentd: Fix ipfire.net.gateway.ping X-Git-Tag: v2.27-core181~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19614961b6c7b09fe6e0cc91b2d4c3a4df6473a0;p=ipfire-2.x.git zabbix_agentd: Fix ipfire.net.gateway.ping 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). Signed-off-by: Michael Tremer --- diff --git a/config/zabbix_agentd/userparameter_ipfire.conf b/config/zabbix_agentd/userparameter_ipfire.conf index b8b512d820..ba0c6c2ca3 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