Collectd: cleanup collectd everywhere except FMN

Signed-off-by: Greg Sutcliffe <fedora@emeraldreverie.org>

inventory/group_vars/all

@@ -36,8 +36,6 @@ baseiptables: True
 become: false
 br0_nm: 255.255.255.0
 br1_nm: 255.255.255.0
-# assume collectd apache
-collectd_apache: true
 # communishift project resource overrides
 communishift_projects:
   # please keep these sorted alphabetically for readability

inventory/group_vars/cloud_hardware

@@ -1,5 +1,4 @@
 ---
-collectd_apache: false
 freezes: false
 nagios_Check_Services:
   nrpe: true

inventory/group_vars/proxies

@@ -2,7 +2,6 @@
 # Define resources for this group of hosts here.
 blocked_ip_v6: []
 blocked_ips: ['14.102.69.78', '104.219.54.236', '103.38.177.2', '110.172.140.98', '183.80.131.253', '113.190.178.137', '115.76.39.108', '116.109.31.204', '209.64.155.56']
-collectd_apache: true
 # For the MOTD
 custom_rules: [
   # Need for rsync from log01 for logs.

inventory/group_vars/proxies_stg

@@ -1,6 +1,5 @@
 ---
 # Define resources for this group of hosts here.
-collectd_apache: true
 # For the MOTD
 custom_rules: [
   # Need for rsync from log01 for logs.

inventory/host_vars/db-datanommer01.stg.rdu3.fedoraproject.org

@@ -1,5 +1,5 @@
 ---
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - datanommer
 datacenter: rdu3

inventory/host_vars/db-datanommer02.rdu3.fedoraproject.org

@@ -1,5 +1,5 @@
 ---
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - datanommer
 datacenter: rdu3

inventory/host_vars/db-fas01.rdu3.fedoraproject.org

@@ -15,7 +15,7 @@ nft_custom_rules:
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.105 tcp dport 5432 counter accept'
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.106 tcp dport 5432 counter accept'
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.117 tcp dport 5432 counter accept'
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - fas2
   - ipsilon

inventory/host_vars/db-fas01.stg.rdu3.fedoraproject.org

@@ -6,7 +6,7 @@
 # TODO: lock it down more
 nft_custom_rules:
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.166.0/24 tcp dport 5432 counter accept'
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - fas2
 datacenter: rdu3

inventory/host_vars/db-koji01.rdu3.fedoraproject.org

@@ -7,7 +7,7 @@ nft_custom_rules:
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.169.105 tcp dport 5432 counter accept'
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.169.10  tcp dport 5432 counter accept'
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.163.10  tcp dport 5432 counter accept'
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - koji
 datacenter: rdu3

inventory/host_vars/db-koji01.stg.rdu3.fedoraproject.org

@@ -3,7 +3,7 @@
 # Only allow postgresql access from the frontend node.
 #
 nft_custom_rules: ['add rule {{nft_table_filter}} INPUT ip saddr 10.16.167.64 tcp dport 5432 counter accept']
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - koji
 datacenter: rdu3

inventory/host_vars/db-openqa01.rdu3.fedoraproject.org

@@ -1,5 +1,5 @@
 ---
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - postgres
   - openqa

inventory/host_vars/db-riscv-koji01.rdu3.fedoraproject.org

@@ -1,5 +1,5 @@
 ---
-# This is a generic list, monitored by collectd
+# This is a generic list
 custom_rules: ['-A INPUT -p tcp -m tcp -s 10.16.172.21 --dport 5432 -j ACCEPT']
 nft_custom_rules:
   - 'add rule {{nft_table_filter}} INPUT ip saddr 10.16.172.21 tcp dport 5432 counter accept'

inventory/host_vars/db.stg.aws.fedoraproject.org

@@ -3,7 +3,7 @@ ansible_become: yes
 ansible_become_user: root
 ansible_user: ec2-user
 root_auth_users: msuchy
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - coprdb
 db_backup_dir: ['/backups']

inventory/host_vars/db01.rdu3.fedoraproject.org

@@ -3,7 +3,7 @@
 # We should narrow this down at some point
 #
 nft_custom_rules: ['add rule {{nft_table_filter}} INPUT tcp dport 5432 counter accept']
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - anitya
   - blockerbugs

inventory/host_vars/db01.stg.rdu3.fedoraproject.org

@@ -3,7 +3,7 @@
 # We should narrow this down at some point
 #
 nft_custom_rules: ['add rule {{nft_table_filter}} INPUT tcp dport 5432 counter accept']
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - askfedora
   - blockerbugs

inventory/host_vars/db03.rdu3.fedoraproject.org

@@ -1,5 +1,5 @@
 ---
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - mysql
   - fpo-mediawiki

inventory/host_vars/db03.stg.rdu3.fedoraproject.org

@@ -1,5 +1,5 @@
 ---
-# This is a generic list, monitored by collectd
+# This is a generic list
 databases:
   - postgres
 datacenter: rdu3

inventory/inventory

@@ -663,7 +663,7 @@ zabbix01.stg.rdu3.fedoraproject.org
 
 # This is a list of hosts that are a little "friendly" with staging.
 # They are exempted from the iptables wall between staging and prod.
-# For instance, staging needs to send collectd logs to log01 and smtp mail data
+# For instance, staging needs to send smtp mail data
 # to bastion (both of which are prod boxen).
 [staging_friendly]
 noc01.rdu3.fedoraproject.org