From b56d260a35bb5957172a63ffa9d056b02a4a1361 Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Tue, 1 Jun 2021 17:56:38 +0200
Subject: [PATCH] [prometheus] reordering
---
hosts | 13 +++++++------
roles/prometheus-node-exporter/tasks/main.yml | 12 ++++++------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hosts b/hosts
index 0a734fa9..9cfe06ce 100644
--- a/hosts
+++ b/hosts
@@ -18,8 +18,6 @@ tealc.adm.crans.org
tealc.adm.crans.org
gulp.cachan-adm.crans.org
-[blackbox]
-monitoring.adm.crans.org
[bdd:children]
virtu
@@ -29,6 +27,9 @@ belenios.adm.crans.org
[bird]
routeur-gulp.cachan-adm.crans.org
+[blackbox]
+monitoring.adm.crans.org
+
[certbot]
charybde.adm.crans.org
sputnik.adm.crans.org
@@ -109,10 +110,6 @@ mailman.adm.crans.org
gulp.cachan-adm.crans.org
tealc.adm.crans.org
-[prometheus]
-monitoring.adm.crans.org
-fyre.cachan-adm.crans.org
-
[mirror_backend]
charybde.adm.crans.org
eclat.adm.crans.org
@@ -154,6 +151,10 @@ ovh_physical
[prefix_delegation]
routeur-gulp.cachan-adm.crans.org
+[prometheus]
+monitoring.adm.crans.org
+fyre.cachan-adm.crans.org
+
[radius]
routeur-gulp.cachan-adm.crans.org
diff --git a/roles/prometheus-node-exporter/tasks/main.yml b/roles/prometheus-node-exporter/tasks/main.yml
index a91d9d9e..bdb43fc7 100644
--- a/roles/prometheus-node-exporter/tasks/main.yml
+++ b/roles/prometheus-node-exporter/tasks/main.yml
@@ -19,12 +19,6 @@
when:
- ansible_lsb.codename == 'bullseye'
-- name: Activate prometheus-node-exporter service
- systemd:
- name: prometheus-node-exporter
- enabled: true
- state: started
-
- name: Make Prometheus node-exporter listen on adm only
lineinfile:
path: /etc/default/prometheus-node-exporter
@@ -33,6 +27,12 @@
ARGS="--web.listen-address={{ prometheus_node_exporter.listen_addr }}:9100"
tags: restart-node-exporter
+- name: Activate prometheus-node-exporter service
+ systemd:
+ name: prometheus-node-exporter
+ enabled: true
+ state: started
+
# Install new APT textfile collector, it might be upstreamed one day
# https://github.com/prometheus-community/node-exporter-textfile-collector-scripts/pull/35
- name: Patch APT textfile collector
--
GitLab