diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index 05d86f20cb..56ed80d359 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -33,6 +33,7 @@ - denyhosts - nagios_client - fas_client + - collectd - ask - fedmsg_base @@ -46,7 +47,6 @@ when: env != "staging" - include: "{{ tasks }}/apache.yml" - include: "{{ tasks }}/mod_wsgi.yml" - - include: "{{ tasks }}/collectd/client.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index d3d6e9d3c4..0446017d9b 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -34,13 +34,13 @@ - denyhosts - nagios_client - fas_client + - collectd tasks: # this is how you include other task lists - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index 657784627c..22384e7598 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -30,6 +30,7 @@ - denyhosts - nagios_client - fas_client + - collectd - yum-cron tasks: @@ -37,7 +38,6 @@ - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index ef648fb73d..5547d088c7 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -36,6 +36,7 @@ - denyhosts - nagios_client - fas_client + - collectd - koji_hub tasks: @@ -44,7 +45,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" - - include: "{{ tasks }}/collectd/client.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 9c1cda5a93..dbd147f3ee 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -37,6 +37,7 @@ - denyhosts - nagios_client - fas_client + - collectd - yum-cron tasks: @@ -44,7 +45,6 @@ - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index c3a7d891e6..b119a53e37 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -38,6 +38,7 @@ - nagios_client - geoip - fas_client + - collectd - mirrorlist tasks: @@ -45,7 +46,6 @@ - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/openvpn_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" diff --git a/playbooks/groups/postgresl-server.yml b/playbooks/groups/postgresl-server.yml index fcf27859ea..6939ff2f47 100644 --- a/playbooks/groups/postgresl-server.yml +++ b/playbooks/groups/postgresl-server.yml @@ -38,6 +38,7 @@ - denyhosts - nagios_client - fas_client + - collectd - postgresql_server tasks: @@ -46,7 +47,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" - - include: "{{ tasks }}/collectd/client.yml" # TODO: add iscsi task diff --git a/playbooks/groups/releng.yml b/playbooks/groups/releng.yml index cdfe0ff719..be26ea1dee 100644 --- a/playbooks/groups/releng.yml +++ b/playbooks/groups/releng.yml @@ -36,12 +36,12 @@ roles: - base - nagios_client + - collectd tasks: - include: "{{ tasks }}/koji/releng_config.yml" - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/motd.yml" - - include: "{{ tasks }}/collectd/client.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/groups/taskotron.yml b/playbooks/groups/taskotron.yml index 7f0ca7e227..197e83f5ca 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -34,6 +34,7 @@ - denyhosts - nagios_client - fas_client + - collectd - yum-cron tasks: @@ -41,7 +42,6 @@ - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - include: "{{ tasks }}/2fa_client.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 021b7806ce..9f126e7ff4 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -19,6 +19,7 @@ - denyhosts - nagios_client - fas_client + - collectd - iscsi_client tasks: @@ -27,7 +28,6 @@ - include: "{{ tasks }}/2fa_client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/virthost.yml" handlers: diff --git a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml index 674fbae4d9..c88e834e7a 100644 --- a/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/lists-dev.cloud.fedoraproject.org.yml @@ -27,7 +27,6 @@ - include: "{{ tasks }}/postfix_basic.yml" - include: "{{ tasks }}/hosts.yml" - include: "{{ tasks }}/yumrepos.yml" - - include: "{{ tasks }}/collectd/client.yml" - include: "{{ tasks }}/motd.yml" - include: "{{ tasks }}/sudo.yml" - include: "{{ tasks }}/apache.yml" @@ -125,6 +124,7 @@ mailman_hk_db_pass: "{{ lists_dev_hk_db_pass }}" mailman_ks_admin_db_pass: "{{ lists_dev_ks_db_pass }}" mailman_ks_db_pass: "{{ lists_dev_ks_db_pass }}" + - collectd tasks: diff --git a/files/collectd/README b/roles/collectd/files/README similarity index 100% rename from files/collectd/README rename to roles/collectd/files/README diff --git a/files/collectd/apache.conf b/roles/collectd/files/apache.conf similarity index 100% rename from files/collectd/apache.conf rename to roles/collectd/files/apache.conf diff --git a/files/collectd/bind.conf b/roles/collectd/files/bind.conf similarity index 100% rename from files/collectd/bind.conf rename to roles/collectd/files/bind.conf diff --git a/files/collectd/collectd.conf.j2 b/roles/collectd/files/collectd.conf.j2 similarity index 100% rename from files/collectd/collectd.conf.j2 rename to roles/collectd/files/collectd.conf.j2 diff --git a/files/collectd/collectd_haproxy.sh b/roles/collectd/files/collectd_haproxy.sh similarity index 100% rename from files/collectd/collectd_haproxy.sh rename to roles/collectd/files/collectd_haproxy.sh diff --git a/files/collectd/collectd_mailq.sh b/roles/collectd/files/collectd_mailq.sh similarity index 100% rename from files/collectd/collectd_mailq.sh rename to roles/collectd/files/collectd_mailq.sh diff --git a/files/collectd/fedmsg-types.db b/roles/collectd/files/fedmsg-types.db similarity index 100% rename from files/collectd/fedmsg-types.db rename to roles/collectd/files/fedmsg-types.db diff --git a/files/collectd/fedmsg.conf b/roles/collectd/files/fedmsg.conf similarity index 100% rename from files/collectd/fedmsg.conf rename to roles/collectd/files/fedmsg.conf diff --git a/files/collectd/haproxy-types.db b/roles/collectd/files/haproxy-types.db similarity index 100% rename from files/collectd/haproxy-types.db rename to roles/collectd/files/haproxy-types.db diff --git a/files/collectd/haproxy.conf b/roles/collectd/files/haproxy.conf similarity index 100% rename from files/collectd/haproxy.conf rename to roles/collectd/files/haproxy.conf diff --git a/files/collectd/mailq.conf b/roles/collectd/files/mailq.conf similarity index 100% rename from files/collectd/mailq.conf rename to roles/collectd/files/mailq.conf diff --git a/files/collectd/network-client.conf b/roles/collectd/files/network-client.conf similarity index 100% rename from files/collectd/network-client.conf rename to roles/collectd/files/network-client.conf diff --git a/files/collectd/nfs.conf b/roles/collectd/files/nfs.conf similarity index 100% rename from files/collectd/nfs.conf rename to roles/collectd/files/nfs.conf diff --git a/files/collectd/pgconns-types.db b/roles/collectd/files/pgconns-types.db similarity index 100% rename from files/collectd/pgconns-types.db rename to roles/collectd/files/pgconns-types.db diff --git a/files/collectd/rrdtool.conf b/roles/collectd/files/rrdtool.conf similarity index 100% rename from files/collectd/rrdtool.conf rename to roles/collectd/files/rrdtool.conf diff --git a/tasks/collectd/client.yml b/roles/collectd/tasks/main.yml similarity index 100% rename from tasks/collectd/client.yml rename to roles/collectd/tasks/main.yml