From 213f618848c225987fa6ae80dd5060be0bfbeb55 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Tue, 22 Jun 2021 02:02:02 +0200
Subject: [PATCH] [prometheus] Update configuration

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 host_vars/fyre.cachan-adm.crans.org.yml                   | 3 ++-
 host_vars/monitoring.adm.crans.org.yml                    | 6 +++++-
 plays/monitoring.yml                                      | 1 -
 roles/mtail/templates/apt/sources.list.d/bullseye.list.j2 | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/host_vars/fyre.cachan-adm.crans.org.yml b/host_vars/fyre.cachan-adm.crans.org.yml
index cc63be4d..d91ca74e 100644
--- a/host_vars/fyre.cachan-adm.crans.org.yml
+++ b/host_vars/fyre.cachan-adm.crans.org.yml
@@ -75,6 +75,7 @@ loc_prometheus:
   nginx:
     file: targets_nginx.json
     targets:
+      - charybde.cachan-adm.crans.org
       - rodauh.cachan-adm.crans.org
       - terenez.cachan-adm.crans.org
     config:
@@ -92,7 +93,7 @@ loc_prometheus:
   mtail:
     file: targets_mtail.json
     targets:
-      - gulp.adm.crans.org
+      - gulp.cachan-adm.crans.org
     config:
       - job_name: mtail
         static_configs:
diff --git a/host_vars/monitoring.adm.crans.org.yml b/host_vars/monitoring.adm.crans.org.yml
index ecdb2719..493ebca8 100644
--- a/host_vars/monitoring.adm.crans.org.yml
+++ b/host_vars/monitoring.adm.crans.org.yml
@@ -23,8 +23,12 @@ loc_prometheus:
   nginx:
     file: targets_nginx.json
     targets:
+      - gitzly.adm.crans.org
       - hodaur.adm.crans.org
-      - charybde.adm.crans.org
+      - jitsi.adm.crans.org
+      - kiwi.adm.crans.org
+      - mailman.adm.crans.org
+      - roundcube.adm.crans.org
     config:
       - job_name: nginx
         file_sd_configs:
diff --git a/plays/monitoring.yml b/plays/monitoring.yml
index c1811033..1272ed10 100755
--- a/plays/monitoring.yml
+++ b/plays/monitoring.yml
@@ -46,7 +46,6 @@
 # Monitor logs with mtail
 - hosts: mtail
   vars:
-    mirror: '{{ glob_mirror | default({}) | combine(loc_mirror | default({})) }}'
     mtail: '{{ glob_mtail | default({}) | combine(loc_mtail | default({})) }}'
   roles:
     - mtail
diff --git a/roles/mtail/templates/apt/sources.list.d/bullseye.list.j2 b/roles/mtail/templates/apt/sources.list.d/bullseye.list.j2
index e8bbe8d2..61c03736 100644
--- a/roles/mtail/templates/apt/sources.list.d/bullseye.list.j2
+++ b/roles/mtail/templates/apt/sources.list.d/bullseye.list.j2
@@ -1,3 +1,3 @@
 {{ ansible_header | comment }}
 
-deb http://{{ mirror.name }}/debian bullseye main
+deb {{ debian_mirror }} bullseye main