From 2cb55cb5b27c6fb6bff21eede79cd615c79dff18 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 3 Jun 2021 13:16:21 +0200
Subject: [PATCH] net-mgmt/telegraf: add telegraf.d as config include (#2413)

---
 net-mgmt/telegraf/Makefile                                  | 2 +-
 net-mgmt/telegraf/pkg-descr                                 | 4 ++++
 .../src/opnsense/scripts/OPNsense/Telegraf/setup.sh         | 6 +++---
 .../opnsense/service/templates/OPNsense/Telegraf/telegraf   | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index 9aa85c02c..c8732d79c 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		telegraf
-PLUGIN_VERSION=		1.10.1
+PLUGIN_VERSION=		1.11.0
 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 9cacb5cf5..b36867f33 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.11.0
+
+* Set telegraf.d as additional config include
+
 1.10.1
 
 * Fix Suricata input controller being the output section and incorrect statement
diff --git a/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh b/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh
index 3a59faffa..c18039d0b 100755
--- a/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh
+++ b/net-mgmt/telegraf/src/opnsense/scripts/OPNsense/Telegraf/setup.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-mkdir -p /var/log/telegraf
-chown -R telegraf:telegraf /var/log/telegraf
-chmod 750 /var/log/telegraf
+mkdir -p /usr/local/etc/telegraf.d /var/log/telegraf
+chown -R telegraf:telegraf /usr/local/etc/telegraf.d /var/log/telegraf
+chmod 750 /usr/local/etc/telegraf.d /var/log/telegraf
 
 /usr/sbin/pw groupmod proxy -m telegraf
diff --git a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf
index 57f13d58e..193a97c65 100644
--- a/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf
+++ b/net-mgmt/telegraf/src/opnsense/service/templates/OPNsense/Telegraf/telegraf
@@ -1,6 +1,7 @@
 {% if helpers.exists('OPNsense.telegraf.general.enabled') and OPNsense.telegraf.general.enabled == '1' %}
 telegraf_var_script="/usr/local/opnsense/scripts/OPNsense/Telegraf/setup.sh"
 telegraf_enable="YES"
+telegraf_confdir="/usr/local/etc/telegraf.d"
 {% else %}
 telegraf_enable="NO"
 {% endif %}