From b106c98260db7321bac5f115ba2eb8a7ae79aa59 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 15 Jul 2025 09:10:03 +0200
Subject: [PATCH] net-mgmt/zabbix-agent: bump and document

---
 net-mgmt/zabbix-agent/Makefile                       |  2 +-
 net-mgmt/zabbix-agent/pkg-descr                      |  9 +++++++++
 .../app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml  | 12 ++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index d6b91153f..796854ace 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		zabbix-agent
-PLUGIN_VERSION=		1.15
+PLUGIN_VERSION=		1.16
 PLUGIN_COMMENT=		Zabbix monitoring agent
 PLUGIN_MAINTAINER=	opnsense@moov.de
 PLUGIN_VARIANTS=	zabbix7 zabbix72 zabbix6
diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr
index 5b4ed6593..0cae91b59 100644
--- a/net-mgmt/zabbix-agent/pkg-descr
+++ b/net-mgmt/zabbix-agent/pkg-descr
@@ -12,6 +12,15 @@ WWW: https://www.zabbix.com/
 Plugin Changelog
 ----------------
 
+1.16
+
+Changed:
+* snake_case use in API URLs
+* Model style updates
+
+Removed:
+* Plugin variant for Zabbix Agent 5.0 is EoL and was removed
+
 1.15
 
 Added:
diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml
index 9527d0328..0a181f74b 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml
@@ -46,10 +46,7 @@
                     <NetMaskAllowed>N</NetMaskAllowed>
                     <ValidationMessage>Please provide a valid IP address, i.e. 10.0.0.1.</ValidationMessage>
                 </sourceIP>
-                <syslogEnable type="BooleanField">
-                    <Default>0</Default>
-                    <Required>N</Required>
-                </syslogEnable>
+                <syslogEnable type="BooleanField"/>
                 <logFileSize type="IntegerField">
                     <Default>100</Default>
                     <MinimumValue>1</MinimumValue>
@@ -142,15 +139,10 @@
                     <Required>Y</Required>
                 </encryption>
                 <encryptionidentity type="TextField">
-                    <Default></Default>
-                    <Required>N</Required>
                     <Mask>/^.{1,128}$/</Mask>
                     <ValidationMessage>Should be a string between 1 and 128 characters.</ValidationMessage>
                 </encryptionidentity>
-                <encryptionpsk type="TextField">
-                    <Default></Default>
-                    <Required>N</Required>
-                </encryptionpsk>
+                <encryptionpsk type="TextField"/>
             </features>
         </settings>
         <userparameters>