diff --git a/group_vars/mtail.yml b/group_vars/mtail.yml new file mode 100644 index 0000000000000000000000000000000000000000..e445bd9bdbc08272c4b764cbdca055c6b5ff55a2 --- /dev/null +++ b/group_vars/mtail.yml @@ -0,0 +1,6 @@ +--- +glob_mtail: + config: + - dhcpd.mtail + - radiusd.mtail + remove: [] diff --git a/host_vars/tealc.adm.crans.org.yml b/host_vars/tealc.adm.crans.org.yml index 5a0fdfadbf22b978bdf0e36f440b94abba0e34f7..1f11685035a24d0bc9ffce51912d29f1d6de5f37 100644 --- a/host_vars/tealc.adm.crans.org.yml +++ b/host_vars/tealc.adm.crans.org.yml @@ -56,3 +56,9 @@ loc_rsyslog_server: vars: - name: InputRELPServerRun value: 20514 + +loc_mtail: + config: + - dhcpd.mtail + remove: + - radiusd.mtail diff --git a/hosts b/hosts index 65f11aec393719cd63e44ffb487e2e7c76ac2263..d1946d3cc86f73adf11704c8ea873647f74079cd 100644 --- a/hosts +++ b/hosts @@ -105,6 +105,10 @@ linx.adm.crans.org [mailman] mailman.adm.crans.org +[mtail] +gulp.cachan-adm.crans.org +tealc.adm.crans.org + [prometheus] monitoring.adm.crans.org fyre.cachan-adm.crans.org diff --git a/plays/monitoring.yml b/plays/monitoring.yml index 1f9dd30f73e14d68be70ff1d04c33410f4d34654..c1811033092a55c2e8d097a975d90d1826f79c33 100755 --- a/plays/monitoring.yml +++ b/plays/monitoring.yml @@ -44,9 +44,10 @@ # roles: ["prometheus-node-exporter-postfix"] # Monitor logs with mtail -- hosts: tealc.adm.crans.org,gulp.cachan-adm.crans.org +- 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/tasks/main.yml b/roles/mtail/tasks/main.yml index 5a44c99bbe87dba0077a118153614a1e3ac75f3a..c4d673cce61166a4f130a3639be2c3b1fc87c886 100644 --- a/roles/mtail/tasks/main.yml +++ b/roles/mtail/tasks/main.yml @@ -30,9 +30,14 @@ src: "mtail/{{ item }}.j2" dest: "/etc/mtail/{{ item }}" mode: 0644 - loop: - - dhcpd.mtail - - radiusd.mtail + loop: "{{ mtail.config }}" + notify: Restart mtail + +- name: Drop unusued configuration + file: + path: "/etc/mtail/{{ item }}" + state: absent + loop: "{{ mtail.remove }}" notify: Restart mtail - name: Indicate role in motd