From 834ef3b2e26dbf00cdb35fe9217268a090ac2f2c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 21 Dec 2021 17:54:35 +0100
Subject: [PATCH] Monit - move logging to own log target. closes
 https://github.com/opnsense/core/issues/5422

---
 src/etc/inc/plugins.inc.d/monit.inc                        | 7 +++++++
 src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml   | 1 +
 .../service/templates/OPNsense/Syslog/local/monit.conf     | 6 ++++++
 3 files changed, 14 insertions(+)
 create mode 100644 src/opnsense/service/templates/OPNsense/Syslog/local/monit.conf

diff --git a/src/etc/inc/plugins.inc.d/monit.inc b/src/etc/inc/plugins.inc.d/monit.inc
index 7ee6f8787..048047e1c 100644
--- a/src/etc/inc/plugins.inc.d/monit.inc
+++ b/src/etc/inc/plugins.inc.d/monit.inc
@@ -70,3 +70,10 @@ function monit_xmlrpc_sync()
 
     return $result;
 }
+
+function monit_syslog()
+{
+    $logfacilities = [];
+    $logfacilities['monit'] = ['facility' => ['monit']];
+    return $logfacilities;
+}
diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml
index 39a9defcd..44be34e2f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Menu/Menu.xml
@@ -3,6 +3,7 @@
       <Monit cssClass="fa fa-heartbeat fa-fw">
          <Settings url="/ui/monit"/>
          <Status url="/ui/monit/status"/>
+         <Log order="100" VisibleName="Log File" url="/ui/diagnostics/log/core/monit" />
       </Monit>
    </Services>
 </menu>
diff --git a/src/opnsense/service/templates/OPNsense/Syslog/local/monit.conf b/src/opnsense/service/templates/OPNsense/Syslog/local/monit.conf
new file mode 100644
index 000000000..ff8277a99
--- /dev/null
+++ b/src/opnsense/service/templates/OPNsense/Syslog/local/monit.conf
@@ -0,0 +1,6 @@
+###################################################################
+# Local syslog-ng configuration filter definition [monit].
+###################################################################
+filter f_local_monit {
+    program("monit");
+};