From 10a6085b84003e449153b94789c14ef1fc154a8f Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Tue, 21 Nov 2023 19:50:09 +1100
Subject: [PATCH] fix: resolve prometheus issues

- broken prometheus::server config, resolve conflicts
- move hieradata for role to match role, not profile
---
 .../infra/metrics/{server.yaml => prometheus.yaml}    |  1 +
 site/profiles/manifests/metrics/server.pp             | 11 +++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 rename hieradata/roles/infra/metrics/{server.yaml => prometheus.yaml} (82%)

diff --git a/hieradata/roles/infra/metrics/server.yaml b/hieradata/roles/infra/metrics/prometheus.yaml
similarity index 82%
rename from hieradata/roles/infra/metrics/server.yaml
rename to hieradata/roles/infra/metrics/prometheus.yaml
index 1b5c298..5ce72d4 100644
--- a/hieradata/roles/infra/metrics/server.yaml
+++ b/hieradata/roles/infra/metrics/prometheus.yaml
@@ -8,3 +8,4 @@ profiles::metrics::server::scrape_jobs:
   - bind
   - puppetdb
   - systemd
+profiles::metrics::server::localstorage: /data/prometheus
diff --git a/site/profiles/manifests/metrics/server.pp b/site/profiles/manifests/metrics/server.pp
index 1bb82cf..517bc12 100644
--- a/site/profiles/manifests/metrics/server.pp
+++ b/site/profiles/manifests/metrics/server.pp
@@ -4,7 +4,11 @@ class profiles::metrics::server (
   Boolean   $manage_user  = true,
   Boolean   $manage_group = true,
   String    $retention    = '30d',
-  Array     $scrape_jobs   = [],
+  Array     $scrape_jobs  = [],
+  Variant[
+    Stdlib::Absolutepath,
+    Boolean[false]
+  ]         $localstorage = '/var/lib/prometheus',
 ) {
 
   $collect_scrape_jobs = $scrape_jobs.map |$job| {
@@ -18,8 +22,7 @@ class profiles::metrics::server (
     manage_group        => $manage_group,
     version             => $version,
     collect_scrape_jobs => $collect_scrape_jobs,
-    extra_options       => {
-      'storage.tsdb.retention.time' => $retention,
-    },
+    storage_retention   => $retention,
+    localstorage        => $localstorage,
   }
 }