From 26e6379874d56190e409c07c37cb12a58679c1ff Mon Sep 17 00:00:00 2001
From: Malte Rabenseifner <mail@malte-rabenseifner.de>
Date: Fri, 29 Mar 2024 10:53:29 +0100
Subject: [PATCH] net-mgmt/zabbix-proxy: Add logging options (#3711)

---
 .../OPNsense/Zabbixproxy/forms/general.xml    | 19 +++++++++++++++
 .../models/OPNsense/Zabbixproxy/General.xml   | 24 ++++++++++++++++++-
 .../OPNsense/Zabbixproxy/zabbix_proxy.conf.in | 11 +++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

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 168f981c3..efef9db91 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
@@ -153,6 +153,25 @@
         <allownew>true</allownew>
         <help>IP address of host allowed to retrieve proxy statistics.</help>
     </field>
+    <field>
+        <id>general.syslogEnable</id>
+        <label>Log To Syslog</label>
+        <type>checkbox</type>
+        <help>Use syslog instead of logging to a file.</help>
+    </field>
+    <field>
+        <id>general.logFileSize</id>
+        <label>Log File Size</label>
+        <type>text</type>
+        <help>Maximum size of log file (in MB).</help>
+        <advanced>true</advanced>
+    </field>
+    <field>
+        <id>general.debugLevel</id>
+        <label>Debug Level</label>
+        <type>dropdown</type>
+        <help>Specifies the debug level for the proxy.</help>
+    </field>
     <field>
         <id>general.encryption</id>
         <label>PSK based encryption</label>
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 ab55fb06c..e9a060522 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
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/zabbixproxy/general</mount>
     <description>Zabbix Proxy configuration</description>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -106,6 +106,28 @@
             <asList>Y</asList>
             <Required>N</Required>
         </statsip>
+        <syslogEnable type="BooleanField">
+            <default>0</default>
+            <Required>Y</Required>
+        </syslogEnable>
+        <logFileSize type="IntegerField">
+            <default>100</default>
+            <MinimumValue>1</MinimumValue>
+            <MaximumValue>1024</MaximumValue>
+            <Required>Y</Required>
+        </logFileSize>
+        <debugLevel type="OptionField">
+            <default>val_3</default>
+            <OptionValues>
+                <val_0>basic information (0)</val_0>
+                <val_1>critical information (1)</val_1>
+                <val_2>error information (2)</val_2>
+                <val_3>warnings (3, default)</val_3>
+                <val_4>debugging (4)</val_4>
+                <val_5>extended debugging (5)</val_5>
+            </OptionValues>
+            <Required>Y</Required>
+        </debugLevel>
         <encryption type="BooleanField">
             <default>0</default>
             <Required>Y</Required>
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in
index 3ee03b5dc..23d9f5cb3 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in
+++ b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in
@@ -25,7 +25,18 @@ ListenPort={{ OPNsense.zabbixproxy.general.listenport }}
 {% if helpers.exists('OPNsense.zabbixproxy.general.sourceip') and OPNsense.zabbixproxy.general.sourceip != '' %}
 SourceIP={{ OPNsense.zabbixproxy.general.sourceip }}
 {% endif %}
+{% if helpers.exists('OPNsense.zabbixproxy.general.syslogEnable') and OPNsense.zabbixproxy.general.syslogEnable == '1' %}
+LogType=system
+{% else %}
+LogType=file
 LogFile=/var/log/zabbix/zabbix_proxy.log
+{% if helpers.exists('OPNsense.zabbixproxy.general.logFileSize') %}
+LogFileSize={{OPNsense.zabbixproxy.general.logFileSize}}
+{% endif %}
+{% endif %}
+{% if helpers.exists('OPNsense.zabbixproxy.general.debugLevel')
+DebugLevel={{OPNsense.zabbixproxy.general.debugLevel|replace("val_", "")}}
+{% endif %}
 PidFile=/var/run/zabbix/zabbix_proxy.pid
 DBName=/var/db/zabbix/%%PLUGIN_VARIANT%%_proxy.db
 {% if helpers.exists('OPNsense.zabbixproxy.general.proxyofflinebuffer') and OPNsense.zabbixproxy.general.proxyofflinebuffer != '' %}