From 7268f7719923760ae4b2ce99311549264ff945c8 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 14 Mar 2019 08:28:13 +0100
Subject: [PATCH] net-mgmt/telegraf: add graphite tag support (#1253)

---
 net-mgmt/telegraf/Makefile                               | 3 +--
 net-mgmt/telegraf/pkg-descr                              | 9 +++++++++
 .../app/controllers/OPNsense/Telegraf/forms/output.xml   | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml | 6 +++++-
 .../service/templates/OPNsense/Telegraf/telegraf.conf    | 3 +++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 594b8be03..c83262afa 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.7.4
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.7.5
 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 b2d0aee11..2cdb28f10 100644
--- a/net-mgmt/telegraf/pkg-descr
+++ b/net-mgmt/telegraf/pkg-descr
@@ -7,4 +7,13 @@ metrics to a variety of other datastores, services, and message
 queues, including InfluxDB, Graphite, OpenTSDB, Datadog, Librato,
 Kafka, MQTT, NSQ, and many others.
 
+
+Plugin Changelog
+================
+
+1.7.5
+
+* Add Graphite tag support
+
+
 WWW: https://www.influxdata.com/time-series-platform/telegraf/
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
index 6da1ce813..f338190c9 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/output.xml
@@ -65,6 +65,12 @@
         <type>checkbox</type>
         <help>This will enable verification of a secure connection to Graphite. Default is disabled for compatibility reasons.</help>
     </field>
+    <field>
+        <id>output.graphite_tagsupport</id>
+        <label>Graphite Tag Support</label>
+        <type>checkbox</type>
+        <help>This will enable support for tags.</help>
+    </field>
     <field>
         <id>output.graylog_enable</id>
         <label>Enable Graylog Output</label>
diff --git a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
index a188c8d32..f50f3755e 100644
--- a/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
+++ b/net-mgmt/telegraf/src/opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/telegraf/output</mount>
     <description>Telegraf outputs configuration</description>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <items>
         <influx_enable type="BooleanField">
             <default>0</default>
@@ -44,6 +44,10 @@
             <default>0</default>
             <Required>N</Required>
         </graphite_verify>
+        <graphite_tagsupport type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </graphite_tagsupport>
         <graylog_enable type="BooleanField">
             <default>0</default>
             <Required>N</Required>
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 c45e8bf48..8f6acb27c 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
@@ -81,6 +81,9 @@
 {%   else %}
   insecure_skip_verify = false
 {%   endif %}
+{%   if helpers.exists('OPNsense.telegraf.output.graphite_tagsupport') and OPNsense.telegraf.output.graphite_tagsupport == '1' %}
+  graphite_tag_support = true
+{%   endif %}
 {% endif %}
 
 {% if helpers.exists('OPNsense.telegraf.output.graylog_enable') and OPNsense.telegraf.output.graylog_enable == '1' %}