From a3a072a028c3c0b363f5c982666dc728eab3b15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Polakovi=C4=8D?= <patrik@alphamail.org>
Date: Wed, 30 Aug 2023 14:53:09 +0200
Subject: [PATCH] Zabbix: Add zabbix agent to groups/mbs playbook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrik Polakovič <patrik@alphamail.org>
---
 playbooks/groups/mbs.yml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml
index 0c1d25a9b5..198f3df170 100644
--- a/playbooks/groups/mbs.yml
+++ b/playbooks/groups/mbs.yml
@@ -8,9 +8,9 @@
   gather_facts: True
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
@@ -19,9 +19,10 @@
   - base
   - rkhunter
   - nagios_client
+  - {role: zabbix/zabbix_agent, when: env == "staging"}
   - hosts
   # openvpn on the prod frontend nodes
-  - { role: openvpn/client, when: "'mbs_frontend' in group_names and datacenter == 'iad2'" }
+  - {role: openvpn/client, when: "'mbs_frontend' in group_names and datacenter == 'iad2'"}
   - ipa/client
   - rsyncd
   - sudo
@@ -39,9 +40,9 @@
   gather_facts: True
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - "{{ vars_path }}/{{ ansible_distribution }}.yml"
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   roles:
   - mod_wsgi
@@ -55,9 +56,9 @@
   gather_facts: True
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
   - fedmsg/base
@@ -72,9 +73,9 @@
   gather_facts: True
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - "{{ vars_path }}/{{ ansible_distribution }}.yml"
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   roles:
   - mbs/frontend
@@ -100,9 +101,9 @@
   gather_facts: True
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - "{{ vars_path }}/{{ ansible_distribution }}.yml"
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - "{{ vars_path }}/{{ ansible_distribution }}.yml"
 
   roles:
   - role: keytab/service