From 7b3a87bda2b028deda89c44b44fcd86fa6ad050a Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 29 May 2018 09:07:04 +0200
Subject: [PATCH] net-mgmt/telegraf: merge version 1.4.0 from master

---
 net-mgmt/telegraf/Makefile                                  | 2 +-
 .../mvc/app/controllers/OPNsense/Telegraf/forms/output.xml  | 6 ++++++
 .../opnsense/mvc/app/models/OPNsense/Telegraf/Output.xml    | 6 +++++-
 .../service/templates/OPNsense/Telegraf/telegraf.conf       | 4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index cdb9d0384..fc1933f0c 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.3.1
+PLUGIN_VERSION=		1.4.0
 PLUGIN_COMMENT=		Agent for collecting metrics and data
 PLUGIN_DEPENDS=		telegraf
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
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 f932289ee..f87ecb7af 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
@@ -59,6 +59,12 @@
         <type>text</type>
         <help>Use a specific output template. For usage see https://github.com/influxdata/telegraf/blob/master/docs/DATA_FORMATS_OUTPUT.md</help>
     </field>
+    <field>
+        <id>output.graphite_verify</id>
+        <label>Graphite SSL Verification</label>
+        <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.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 282183cf6..1cf868394 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.1.0</version>
+    <version>1.2.0</version>
     <items>
         <influx_enable type="BooleanField">
             <default>0</default>
@@ -40,6 +40,10 @@
         <graphite_template type="TextField">
             <Required>N</Required>
         </graphite_template>
+        <graphite_verify type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </graphite_verify>
         <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 d9b96b704..fb295f508 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
@@ -69,7 +69,11 @@
   template = "{{ OPNsense.telegraf.output.graphite_template }}"
 {%   endif %}
   timeout = 2
+{%   if helpers.exists('OPNsense.telegraf.output.graphite_verify') and OPNsense.telegraf.output.graphite_verify == '0' %}
   insecure_skip_verify = true
+{%   else %}
+  insecure_skip_verify = false
+{%   endif %}
 {% endif %}
 
 {% if helpers.exists('OPNsense.telegraf.output.graylog_enable') and OPNsense.telegraf.output.graylog_enable == '1' %}