From 2a5bb93007bb7092e2f85555b84b71409adeab84 Mon Sep 17 00:00:00 2001
From: "Bradlee H. Edmondson" <bradleeedmondson@users.noreply.github.com>
Date: Sun, 11 Jul 2021 08:32:02 -0400
Subject: [PATCH] net-mgmt/zabbix-agent: add syslog option (#2348)

* zabbix_agentd.conf: handle enableSyslog condition

zabbix_agentd.conf: Write 'system' for logging to syslog or 'file' (plus file options) for logging to file

* ZabbixAgent.xml: add syslogEnable option

* settings.xml: describe option for enabling syslog
---
 .../controllers/OPNsense/ZabbixAgent/forms/settings.xml  | 7 +++++++
 .../mvc/app/models/OPNsense/ZabbixAgent/ZabbixAgent.xml  | 4 ++++
 .../templates/OPNsense/ZabbixAgent/zabbix_agentd.conf    | 9 ++++++++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
index 8618b5378..0ec47135a 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
+++ b/net-mgmt/zabbix-agent/src/opnsense/mvc/app/controllers/OPNsense/ZabbixAgent/forms/settings.xml
@@ -41,6 +41,13 @@
             <allownew>true</allownew>
             <help><![CDATA[List of IP addresses (or hostnames) of Zabbix servers. Incoming connections will be accepted only from the hosts listed here.]]></help>
         </field>
+        <field>
+            <id>zabbixagent.settings.main.syslogEnable</id>
+            <label>Log to syslog</label>
+            <type>text</type>
+            <help><![CDATA[Use syslog, instead of logging to file.]]></help>
+            <advanced>true</advanced>
+        </field>
         <field>
             <id>zabbixagent.settings.main.logFileSize</id>
             <label>Log File Size</label>
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 aebf63777..4786605fd 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
@@ -45,6 +45,10 @@
                     <mask>/^.{1,255}$/u</mask>
                     <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
                 </sourceIP>
+                <syslogEnable type="BooleanField">
+                    <default>0</default>
+                    <Required>N</Required>
+                </syslogEnable>
                 <logFileSize type="IntegerField">
                     <default>100</default>
                     <MinimumValue>1</MinimumValue>
diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
index 9a258e07a..d38321723 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
+++ b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
@@ -7,10 +7,17 @@
 ############ GENERAL PARAMETERS #################
 
 PidFile=/var/run/zabbix/zabbix_agentd.pid
+
+
+{% if helpers.exists('OPNsense.ZabbixAgent.settings.main.syslogEnable') and OPNsense.ZabbixAgent.settings.main.syslogEnable|default('0') == '1' %}
+LogType=system
+{% else %}
 LogType=file
 LogFile=/var/log/zabbix/zabbix_agentd.log
-
 LogFileSize={{OPNsense.ZabbixAgent.settings.main.logFileSize}}
+{% endif %}
+
+
 DebugLevel={{OPNsense.ZabbixAgent.settings.main.debugLevel|replace("val_", "")}}
 
 {% if helpers.exists('OPNsense.ZabbixAgent.settings.main.sourceIP') %}