From 282467f55886f40e8b568a7d38f2eb23f7e3f068 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 24 Oct 2017 07:59:01 +0200
Subject: [PATCH] net-mgmt/telegraf: merge version 1.0 from master

---
 net-mgmt/telegraf/Makefile                                     | 3 +--
 .../mvc/app/controllers/OPNsense/Telegraf/forms/output.xml     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 6001637fc..7be1e9ccb 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,8 +1,7 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		1.0
 PLUGIN_COMMENT=		Agent for collecting metrics and data
 PLUGIN_DEPENDS=		telegraf
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
-PLUGIN_DEVEL=           yes
 
 .include "../../Mk/plugins.mk"
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 37c0c2fef..dcfb80fd5 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
@@ -3,7 +3,7 @@
         <id>output.influx_enable</id>
         <label>Enable Influx</label>
         <type>checkbox</type>
-        <help>This will enable InfluxDB as output.</help>
+        <help>This will enable InfluxDB as output. Format is without square brackets, just like http://192.168.0.1:8086.</help>
     </field>
     <field>
         <id>output.influx_url</id>