From 3c858b19a06371473e5d9c8556570ae239225e60 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 15 Jul 2025 09:36:43 +0200
Subject: [PATCH] net-mgmt/zabbix-proxy: document and some cleanups

---
 net-mgmt/zabbix-proxy/Makefile                |  2 +-
 net-mgmt/zabbix-proxy/pkg-descr               |  6 ++
 .../OPNsense/Zabbixproxy/forms/general.xml    |  2 +
 .../models/OPNsense/Zabbixproxy/General.xml   | 96 ++++---------------
 4 files changed, 27 insertions(+), 79 deletions(-)

diff --git a/net-mgmt/zabbix-proxy/Makefile b/net-mgmt/zabbix-proxy/Makefile
index 5e9d2a424..228a5a643 100644
--- a/net-mgmt/zabbix-proxy/Makefile
+++ b/net-mgmt/zabbix-proxy/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		zabbix-proxy
-PLUGIN_VERSION=		1.12
+PLUGIN_VERSION=		1.13
 PLUGIN_COMMENT=		Zabbix monitoring proxy
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
 PLUGIN_VARIANTS=	zabbix7 zabbix72 zabbix6
diff --git a/net-mgmt/zabbix-proxy/pkg-descr b/net-mgmt/zabbix-proxy/pkg-descr
index 49159ff30..7de9a2181 100644
--- a/net-mgmt/zabbix-proxy/pkg-descr
+++ b/net-mgmt/zabbix-proxy/pkg-descr
@@ -12,6 +12,12 @@ WWW: https://www.zabbix.com/
 Plugin Changelog
 ----------------
 
+1.13
+
+* Removed plugin variant for Zabbox Proxy 5.0 which is EoL
+* Use snake_case in API URLs
+* Model style updates
+
 1.12
 
 * Add plugin variant for Zabbix Proxy 7.2, 6.4 is EoL and was removed
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
index efef9db91..a75cc7eb2 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/controllers/OPNsense/Zabbixproxy/forms/general.xml
@@ -27,6 +27,7 @@
         <id>general.serverport</id>
         <label>Server Port</label>
         <type>text</type>
+        <hint>10051</hint>
         <help>Port of Zabbix trapper on Zabbix server. Default is fine for most scenarios.</help>
     </field>
     <field>
@@ -47,6 +48,7 @@
         <id>general.listenport</id>
         <label>Listen Port</label>
         <type>text</type>
+        <hint>10051</hint>
         <help>Listen port for trapper. Default is just fine.</help>
     </field>
     <field>
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
index a80586fbb..fc214f691 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
+++ b/net-mgmt/zabbix-proxy/src/opnsense/mvc/app/models/OPNsense/Zabbixproxy/General.xml
@@ -15,96 +15,40 @@
             <Default>0</Default>
             <Required>Y</Required>
         </remotecommands>
-        <server type="TextField">
-            <Default></Default>
-            <Required>N</Required>
-        </server>
-        <serverport type="TextField">
-            <Default>10051</Default>
-            <Required>N</Required>
-        </serverport>
+        <server type="TextField"/>
+        <serverport type="TextField"/>
         <hostname type="TextField">
             <Default>Zabbix proxy</Default>
             <Required>Y</Required>
         </hostname>
-        <listenport type="TextField">
-            <Default>10051</Default>
-            <Required>N</Required>
-        </listenport>
+        <listenport type="TextField"/>
         <listenip type="NetworkField">
-            <Default></Default>
             <FieldSeparator>,</FieldSeparator>
             <AsList>Y</AsList>
-            <Required>N</Required>
         </listenip>
-        <sourceip type="NetworkField">
-            <Default></Default>
-            <Required>N</Required>
-        </sourceip>
-        <startpollers type="TextField">
-            <Default>5</Default>
-            <Required>N</Required>
-        </startpollers>
-        <startipmipollers type="IntegerField">
-            <Default>0</Default>
-            <Required>N</Required>
-        </startipmipollers>
-        <startpollersunreachable type="IntegerField">
-            <Default>1</Default>
-            <Required>N</Required>
-        </startpollersunreachable>
-        <starttrappers type="IntegerField">
-            <Default>5</Default>
-            <Required>N</Required>
-        </starttrappers>
-        <startpingers type="IntegerField">
-            <Default>1</Default>
-            <Required>N</Required>
-        </startpingers>
-        <startdiscoverers type="IntegerField">
-            <Default>1</Default>
-            <Required>N</Required>
-        </startdiscoverers>
-        <startvmwarecollectors type="IntegerField">
-            <Required>N</Required>
-        </startvmwarecollectors>
-        <starthttppollers type="IntegerField">
-            <Default>1</Default>
-            <Required>N</Required>
-        </starthttppollers>
-        <cachesize type="TextField">
-            <Default>8M</Default>
-            <Required>N</Required>
-        </cachesize>
-        <historycachesize type="TextField">
-            <Default>16M</Default>
-            <Required>N</Required>
-        </historycachesize>
-        <historyindexcachesize type="TextField">
-            <Default>4M</Default>
-            <Required>N</Required>
-        </historyindexcachesize>
+        <sourceip type="NetworkField"/>
+        <startpollers type="TextField"/>
+        <startipmipollers type="IntegerField"/>
+        <startpollersunreachable type="IntegerField"/>
+        <starttrappers type="IntegerField"/>
+        <startpingers type="IntegerField"/>
+        <startdiscoverers type="IntegerField"/>
+        <startvmwarecollectors type="IntegerField"/>
+        <starthttppollers type="IntegerField"/>
+        <cachesize type="TextField"/>
+        <historycachesize type="TextField"/>
+        <historyindexcachesize type="TextField"/>
         <proxyofflinebuffer type="IntegerField">
-            <Required>N</Required>
             <MinimumValue>1</MinimumValue>
             <MaximumValue>720</MaximumValue>
             <ValidationMessage>Set a number between 1 and 720.</ValidationMessage>
         </proxyofflinebuffer>
-        <timeout type="IntegerField">
-            <Default>4</Default>
-            <Required>N</Required>
-        </timeout>
-        <configfrequency type="IntegerField">
-            <Required>N</Required>
-        </configfrequency>
-        <datasenderfrequency type="IntegerField">
-            <Required>N</Required>
-        </datasenderfrequency>
+        <timeout type="IntegerField"/>
+        <configfrequency type="IntegerField"/>
+        <datasenderfrequency type="IntegerField"/>
         <statsip type="NetworkField">
-            <Default></Default>
             <FieldSeparator>,</FieldSeparator>
             <AsList>Y</AsList>
-            <Required>N</Required>
         </statsip>
         <syslogEnable type="BooleanField">
             <Default>0</Default>
@@ -133,14 +77,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>
             <Mask>/^[A-Fa-f0-9]{32,512}$/</Mask>
             <ValidationMessage>Should be a hexadecimal string between 32 and 512 characters.</ValidationMessage>
         </encryptionpsk>