From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gR2Bx0cThz2xl4 for ; Thu, 28 May 2026 10:04:09 +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 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gR2Bx0Fwjz2x9b for ; Thu, 28 May 2026 10:04:09 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bit raw public key) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gR2Bv1VYnzhX for ; Thu, 28 May 2026 10:04:07 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1779962647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=4+znsWsRXRkeBnNgEAUp4q/T6AvU42HFnM2TnRUQKAg=; b=AyxADjHRBa+twsi19bmYq2JFffSyLPyH2L3Xlq/WP1a3elcNYR+/Wv/zkbH/3Cp8b4oLiA Qhy8kxgNTMtMWKCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1779962647; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=4+znsWsRXRkeBnNgEAUp4q/T6AvU42HFnM2TnRUQKAg=; b=m8q5CJX5PlV3uPHdNC3vzpy+DxeBAUEpsiPiIoABfskx9K5Rgw7XwAkeTbuiqW/GMdMAv6 JS2YOFKWQnArVeWgucfwpnsBLdKUKKibhaQG92JFp69PFK8/2VLVROQmiJUYniaCY6HPGN 05gUaLvbAsONShbtS9PK1jKleqYDeN/ZNLmKu/aJ83Y0cgyd1M56WOKU/r+yN+K3aCIElj czbj6Yi/kpUO55rONWYA7ltiTiU1WjqhVrCu4tDIYMkn//DpGSzxN8jJ2AGMevPVWzlRUv IeF0MrcruL4NJ67WNmlGxKAemjl7LZMpYGVom+Kny88qTOh+Aqh9/t2O/YIHOw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4gR2Bt5mvrz2xKs; Thu, 28 May 2026 10:04:06 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c3dafd6356f43a5a7ea4401b8408955ae95a8158 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 07805a0e6353cad46148976484427264cbc268c6 X-Git-Newrev: c3dafd6356f43a5a7ea4401b8408955ae95a8158 Message-Id: <4gR2Bt5mvrz2xKs@people01.haj.ipfire.org> Date: Thu, 28 May 2026 10:04:06 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c3dafd6356f43a5a7ea4401b8408955ae95a8158 (commit) from 07805a0e6353cad46148976484427264cbc268c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c3dafd6356f43a5a7ea4401b8408955ae95a8158 Author: Robin Roevens Date: Wed May 27 22:59:50 2026 +0200 zabbix_agentd: Fix OpenVPN 2.7 status parsing Signed-off-by: Robin Roevens Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/zabbix_agentd/userparameter_ovpn.conf | 2 +- lfs/zabbix_agentd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/zabbix_agentd/userparameter_ovpn.conf b/config/zabbix_agentd/userparameter_ovpn.conf index d2ce10bb3..21efd0a63 100644 --- a/config/zabbix_agentd/userparameter_ovpn.conf +++ b/config/zabbix_agentd/userparameter_ovpn.conf @@ -3,7 +3,7 @@ # Discovery of configured ovpn clients UserParameter=ipfire.ovpn.clients.discovery,cat /var/ipfire/ovpn/ovpnconfig 2>/dev/null | awk -F',' 'BEGIN { ORS = ""; print "[" } { printf "%s{\"{#NAME}\":\"%s\",\"{#COMMONNAME}\":\"%s\",\"{#STATE}\":\"%s\",\"{#REMARK}\":\"%s\",\"{#TYPE}\":\"%s\"}", separator, $3, $4, $2, $27, $5; separator = ","; } END { print "]" }' # Get OpenVPN status report -UserParameter=ipfire.ovpn.statusreport.get,sudo /usr/local/bin/openvpnctrl rw log 2>/dev/null | awk -F"," 'function unixtime(t) { gsub(/[-:]/," ",t); return mktime(t) } BEGIN { ORS = ""; print "{" } /^Updated,.+/ { printf "\"timestamp\":%s,\"clients\":[",unixtime($2) } /^.+,[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,[0-9]+,[0-9]+,.+/ { if ($1 != "Common Name") { printf "%s{\"common_name\":\"%s\",\"real_address\":\"%s\",\"bytes_in\":\"%s\",\"bytes_out\":\"%s\",\"connected_since\":\"%s\"}", separator, $1, $2, $3, $4, unixtime($5); separator = ","; } } /^ROUTING TABLE/ { print "],\"routing_table\":["; separator = "" } /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+,.+,[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,.+/ { if ($1 != "Virtual Address") { printf "%s{\"common_name\":\"%s\",\"virtual_address\":\"%s\",\"real_address\":\"%s\",\"last_ref\":\"%s\"}", separator, $2, $1, $3, unixtime($4); separator = "," } } END { print "]}" }' +UserParameter=ipfire.ovpn.statusreport.get,sudo /usr/local/bin/openvpnctrl rw log 2>/dev/null | awk -F"," 'function unixtime(t) { gsub(/[-:]/," ",t); return mktime(t) } BEGIN { ORS = ""; print "{" } /^Updated,.+/ { printf "\"timestamp\":%s,\"clients\":[",unixtime($2) } /^.+,.+:[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,[0-9]+,[0-9]+,.+/ { if ($1 != "Common Name") { printf "%s{\"common_name\":\"%s\",\"real_address\":\"%s\",\"bytes_in\":\"%s\",\"bytes_out\":\"%s\",\"connected_since\":\"%s\"}", separator, $1, $2, $3, $4, unixtime($5); separator = ","; } } /^ROUTING TABLE/ { print "],\"routing_table\":["; separator = "" } /^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+,.+,.+:[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:[0-9]+,.+/ { if ($1 != "Virtual Address") { printf "%s{\"common_name\":\"%s\",\"virtual_address\":\"%s\",\"real_address\":\"%s\",\"last_ref\":\"%s\"}", separator, $2, $1, $3, unixtime($4); separator = "," } } END { print "]}" }' # Get OpenVPN client certificate details UserParameter=ipfire.ovpn.clientcert[*],sudo /var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh /var/ipfire/ovpn/ca/cacert.pem /var/ipfire/ovpn/certs/$1cert.pem UserParameter=ipfire.ovpn.cacert,sudo /var/ipfire/zabbix_agentd/scripts/ipfire_certificate_detail.sh /var/ipfire/ovpn/ca/cacert.pem /var/ipfire/ovpn/ca/cacert.pem diff --git a/lfs/zabbix_agentd b/lfs/zabbix_agentd index 9f0d65c78..cbf4b246c 100644 --- a/lfs/zabbix_agentd +++ b/lfs/zabbix_agentd @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = zabbix_agentd -PAK_VER = 22 +PAK_VER = 23 DEPS = fping hooks/post-receive -- IPFire 2.x development tree