diff --git a/hosts b/hosts index 3d884340..8832dc5f 100644 --- a/hosts +++ b/hosts @@ -88,24 +88,24 @@ gulp.adm.crans.org [crans_vm] voyager.adm.crans.org -silice.adm.crans.org +#silice.adm.crans.org routeur-sam.adm.crans.org -routeur-daniel.adm.crans.org -belenios # on changera plus tard -re2o-ldap.adm.crans.org +#routeur-daniel.adm.crans.org +#belenios.adm.crans.org +#re2o-ldap.adm.crans.org gitlab-ci.adm.crans.org gitzly.adm.crans.org hodaur.adm.crans.org monitoring.adm.crans.org -boeing.adm.crans.org +#boeing.adm.crans.org fluxx.adm.crans.org -unifi.adm.crans.org -pastemoisa.adm.crans.org -casouley.adm.crans.org +#unifi.adm.crans.org +#pastemoisa.adm.crans.org +#casouley.adm.crans.org kiwi.adm.crans.org tracker.adm.crans.org jitsi.adm.crans.org -ethercalc-srv.adm.crans.org +#ethercalc-srv.adm.crans.org kenobi.adm.crans.org [ovh_physical] diff --git a/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2 b/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2 index 28c27f27..1b61324d 100644 --- a/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2 +++ b/roles/prometheus-alertmanager/templates/prometheus/alertmanager.yml.j2 @@ -58,5 +58,5 @@ inhibit_rules: receivers: - name: 'webhook-ninjabot' webhook_configs: - - url: 'http://fyre.adm.crans.org:5000/' + - url: 'http://localhost:5000/' send_resolved: true 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 819d243a..9610d2d4 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={{ adm_ipv4 }}:9100" +ARGS="--web.listen-address={{ query('ldap', 'ip', ansible_hostname, 10) | ipv4 | first }}:9100" # Prometheus-node-exporter supports the following options: #