From 5ad386ed6fb30484348848a354d4dfa6b7393f74 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Wed, 3 Jan 2024 14:31:12 +0000 Subject: [PATCH] zabbix: Enable zabbix agent on prod hosts Signed-off-by: David Kirwan --- playbooks/groups/badges-backend.yml | 2 +- playbooks/groups/badges-web.yml | 2 +- playbooks/groups/bodhi-backend.yml | 2 +- playbooks/groups/busgateway.yml | 2 +- playbooks/groups/copr-db.yml | 2 +- playbooks/groups/debuginfod.yml | 2 +- playbooks/groups/github2fedmsg.yml | 2 +- playbooks/groups/ipa.yml | 2 +- playbooks/groups/ipsilon.yml | 2 +- playbooks/groups/koji-hub.yml | 2 +- playbooks/groups/mbs.yml | 2 +- playbooks/groups/memcached.yml | 2 +- playbooks/groups/mirrormanager.yml | 2 +- playbooks/groups/oci-registry.yml | 3 +-- playbooks/groups/odcs.yml | 2 +- playbooks/groups/pagure.yml | 2 +- playbooks/groups/pdc.yml | 2 +- playbooks/groups/pkgs.yml | 2 +- playbooks/groups/postgresql-server.yml | 2 +- playbooks/groups/releng-compose.yml | 2 +- playbooks/groups/value.yml | 2 +- playbooks/groups/virthost.yml | 2 +- playbooks/groups/wiki.yml | 3 +-- 23 files changed, 23 insertions(+), 25 deletions(-) diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 66fb264f0e..d76c953f1a 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -21,7 +21,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: env != "staging"} diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 6e0d57e3eb..60561f573f 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -21,7 +21,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: env != "staging"} diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 5c0a024913..6fbff9e211 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -34,7 +34,7 @@ roles: - base - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - collectd/base - hosts - ipa/client diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 64ff72cd1c..807c3a4fb7 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -16,7 +16,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: env != "staging"} - ipa/client diff --git a/playbooks/groups/copr-db.yml b/playbooks/groups/copr-db.yml index 136f68c7af..8267bcea31 100644 --- a/playbooks/groups/copr-db.yml +++ b/playbooks/groups/copr-db.yml @@ -27,7 +27,7 @@ - rkhunter - {role: ipa/client, when: env == "staging"} - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts #- postgresql_server #- collectd/base diff --git a/playbooks/groups/debuginfod.yml b/playbooks/groups/debuginfod.yml index c4ec3f3919..668f25ef55 100644 --- a/playbooks/groups/debuginfod.yml +++ b/playbooks/groups/debuginfod.yml @@ -19,7 +19,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - ipa/client - collectd/base diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 4bae24b9d8..e27687d49b 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -21,7 +21,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: env != "staging"} diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index 478b89106a..19d32f26d6 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -16,7 +16,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - collectd/base - hosts - {role: openvpn/client, diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 520fe1cbe8..ababb620e9 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -20,7 +20,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - rsyncd - sudo diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index defc41e80f..d6a7b6452a 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -28,7 +28,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - ipa/client - collectd/base diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index 198f3df170..00962f1795 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -19,7 +19,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts # openvpn on the prod frontend nodes - {role: openvpn/client, when: "'mbs_frontend' in group_names and datacenter == 'iad2'"} diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 86845a2b72..e43277addf 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -16,7 +16,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - ipa/client - collectd/base diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 60e17ffb5d..feed41b462 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -16,7 +16,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend')} - ipa/client diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml index bb9e43e93b..baa5dd1c34 100644 --- a/playbooks/groups/oci-registry.yml +++ b/playbooks/groups/oci-registry.yml @@ -17,8 +17,7 @@ - base - rkhunter - nagios_client - - { role: zabbix/zabbix_agent, - when: env == "staging" } + - zabbix/zabbix_agent - hosts - { role: openvpn/client, when: env != "staging" } diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml index b458f49464..e68bf71c01 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -19,7 +19,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - ipa/client - rsyncd diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 1e23a9ada9..0facc93288 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -16,7 +16,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - openvpn/client - ipa/client diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml index 55ab892cb3..24720c1b20 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -22,7 +22,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - collectd/base - hosts - ipa/client diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 347cdcc179..bfe6029f8e 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -18,7 +18,7 @@ - hosts - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - ipa/client - collectd/base - sudo diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 1071372809..9875669b43 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -27,7 +27,7 @@ - rkhunter - ipa/client - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - postgresql_server - collectd/base diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 4943dbf7f8..e0350fe137 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -28,7 +28,7 @@ - ipa/client - rkhunter - nagios_client - - role: zabbix/zabbix_agent + - zabbix/zabbix_agent - collectd/base - sudo - role: keytab/service diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 49cbde764b..44ace4861d 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -16,7 +16,7 @@ - base - rkhunter - nagios_client - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: env != "staging"} diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index ade5d8fece..433504bee2 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -40,7 +40,7 @@ - base - {role: rkhunter} - {role: nagios_client} - - {role: zabbix/zabbix_agent, when: env == "staging"} + - zabbix/zabbix_agent - hosts - {role: openvpn/client, when: vpn|bool} - ipa/client diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 60ddc8c6fc..528b4843ca 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -24,6 +24,7 @@ - base - rkhunter - nagios_client + - zabbix/zabbix_agent - hosts - { role: openvpn/client, when: env != "staging" } @@ -39,8 +40,6 @@ - { role: nfs/client, when: env != "staging", mnt_dir: '/mnt/web/attachments', nfs_src_dir: 'fedora_app/app/attachments' } - mediawiki - sudo - - role: zabbix/zabbix_agent - when: env == "staging" tasks: - import_tasks: "{{ tasks_path }}/motd.yml"