From 689d53abfd3e5794f0928ead26c9e3a41e6b9eee Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Sat, 30 Oct 2021 16:31:49 -0500
Subject: [PATCH] r/collectd: Disable network plugin by default

The default configuration for *collectd* no longer needs the network
plugin enabled, as hosts are scraped directly by Prometheus now.
---
 roles/collectd/defaults/main.yml                  | 5 ++---
 roles/collectd/templates/collectd-network.conf.j2 | 2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/collectd/defaults/main.yml b/roles/collectd/defaults/main.yml
index d0f9cf3..747cdfc 100644
--- a/roles/collectd/defaults/main.yml
+++ b/roles/collectd/defaults/main.yml
@@ -1,7 +1,6 @@
 collectd_default_config: true
-collectd_load_network_plugin: true
-collectd_network_servers:
-- ff18::efc0:4a42
+collectd_load_network_plugin: false
+collectd_network_servers: []
 collectd_network_listen: []
 
 collectd_disable_plugins: []
diff --git a/roles/collectd/templates/collectd-network.conf.j2 b/roles/collectd/templates/collectd-network.conf.j2
index 27654bd..b0322e0 100644
--- a/roles/collectd/templates/collectd-network.conf.j2
+++ b/roles/collectd/templates/collectd-network.conf.j2
@@ -2,6 +2,7 @@
 LoadPlugin network
 
 {% endif %}
+{% if collectd_network_servers or collectd_network_listen %}
 <Plugin network>
 {% for server in collectd_network_servers %}
 {% if server is string %}
@@ -22,3 +23,4 @@ LoadPlugin network
 {% endif %}
 {% endfor %}
 </Plugin>
+{% endif %}