From 8f41dfb9a4b834bcd38c36500cbd1409fdc8c8b4 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <qsx@chaotikum.eu>
Date: Sun, 14 Nov 2021 18:48:51 +0100
Subject: [PATCH] prometheus: Switch to direct systemd command handling w/o
conf.d
---
prometheus/handlers/main.yml | 4 ++++
prometheus/tasks/main.yml | 17 +++++++++++++++--
prometheus/templates/confd-prometheus.j2 | 3 ---
prometheus/templates/override.conf.j2 | 3 +++
4 files changed, 22 insertions(+), 5 deletions(-)
delete mode 100644 prometheus/templates/confd-prometheus.j2
create mode 100644 prometheus/templates/override.conf.j2
diff --git a/prometheus/handlers/main.yml b/prometheus/handlers/main.yml
index 0be95fd..a937da8 100644
--- a/prometheus/handlers/main.yml
+++ b/prometheus/handlers/main.yml
@@ -1,5 +1,9 @@
---
+- name: Reload systemd
+ systemd:
+ daemon_reload: true
+
- name: Restart prometheus
systemd:
name: prometheus.service
diff --git a/prometheus/tasks/main.yml b/prometheus/tasks/main.yml
index a5f55c2..c995d15 100644
--- a/prometheus/tasks/main.yml
+++ b/prometheus/tasks/main.yml
@@ -29,11 +29,24 @@
- prometheus
- config
+- name: Create systemd unit override directory
+ file:
+ path: /etc/systemd/system/prometheus.service.d
+ state: directory
+ owner: root
+ group: root
+ mode: "0755"
+ when: ansible_distribution == "Gentoo"
+ tags:
+ - promtheus
+ - config
+
- name: Configure prometheus command arguments
template:
- src: confd-prometheus.j2
- dest: /etc/conf.d/prometheus
+ src: override.conf.j2
+ dest: /etc/systemd/system/prometheus.service.d/override.conf
notify:
+ - Reload systemd
- Restart prometheus
when: ansible_distribution == "Gentoo"
tags:
diff --git a/prometheus/templates/confd-prometheus.j2 b/prometheus/templates/confd-prometheus.j2
deleted file mode 100644
index b233503..0000000
--- a/prometheus/templates/confd-prometheus.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-# arguments for Prometheus
-command_args="{{ prometheus_args }}"
-supervisor="supervise-daemon"
diff --git a/prometheus/templates/override.conf.j2 b/prometheus/templates/override.conf.j2
new file mode 100644
index 0000000..3752bbb
--- /dev/null
+++ b/prometheus/templates/override.conf.j2
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=/usr/bin/prometheus {{ prometheus_args }}
--
GitLab