From c21446b79b17208bed77b7167e075b7879c44737 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 4 Oct 2017 08:31:47 +0200
Subject: [PATCH] net-mgmt/collectd: merge version 1.1 from master

---
 net-mgmt/collectd/Makefile                           |  2 +-
 .../controllers/OPNsense/Collectd/forms/general.xml  | 12 ++++++++++++
 .../mvc/app/models/OPNsense/Collectd/General.xml     |  9 +++++++++
 .../templates/OPNsense/Collectd/collectd.conf        |  8 ++++++--
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 4f70be1e88..c4f0001d35 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		collectd
-PLUGIN_VERSION=		1.0
+PLUGIN_VERSION=		1.1
 PLUGIN_COMMENT=		Collect system and application performance metrics periodically
 PLUGIN_DEPENDS=		collectd5
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml
index 4c4c8b5d15..3e588da00f 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/controllers/OPNsense/Collectd/forms/general.xml
@@ -83,6 +83,18 @@
         <type>text</type>
         <help>Set the port of the graphite collector, Graphite is using 2003 per default.</help>
     </field>
+    <field>
+        <id>general.p_graphite_prefix</id>
+        <label>Graphite Prefix</label>
+        <type>text</type>
+        <help>Prefix to set before the hostname. If it ends with a dot it creates an own directory.</help>
+    </field>
+    <field>
+        <id>general.p_graphite_postfix</id>
+        <label>Graphite Postfix</label>
+        <type>text</type>
+        <help>String to set after the hostname. For compatibility reason default is collectd, but you can also simply remove it.</help>
+    </field>
     <field>
         <id>general.p_contextswitch_enable</id>
         <label>Enable contextswitch plugin</label>
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
index fae36b520c..c7dc384c19 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml
@@ -1,6 +1,7 @@
 <model>
     <mount>//OPNsense/collectd/general</mount>
     <description>Collectd configuration</description>
+    <version>1.0.0</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -68,6 +69,14 @@
 	    <MinimumValue>1</MinimumValue>
 	    <MaximumValue>65535</MaximumValue>
         </p_graphite_port>
+        <p_graphite_prefix type="TextField">
+            <default>collectd</default>
+            <Required>N</Required>
+        </p_graphite_prefix>
+        <p_graphite_postfix type="TextField">
+            <default>collectd</default>
+            <Required>N</Required>
+        </p_graphite_postfix>
         <p_contextswitch_enable type="BooleanField">
             <default>1</default>
             <Required>N</Required>
diff --git a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
index 4e578e0197..81e9781148 100644
--- a/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
+++ b/net-mgmt/collectd/src/opnsense/service/templates/OPNsense/Collectd/collectd.conf
@@ -94,8 +94,12 @@ LoadPlugin write_graphite
     Protocol "tcp"
     ReconnectInterval 0
     LogSendErrors true
-    Prefix "collectd"
-    Postfix "collectd"
+{%     if helpers.exists('OPNsense.collectd.general.p_graphite_prefix') and OPNsense.collectd.general.p_graphite_prefix != '' %}
+    Prefix "{{ OPNsense.collectd.general.p_graphite_prefix }}"
+{%     endif %}
+{%     if helpers.exists('OPNsense.collectd.general.p_graphite_postfix') and OPNsense.collectd.general.p_graphite_postfix != '' %}
+    Postfix "{{ OPNsense.collectd.general.p_graphite_postfix }}"
+{%     endif %}
     StoreRates true
     AlwaysAppendDS false
     EscapeCharacter "_"