From 7f59fb561062dc02de42964c4f32d3fe4880d200 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Fri, 4 Aug 2017 09:40:48 +0200
Subject: [PATCH] Collectd: multiple changes as requested in #217 (#218)

---
 net-mgmt/collectd/Makefile                                    | 3 +--
 .../mvc/app/controllers/OPNsense/Collectd/forms/general.xml   | 4 ++--
 .../src/opnsense/mvc/app/models/OPNsense/Collectd/General.xml | 3 ++-
 .../src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 8b8b78ffb..975b33e12 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		collectd
-PLUGIN_VERSION=		0.2
-PLUGIN_REVISION=	2
+PLUGIN_VERSION=		0.3
 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 0b8515e90..4c4c8b5d1 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
@@ -15,7 +15,7 @@
         <id>general.fqdnlookup</id>
         <label>FQDN lookup</label>
         <type>checkbox</type>
-        <help>This will enable the FQDNLookup option.</help>
+        <help>If the hostname is determined automatically this setting controls whether or not the daemon should try to figure out the fully qualified domain name (FQDN). This is done by looking up the name by using gethostname.</help>
     </field>
     <field>
         <id>general.interval</id>
@@ -33,7 +33,7 @@
         <id>general.p_network_host</id>
         <label>Network collector host</label>
         <type>text</type>
-        <help>Set the IP address of the network collector.</help>
+        <help>Set the IP address or FQDN of the network collector.</help>
     </field>
     <field>
         <id>general.p_network_port</id>
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 96c3ba191..fae36b520 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
@@ -12,7 +12,7 @@
 	    <mask>/^.{1,64}$/u</mask>
         </hostname>
         <fqdnlookup type="BooleanField">
-            <default>0</default>
+            <default>1</default>
             <Required>N</Required>
         </fqdnlookup>
         <interval type="IntegerField">
@@ -27,6 +27,7 @@
             <default></default>
             <Required>N</Required>
 	    <mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
+	    <mask>/^([0-9a-zA-Z\-\.]){1,1024}$/u</mask>
         </p_network_host>
         <p_network_port type="IntegerField">
             <default></default>
diff --git a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
index 9e7f95e56..d8dbee8af 100644
--- a/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
+++ b/net-mgmt/collectd/src/opnsense/mvc/app/views/OPNsense/Collectd/general.volt
@@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE.
     {{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}}
     <hr />
     <div class="col-md-12">
-        <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b></button>
+        <button class="btn btn-primary"  id="saveAct" type="button"><b>{{ lang._('Save') }}</b><i id="saveAct_progress" class=""></i></button>
     </div>
 </div>
 
@@ -48,8 +48,10 @@ POSSIBILITY OF SUCH DAMAGE.
         // link save button to API set action
         $("#saveAct").click(function(){
             saveFormToEndpoint(url="/api/collectd/general/set", formid='frm_general_settings',callback_ok=function(){
+                    $("#saveAct_progress").addClass("fa fa-spinner fa-pulse");
                     ajaxCall(url="/api/collectd/service/reconfigure", sendData={}, callback=function(data,status) {
                             ajaxCall(url="/api/collectd/service/status", sendData={}, callback=function(data,status) {
+                                    $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse");
                                     updateServiceStatusUI(data['status']);
                             });
                     });