From d4a5276b2813f95d56e8fadb0e6d8ff169b8eecb Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 23 Sep 2021 14:40:38 +0200
Subject: move exporter_exporter configuration into canonical config dir

---
 roles/monitoring/prometheus/exporter/base/tasks/main.yml       | 2 +-
 roles/monitoring/prometheus/exporter/base/templates/service.j2 | 2 +-
 roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml   | 2 +-
 roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml   | 2 +-
 roles/monitoring/prometheus/exporter/node/tasks/main.yml       | 2 +-
 roles/monitoring/prometheus/exporter/nut/tasks/main.yml        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/monitoring/prometheus/exporter/base/tasks/main.yml b/roles/monitoring/prometheus/exporter/base/tasks/main.yml
index 9e35c48d..eeb2a23d 100644
--- a/roles/monitoring/prometheus/exporter/base/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/base/tasks/main.yml
@@ -14,7 +14,7 @@
 
 - name: create configuration directories
   file:
-    path: /etc/prometheus/exporter/enabled
+    path: /etc/prometheus/exporter/exporter
     state: directory
 
 - name: add user for prometheus-exporter
diff --git a/roles/monitoring/prometheus/exporter/base/templates/service.j2 b/roles/monitoring/prometheus/exporter/base/templates/service.j2
index c24baf43..3d44744a 100644
--- a/roles/monitoring/prometheus/exporter/base/templates/service.j2
+++ b/roles/monitoring/prometheus/exporter/base/templates/service.j2
@@ -4,7 +4,7 @@ Description=Prometheus exporter proxy
 [Service]
 Restart=always
 User=prometheus-exporter
-ExecStart=/usr/bin/prometheus-exporter-exporter -config.dirs=/etc/prometheus/exporter/enabled -config.file="" -web.listen-address="" -web.tls.listen-address="{{ prometheus_exporter_listen }}" -web.tls.cert="/etc/ssl/prometheus/exporter/crt.pem" -web.tls.key="/etc/ssl/prometheus/exporter/key.pem" --web.tls.ca="/etc/ssl/prometheus/ca-crt.pem" -web.tls.verify
+ExecStart=/usr/bin/prometheus-exporter-exporter -config.dirs=/etc/prometheus/exporter/exporter -config.file="" -web.listen-address="" -web.tls.listen-address="{{ prometheus_exporter_listen }}" -web.tls.cert="/etc/ssl/prometheus/exporter/crt.pem" -web.tls.key="/etc/ssl/prometheus/exporter/key.pem" --web.tls.ca="/etc/ssl/prometheus/ca-crt.pem" -web.tls.verify
 {# TODO: implement reloading once the exporter_exporter supports this #}
 
 # systemd hardening-options
diff --git a/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml b/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml
index 96c247ec..cab521cc 100644
--- a/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml
@@ -36,5 +36,5 @@
       http:
         port: 9115
         path: '/probe'
-    dest: /etc/prometheus/exporter/enabled/blackbox.yml
+    dest: /etc/prometheus/exporter/exporter/blackbox.yml
   notify: reload prometheus-exporter-exporter
diff --git a/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml b/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml
index dda33e9f..07219c68 100644
--- a/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml
@@ -38,5 +38,5 @@
       method: http
       http:
         port: 9436
-    dest: /etc/prometheus/exporter/enabled/mikrotik.yml
+    dest: /etc/prometheus/exporter/exporter/mikrotik.yml
   notify: reload prometheus-exporter-exporter
diff --git a/roles/monitoring/prometheus/exporter/node/tasks/main.yml b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
index 00a4ab3f..3fa0a1ec 100644
--- a/roles/monitoring/prometheus/exporter/node/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
@@ -29,5 +29,5 @@
       method: http
       http:
         port: 9100
-    dest: /etc/prometheus/exporter/enabled/node.yml
+    dest: /etc/prometheus/exporter/exporter/node.yml
   notify: reload prometheus-exporter-exporter
diff --git a/roles/monitoring/prometheus/exporter/nut/tasks/main.yml b/roles/monitoring/prometheus/exporter/nut/tasks/main.yml
index 78a8e817..8245feae 100644
--- a/roles/monitoring/prometheus/exporter/nut/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/nut/tasks/main.yml
@@ -25,5 +25,5 @@
       http:
         port: 9199
         path: /ups_metrics
-    dest: /etc/prometheus/exporter/enabled/nut.yml
+    dest: /etc/prometheus/exporter/exporter/nut.yml
   notify: reload prometheus-exporter-exporter
-- 
cgit v1.2.3