From fe0392a9f36c784ac4619df773bff8991da4dd47 Mon Sep 17 00:00:00 2001
From: nan0 <49376203+devNan0@users.noreply.github.com>
Date: Thu, 27 Oct 2022 15:05:45 +0200
Subject: [PATCH] net-mgmt/telegraf: Add apcupsd input (#3177)

---
 net-mgmt/telegraf/Makefile                           |  2 +-
 net-mgmt/telegraf/pkg-descr                          |  4 ++++
 .../controllers/OPNsense/Telegraf/forms/input.xml    | 12 ++++++++++++
 .../mvc/app/models/OPNsense/Telegraf/Input.xml       |  6 ++++++
 .../templates/OPNsense/Telegraf/telegraf.conf        |  6 ++++++
 5 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index a0f9033a4..509109d36 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.12.5
+PLUGIN_VERSION=		1.12.6
 PLUGIN_COMMENT=		Agent for collecting metrics and data
 PLUGIN_DEPENDS=		telegraf
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/telegraf/pkg-descr b/net-mgmt/telegraf/pkg-descr
index 39bc8d608..a98a0c459 100644
--- a/net-mgmt/telegraf/pkg-descr
+++ b/net-mgmt/telegraf/pkg-descr
@@ -12,6 +12,10 @@ WWW: https://www.influxdata.com/time-series-platform/telegraf/
 Plugin Changelog
 ================
 
+1.12.6
+
+* Add apcupsd input
+
 1.12.5
 
 * Add support for basic HTTP Authentication agains Elasticsearch (contributed by psychogun)
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
index d33e5e273..8d7994718 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
@@ -179,4 +179,16 @@
         <type>checkbox</type>
         <help>Enable the collection of Unbound metrics.</help>
     </field>
+    <field>
+        <id>input.apcupsd</id>
+        <label>Apcupsd</label>
+        <type>checkbox</type>
+        <help>Enable the collection of apcupsd metrics.</help>
+    </field>
+    <field>
+        <id>input.apcupsd_server</id>
+        <label>Apcupsd Netserver IP Address</label>
+        <type>text</type>
+        <help>IP address or hostname of the apcupsd net information server. Default address is 127.0.0.1</help>
+    </field>
 </form>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml
index f85b74a24..95e8efdf8 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Input.xml
@@ -114,5 +114,11 @@
         <unbound type="BooleanField">
             <Required>N</Required>
         </unbound>
+        <apcupsd type="BooleanField">
+            <Required>N</Required>
+        </apcupsd>
+        <apcupsd_server type="TextField">
+            <Required>N</Required>
+        </apcupsd_server>
     </items>
 </model>
diff --git a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
index 619f0f6d6..6991423d1 100644
--- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
+++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf.conf
@@ -303,4 +303,10 @@
    timeout = "5s"
 {% endif %}
 
+{% if helpers.exists('OPNsense.telegraf.input.apcupsd') and OPNsense.telegraf.input.apcupsd == '1' %}
+[[inputs.apcupsd]]
+  servers = ["tcp://{{ OPNsense.telegraf.input.apcupsd_server|default('127.0.0.1') }}:3551"]
+  timeout = "5s"
+{% endif %}
+
 {% endif %}