From ceb4273084425de83c5aa6e6790470c4057aa16a Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 1 Jul 2021 23:03:34 -0400
Subject: need to override it in a different way

flags can't be repeated
---
 modules/tozt/files/prometheus-override.service |  2 ++
 modules/tozt/files/prometheus-service-conf     |  1 -
 modules/tozt/manifests/prometheus.pp           | 25 ++++++++++++-------------
 3 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 modules/tozt/files/prometheus-override.service
 delete mode 100644 modules/tozt/files/prometheus-service-conf

diff --git a/modules/tozt/files/prometheus-override.service b/modules/tozt/files/prometheus-override.service
new file mode 100644
index 0000000..e2e2957
--- /dev/null
+++ b/modules/tozt/files/prometheus-override.service
@@ -0,0 +1,2 @@
+[Service]
+ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/media/persistent/prometheus $PROMETHEUS_ARGS
diff --git a/modules/tozt/files/prometheus-service-conf b/modules/tozt/files/prometheus-service-conf
deleted file mode 100644
index 98d5047..0000000
--- a/modules/tozt/files/prometheus-service-conf
+++ /dev/null
@@ -1 +0,0 @@
-PROMETHEUS_ARGS="--storage.tsdb.path=/media/persistent/prometheus"
diff --git a/modules/tozt/manifests/prometheus.pp b/modules/tozt/manifests/prometheus.pp
index f842c86..444ac67 100644
--- a/modules/tozt/manifests/prometheus.pp
+++ b/modules/tozt/manifests/prometheus.pp
@@ -1,19 +1,18 @@
 class tozt::prometheus {
   include prometheus
 
-  file {
-    "/media/persistent/prometheus":
-      ensure => directory,
-      owner => "prometheus",
-      group => "prometheus",
-      require => [
-        File["/media/persistent"],
-        Package["prometheus"],
-      ];
-    "/etc/conf.d/prometheus":
-      source => "puppet:///modules/tozt/prometheus-service-conf",
-      require => Package["prometheus"],
-      notify => Service["prometheus"];
+  file { "/media/persistent/prometheus":
+    ensure => directory,
+    owner => "prometheus",
+    group => "prometheus",
+    require => [
+      File["/media/persistent"],
+      Package["prometheus"],
+    ];
+  }
+
+  systemd::override { "prometheus":
+    source => 'puppet:///modules/tozt/prometheus-override.conf';
   }
 
   nginx::site {
-- 
cgit v1.2.3