From d996dcc134fd310f861807029375e3db7dcc8afc Mon Sep 17 00:00:00 2001
From: nan0 <49376203+devNan0@users.noreply.github.com>
Date: Fri, 28 Oct 2022 16:23:27 +0200
Subject: [PATCH] sysutils/apcupsd: Add log view (#3176)

---
 sysutils/apcupsd/Makefile                                   | 2 +-
 sysutils/apcupsd/pkg-descr                                  | 4 ++++
 .../opnsense/mvc/app/models/OPNsense/Apcupsd/Menu/Menu.xml  | 5 +++--
 .../opnsense/service/templates/OPNsense/Apcupsd/+TARGETS    | 1 +
 .../service/templates/OPNsense/Apcupsd/syslog-filter.conf   | 6 ++++++
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/syslog-filter.conf

diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index f4c4662a0..e7999595d 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=        apcupsd
-PLUGIN_VERSION=     1.0
+PLUGIN_VERSION=     1.1
 PLUGIN_DEPENDS=     apcupsd
 PLUGIN_COMMENT=     APCUPSD - APC UPS daemon
 PLUGIN_MAINTAINER=  xbb@xbblabs.com
diff --git a/sysutils/apcupsd/pkg-descr b/sysutils/apcupsd/pkg-descr
index f7613b200..82630562f 100644
--- a/sysutils/apcupsd/pkg-descr
+++ b/sysutils/apcupsd/pkg-descr
@@ -12,6 +12,10 @@ WWW: http://www.apcupsd.org/
 Plugin Changelog
 ================
 
+1.1
+
+* Add log view
+
 1.0 (initial release)
 
 * Apcupsd service control and configuration
diff --git a/sysutils/apcupsd/src/opnsense/mvc/app/models/OPNsense/Apcupsd/Menu/Menu.xml b/sysutils/apcupsd/src/opnsense/mvc/app/models/OPNsense/Apcupsd/Menu/Menu.xml
index 557d3f8ab..a0b3895b0 100644
--- a/sysutils/apcupsd/src/opnsense/mvc/app/models/OPNsense/Apcupsd/Menu/Menu.xml
+++ b/sysutils/apcupsd/src/opnsense/mvc/app/models/OPNsense/Apcupsd/Menu/Menu.xml
@@ -1,8 +1,9 @@
 <menu>
     <Services>
         <Apcupsd cssClass="fa fa-battery-full fa-fw">
-            <Settings url="/ui/apcupsd" />
-            <Status url="/ui/apcupsd/status" />
+            <Settings order="10" url="/ui/apcupsd" />
+            <Status order="20" url="/ui/apcupsd/status" />
+            <LogFile VisibleName="Log File" order="30" url="/ui/diagnostics/log/core/apcupsd"/>
         </Apcupsd>
     </Services>
 </menu>
diff --git a/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/+TARGETS b/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/+TARGETS
index 3ad405f59..fc80c3aa8 100644
--- a/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/+TARGETS
+++ b/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/+TARGETS
@@ -1,2 +1,3 @@
 apcupsd:/etc/rc.conf.d/apcupsd
 apcupsd.conf:/usr/local/etc/apcupsd/apcupsd.conf
+syslog-filter.conf:/usr/local/opnsense/service/templates/OPNsense/Syslog/local/apcupsd.conf
diff --git a/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/syslog-filter.conf b/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/syslog-filter.conf
new file mode 100644
index 000000000..16b8a217a
--- /dev/null
+++ b/sysutils/apcupsd/src/opnsense/service/templates/OPNsense/Apcupsd/syslog-filter.conf
@@ -0,0 +1,6 @@
+###################################################################
+# Local syslog-ng configuration filter definition [apcupsd].
+###################################################################
+filter f_local_apcupsd {
+    program("apcupsd");
+};