From 72071b7dc5866165b3f1fcb3119dd4a439b9aa41 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 3 Sep 2018 08:14:36 +0200
Subject: [PATCH] net-mgmt/telegraf: release 1.5.1

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

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 7bacbcd9d..06a8f497b 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.5.0
+PLUGIN_VERSION=		1.5.1
 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/input.xml b/net-mgmt/telegraf/src/opnsense/mvc/app/controllers/OPNsense/Telegraf/forms/input.xml
index aa708d17d..a9d55c3fc 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
@@ -38,7 +38,9 @@
     <field>
         <id>input.disk_ignore_fs</id>
         <label>Disk Ignore FS</label>
-        <type>text</type>
+        <style>tokenize</style>
+        <type>select_multiple</type>
+        <allownew>true</allownew>
         <help>Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually present on /run, /var/run, /dev/shm or /dev).</help>
     </field>
     <field>
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 bb3a65eca..dfb2e2465 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
@@ -27,7 +27,7 @@
             <default></default>
             <Required>N</Required>
         </disk_mount_points>
-        <disk_ignore_fs type="TextField">
+        <disk_ignore_fs type="CSVListField">
             <default></default>
             <Required>N</Required>
         </disk_ignore_fs>
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 596167543..8a7e66360 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
@@ -121,7 +121,7 @@
   mount_points = ["{{ OPNsense.telegraf.input.disk_mount_points }}"]
 {%   endif %}
 {%   if helpers.exists('OPNsense.telegraf.input.disk_ignore_fs') and OPNsense.telegraf.input.disk_ignore_fs != '' %}
-  ignore_fs = ["{{ OPNsense.telegraf.input.disk_ignore_fs }}"]
+  ignore_fs = [{{ "'" + ("','".join(OPNsense.telegraf.input.disk_ignore_fs.split(','))) + "'" }}]
 {%   endif %}
 {% endif %}