From 98228407a6e1aec92e41fc8b0d4d9a8d5d15507e Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Tue, 9 Aug 2022 16:17:11 +0200
Subject: [PATCH] [Prometheus] Use a dedicated folder for generated target
 files

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
 group_vars/prometheus.yml        |  2 +-
 host_vars/fyre.adm.crans.org.yml | 24 ++++++++++++------------
 roles/prometheus/tasks/main.yml  |  7 +++++++
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/group_vars/prometheus.yml b/group_vars/prometheus.yml
index 4979349e..28a186dd 100644
--- a/group_vars/prometheus.yml
+++ b/group_vars/prometheus.yml
@@ -7,7 +7,7 @@ glob_service_prometheus_target:
     version: main
   name: prometheus-target
   install_dir: /var/local/services/prometheus-target
-  generated: false
+  generated: true
   cron:
     frequency: "*/10 * * * *"
     options: ""
diff --git a/host_vars/fyre.adm.crans.org.yml b/host_vars/fyre.adm.crans.org.yml
index 9c4a6aa3..6618c3a0 100644
--- a/host_vars/fyre.adm.crans.org.yml
+++ b/host_vars/fyre.adm.crans.org.yml
@@ -9,7 +9,7 @@ loc_prometheus:
       - job_name: servers
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_node.json'
+              - '/etc/prometheus/targets/node.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
@@ -24,7 +24,7 @@ loc_prometheus:
       - job_name: nginx
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_nginx.json'
+              - '/etc/prometheus/targets/nginx.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: instance
@@ -46,7 +46,7 @@ loc_prometheus:
             replacement: '$1:9117'
 
   blackbox:
-    file: targets_blackbox.json
+    file: targets/blackbox.json
     targets:
       - https://crans.org/
       - https://www.crans.org/
@@ -73,7 +73,7 @@ loc_prometheus:
       - job_name: blackbox
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_blackbox.json'
+              - '/etc/prometheus/targets/blackbox.json'
         metrics_path: /probe
         params:
           module: [http_2xx]  # Look for a HTTP 200 response.
@@ -90,7 +90,7 @@ loc_prometheus:
       - job_name: blackbox_icmp
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_icmp.json'
+              - '/etc/prometheus/targets/icmp.json'
         metrics_path: /probe
         params:
           module: [icmp]  # Look for a ICMP ping
@@ -107,7 +107,7 @@ loc_prometheus:
       - job_name: bird
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_bird.json'
+              - '/etc/prometheus/targets/bird.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
@@ -122,7 +122,7 @@ loc_prometheus:
       - job_name: bind
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_bind.json'
+              - '/etc/prometheus/targets/bind.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
@@ -152,7 +152,7 @@ loc_prometheus:
       - job_name: postgres
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_postgres.json'
+              - '/etc/prometheus/targets/postgres.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
@@ -167,7 +167,7 @@ loc_prometheus:
       - job_name: mysql
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_mysql.json'
+              - '/etc/prometheus/targets/mysql.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
@@ -182,7 +182,7 @@ loc_prometheus:
       - job_name: mtail
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_mtail.json'
+              - '/etc/prometheus/targets/mtail.json'
         relabel_configs:
           - source_labels: [__address__]
             target_label: __param_target
@@ -197,7 +197,7 @@ loc_prometheus:
       - job_name: ilo_snmp
         file_sd_configs:
           - files:
-              - '/etc/prometheus/targets_ilo_snmp.json'
+              - '/etc/prometheus/targets/ilo_snmp.json'
         metrics_path: '/snmp'
         params:
           module:
@@ -215,7 +215,7 @@ loc_prometheus:
       - job_name: ups_snmp
         file_sd_configs:
           - files:
-            - '/etc/prometheus/targets_ups_snmp.json'
+            - '/etc/prometheus/targets/ups_snmp.json'
         metrics_path: '/snmp'
         params:
           module:
diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml
index 0208135c..bf6d1786 100644
--- a/roles/prometheus/tasks/main.yml
+++ b/roles/prometheus/tasks/main.yml
@@ -14,6 +14,13 @@
     mode: 0644
   notify: Restart Prometheus
 
+- name: Create symbolic link for generated folder
+  file:
+    src: /var/local/services/prometheus-target/generated
+    dest: /etc/prometheus/targets
+    state: link
+    force: true  # Needed if the service is not deployed yet
+
 - name: Configure Prometheus alert rules
   template:
     src: prometheus/alert.rules.yml.j2