From 9004ee48775967d5da952a7d2daccdf13ff1b042 Mon Sep 17 00:00:00 2001
From: Michael <m.muenz@gmail.com>
Date: Thu, 9 Sep 2021 09:53:32 +0200
Subject: [PATCH] net-mgmt/collectd: Add tcpconns and ipstats plugins (#2514)

---
 net-mgmt/collectd/Makefile                           |  3 +--
 net-mgmt/collectd/pkg-descr                          |  5 +++++
 .../controllers/OPNsense/Collectd/forms/general.xml  | 12 ++++++++++++
 .../mvc/app/models/OPNsense/Collectd/General.xml     | 10 +++++++++-
 .../templates/OPNsense/Collectd/collectd.conf        | 10 +++++++++-
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index d4a91d185..8df6de321 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		collectd
-PLUGIN_VERSION=		1.3
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.4
 PLUGIN_COMMENT=		Collect system and application performance metrics periodically
 PLUGIN_DEPENDS=		collectd5
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/net-mgmt/collectd/pkg-descr b/net-mgmt/collectd/pkg-descr
index a350d3e2b..b50a748d9 100644
--- a/net-mgmt/collectd/pkg-descr
+++ b/net-mgmt/collectd/pkg-descr
@@ -7,6 +7,11 @@ in RRD files.
 Plugin Changelog
 ================
 
+1.4
+
+* Add ipstats plugin
+* Add tcpconns plugin
+
 1.3
 
 * Add support for CPU aggregation (contributed by @pmhausen)
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 6e05b7ca8..1826b8b63 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
@@ -191,4 +191,16 @@
         <type>checkbox</type>
         <help>The Users plugin counts the number of users currently logged into the system (SSH).</help>
     </field>
+    <field>
+        <id>general.p_tcpconns</id>
+        <label>Enable tcpconns plugin</label>
+        <type>checkbox</type>
+        <help>The tcpconns plugin lists a summary of all tcp connections.</help>
+    </field>
+    <field>
+        <id>general.p_ipstats</id>
+        <label>Enable ipstats plugin</label>
+        <type>checkbox</type>
+        <help>The ipstats plugin lists multiple interface stats.</help>
+    </field>
 </form>
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 b87d8f5ff..ead3dcf6c 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,7 +1,7 @@
 <model>
     <mount>//OPNsense/collectd/general</mount>
     <description>Collectd configuration</description>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <items>
         <enabled type="BooleanField">
             <default>0</default>
@@ -133,5 +133,13 @@
             <default>1</default>
             <Required>N</Required>
         </p_users_enable>
+        <p_tcpconns type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </p_tcpconns>
+        <p_ipstats type="BooleanField">
+            <default>0</default>
+            <Required>N</Required>
+        </p_ipstats>
     </items>
 </model>
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 15af1eae7..52f58491a 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
@@ -58,7 +58,15 @@ LoadPlugin users
 {% if helpers.exists('OPNsense.collectd.general.p_graphite_enable') and OPNsense.collectd.general.p_graphite_enable == '1' %}
 LoadPlugin write_graphite
 {% endif %}
-
+{% if helpers.exists('OPNsense.collectd.general.p_tcpconns') and OPNsense.collectd.general.p_tcpconns == '1' %}
+LoadPlugin tcpconns
+<Plugin tcpconns>
+       AllPortsSummary true
+</Plugin>
+{% endif %}
+{% if helpers.exists('OPNsense.collectd.general.p_ipstats') and OPNsense.collectd.general.p_ipstats == '1' %}
+LoadPlugin ipstats
+{% endif %}
 ##############################################################################
 # Plugin configuration                                                       #
 #----------------------------------------------------------------------------#