From 0d36ac644cdf4e2f87be39a1a6f7b7ba4feeab81 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Mon, 1 Jun 2020 19:42:47 +0200 Subject: [PATCH] [monitoring] Use ip filter for adm --- group_vars/all/vars.yaml | 4 ++++ plays/monitoring.yml | 4 ++++ roles/prometheus-apache-exporter/tasks/main.yml | 2 +- .../templates/default/prometheus-node-exporter.j2 | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/group_vars/all/vars.yaml b/group_vars/all/vars.yaml index a7a7c2a9..d0766e03 100644 --- a/group_vars/all/vars.yaml +++ b/group_vars/all/vars.yaml @@ -1,4 +1,5 @@ --- +# Custom header dirty: "{{lookup('pipe', 'git diff --quiet || echo dirty')}}" ansible_header: | +++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -11,3 +12,6 @@ ansible_header: | {% endif %} +++++++++++++++++++++++++++++++++++++++++++++++++++ + +# Crans subnets +adm_subnet: 10.231.136.0/24 diff --git a/plays/monitoring.yml b/plays/monitoring.yml index 7ffff4f6..03493c7d 100755 --- a/plays/monitoring.yml +++ b/plays/monitoring.yml @@ -38,10 +38,14 @@ # Monitor all hosts - hosts: server,test_vm + vars: + adm_ipv4: "{{ ansible_all_ipv4_addresses | ipaddr(adm_subnet) | first }}" roles: ["prometheus-node-exporter"] # Export apache metrics - hosts: zamok.adm.crans.org + vars: + adm_ipv4: "{{ ansible_all_ipv4_addresses | ipaddr(adm_subnet) | first }}" roles: ["prometheus-apache-exporter"] # Configure HP RAID monitoring diff --git a/roles/prometheus-apache-exporter/tasks/main.yml b/roles/prometheus-apache-exporter/tasks/main.yml index dcbd0446..cd7a2ab6 100644 --- a/roles/prometheus-apache-exporter/tasks/main.yml +++ b/roles/prometheus-apache-exporter/tasks/main.yml @@ -12,5 +12,5 @@ path: /etc/default/prometheus-apache-exporter regexp: '^ARGS=' line: | - ARGS="-telemetry.address={{ ansible_hostname }}.adm.crans.org:9117" + ARGS="-telemetry.address={{ adm_ipv4 }}:9117" notify: Restart prometheus-apache-exporter diff --git a/roles/prometheus-node-exporter/templates/default/prometheus-node-exporter.j2 b/roles/prometheus-node-exporter/templates/default/prometheus-node-exporter.j2 index d49be01a..819d243a 100644 --- a/roles/prometheus-node-exporter/templates/default/prometheus-node-exporter.j2 +++ b/roles/prometheus-node-exporter/templates/default/prometheus-node-exporter.j2 @@ -4,7 +4,7 @@ # Due to shell scaping, to pass backslashes for regexes, you need to double # them (\\d for \d). If running under systemd, you need to double them again # (\\\\d to mean \d), and escape newlines too. -ARGS="--web.listen-address={{ lookup('dig', ansible_host) }}:9100" +ARGS="--web.listen-address={{ adm_ipv4 }}:9100" # Prometheus-node-exporter supports the following options: #