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