diff --git a/inventory/group_vars/staging b/inventory/group_vars/staging index d298da88b5..978c4023f0 100644 --- a/inventory/group_vars/staging +++ b/inventory/group_vars/staging @@ -16,9 +16,6 @@ os_wildcard_cert_file: wildcard-2017.app.os.stg.fedoraproject.org.cert os_wildcard_key_file: wildcard-2017.app.os.stg.fedoraproject.org.key os_wildcard_int_file: wildcard-2017.stg.fedoraproject.org.intermediate.cert -# This only does anything if the host is not RHEL6 -collectd_graphite: True - fedmsg_prefix: org.fedoraproject fedmsg_env: stg diff --git a/inventory/host_vars/bastion13.fedoraproject.org b/inventory/host_vars/bastion13.fedoraproject.org index 358ab815ab..e836b0d196 100644 --- a/inventory/host_vars/bastion13.fedoraproject.org +++ b/inventory/host_vars/bastion13.fedoraproject.org @@ -29,5 +29,4 @@ mem_size: 16384 max_mem_size: 32768 num_cpus: 8 -collectd_graphite: True fas_client_groups: sysadmin-main diff --git a/inventory/host_vars/batcave13.rdu2.fedoraproject.org b/inventory/host_vars/batcave13.rdu2.fedoraproject.org index 31eabae7ca..e4e59dc8f1 100644 --- a/inventory/host_vars/batcave13.rdu2.fedoraproject.org +++ b/inventory/host_vars/batcave13.rdu2.fedoraproject.org @@ -38,6 +38,5 @@ mem_size: 16384 max_mem_size: 32768 num_cpus: 8 -collectd_graphite: True ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q root@bastion13.fedoraproject.org"' fas_client_groups: sysadmin-main diff --git a/inventory/host_vars/beaker-stg01.qa.fedoraproject.org b/inventory/host_vars/beaker-stg01.qa.fedoraproject.org index e87345a23e..5dd94ed023 100644 --- a/inventory/host_vars/beaker-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/beaker-stg01.qa.fedoraproject.org @@ -11,7 +11,6 @@ vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 fas_client_groups: sysadmin-qa,sysadmin-main collectd_apache: "" -collectd_graphite: "" # it'd be nice to have this done automagically but I don't know of a reasonable easy way to do that beaker_virthost_signatures: diff --git a/inventory/host_vars/beaker01.qa.fedoraproject.org b/inventory/host_vars/beaker01.qa.fedoraproject.org index 61196d23b2..0353ecf493 100644 --- a/inventory/host_vars/beaker01.qa.fedoraproject.org +++ b/inventory/host_vars/beaker01.qa.fedoraproject.org @@ -10,7 +10,6 @@ eth0_nm: 255.255.255.128 vmhost: virthost-comm03.qa.fedoraproject.org datacenter: phx2 collectd_apache: "" -collectd_graphite: "" # it'd be nice to have this done automagically but I don't know of a reasonable easy way to do that beaker_virthost_signatures: diff --git a/inventory/host_vars/ns03.phx2.fedoraproject.org b/inventory/host_vars/ns03.phx2.fedoraproject.org index 8712621ef5..d920bdc9a0 100644 --- a/inventory/host_vars/ns03.phx2.fedoraproject.org +++ b/inventory/host_vars/ns03.phx2.fedoraproject.org @@ -10,8 +10,6 @@ eth0_ip: 10.5.126.21 vmhost: virthost21.phx2.fedoraproject.org datacenter: phx2 -collectd_graphite: True - csi_relationship: | ns03 is a master dns server. diff --git a/inventory/host_vars/ns04.phx2.fedoraproject.org b/inventory/host_vars/ns04.phx2.fedoraproject.org index 034131cf44..1279af13e0 100644 --- a/inventory/host_vars/ns04.phx2.fedoraproject.org +++ b/inventory/host_vars/ns04.phx2.fedoraproject.org @@ -10,8 +10,6 @@ eth0_ip: 10.5.126.22 vmhost: virthost15.phx2.fedoraproject.org datacenter: phx2 -collectd_graphite: True - csi_relationship: | ns04 is a master dns server. diff --git a/inventory/host_vars/ns13.rdu2.fedoraproject.org b/inventory/host_vars/ns13.rdu2.fedoraproject.org index 4e7d35244a..42d5ae003e 100644 --- a/inventory/host_vars/ns13.rdu2.fedoraproject.org +++ b/inventory/host_vars/ns13.rdu2.fedoraproject.org @@ -24,7 +24,6 @@ vpn: false nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 -collectd_graphite: True ansible_ssh_common_args: '-o ProxyCommand="ssh -W %h:%p -q root@bastion13.fedoraproject.org"' nagios_Check_Services: diff --git a/inventory/host_vars/proxy01.phx2.fedoraproject.org b/inventory/host_vars/proxy01.phx2.fedoraproject.org index b5646b51f8..45a21dfb05 100644 --- a/inventory/host_vars/proxy01.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy01.phx2.fedoraproject.org @@ -17,5 +17,4 @@ sponsor: redhat nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 -collectd_graphite: True vpn: true diff --git a/inventory/host_vars/proxy10.phx2.fedoraproject.org b/inventory/host_vars/proxy10.phx2.fedoraproject.org index 36d6306396..99546118d4 100644 --- a/inventory/host_vars/proxy10.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy10.phx2.fedoraproject.org @@ -17,5 +17,4 @@ sponsor: redhat nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 -collectd_graphite: True vpn: true diff --git a/inventory/host_vars/proxy101.phx2.fedoraproject.org b/inventory/host_vars/proxy101.phx2.fedoraproject.org index 85bf3b3144..7d63d0070f 100644 --- a/inventory/host_vars/proxy101.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy101.phx2.fedoraproject.org @@ -17,5 +17,4 @@ sponsor: redhat nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 -collectd_graphite: True vpn: true diff --git a/inventory/host_vars/proxy110.phx2.fedoraproject.org b/inventory/host_vars/proxy110.phx2.fedoraproject.org index fdf21d1747..572e497a5b 100644 --- a/inventory/host_vars/proxy110.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy110.phx2.fedoraproject.org @@ -17,5 +17,4 @@ sponsor: redhat nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 -collectd_graphite: True vpn: true diff --git a/inventory/host_vars/proxy13.fedoraproject.org b/inventory/host_vars/proxy13.fedoraproject.org index 637fe42047..ac04f71235 100644 --- a/inventory/host_vars/proxy13.fedoraproject.org +++ b/inventory/host_vars/proxy13.fedoraproject.org @@ -28,5 +28,3 @@ nrpe_procs_crit: 1400 mem_size: 16384 max_mem_size: 32768 num_cpus: 8 - -collectd_graphite: True diff --git a/inventory/host_vars/proxy14.fedoraproject.org b/inventory/host_vars/proxy14.fedoraproject.org index 7f48551545..3296dfba9a 100644 --- a/inventory/host_vars/proxy14.fedoraproject.org +++ b/inventory/host_vars/proxy14.fedoraproject.org @@ -24,5 +24,3 @@ nrpe_procs_crit: 1400 mem_size: 16384 max_mem_size: 32768 num_cpus: 8 - -collectd_graphite: True diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index cfe4dcb974..ea88a2b132 100644 --- a/roles/collectd/base/tasks/main.yml +++ b/roles/collectd/base/tasks/main.yml @@ -74,13 +74,11 @@ when: collectd_apache - name: /etc/collectd/graphite.conf - template: src=graphite.conf dest=/etc/collectd.d/graphite.conf + file: state=absent dest=/etc/collectd.d/graphite.conf tags: - collectd - graphite - graphite-collectd - notify: - - restart collectd when: collectd_graphite is defined and ansible_distribution_major_version != '6' - name: Install libsemanage-python so we can set an sebool below @@ -96,7 +94,7 @@ ignore_errors: True notify: - restart collectd - when: ( collectd_apache is defined or collectd_graphite is defined ) and ansible_selinux.status != "disabled" + when: ( collectd_apache is defined ) and ansible_selinux.status != "disabled" - name: enable collectd nfs module copy: src=nfs.conf dest=/etc/collectd.d/nfs.conf