From cc2a907d0272d2ca606427b9d811f7c127bdcf22 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 7 Feb 2023 21:58:52 +0100
Subject: promethues: some cleanup and fixes

---
 roles/monitoring/prometheus/server/defaults/main/main.yml        | 6 ++++++
 .../prometheus/server/defaults/main/rules_prometheus.yml         | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'roles/monitoring/prometheus/server/defaults')

diff --git a/roles/monitoring/prometheus/server/defaults/main/main.yml b/roles/monitoring/prometheus/server/defaults/main/main.yml
index b377a7f0..ab0b3276 100644
--- a/roles/monitoring/prometheus/server/defaults/main/main.yml
+++ b/roles/monitoring/prometheus/server/defaults/main/main.yml
@@ -10,6 +10,9 @@ prometheus_server_retention: "15d"
 #   environment: foo
 #   monitor: {{ inventory_hostname }}
 
+prometheus_server_scrape_interval: "15s"
+prometheus_server_evaluation_interval: "15s"
+
 prometheus_server_jobs:
   - node
 #prometheus_server_jobs_extra: |
@@ -62,3 +65,6 @@ prometheus_server_web_listen_address: 127.0.0.1:9090
 #     jobs:
 #     - node
 #     - blackbox
+
+# prometheus_server_secret_files:
+#   user: secret
diff --git a/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml b/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml
index b568f722..739bbbad 100644
--- a/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml
+++ b/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml
@@ -11,15 +11,6 @@ prometheus_server_rules_prometheus:
       summary: Prometheus job missing (instance {{ '{{' }} $labels.instance {{ '}}' }})
       description: "A Prometheus job has disappeared\n  VALUE = {{ '{{' }} $value {{ '}}' }}\n  LABELS = {{ '{{' }} $labels {{ '}}' }}"
 
-  - alert: PrometheusJobMissing
-    expr: absent(up{job="prometheus"})
-    for: 0m
-    labels:
-      severity: warning
-    annotations:
-      summary: Prometheus job missing (instance {{ '{{' }} $labels.instance {{ '}}' }})
-      description: "A Prometheus job has disappeared\n  VALUE = {{ '{{' }} $value {{ '}}' }}\n  LABELS = {{ '{{' }} $labels {{ '}}' }}"
-
   - alert: PrometheusTargetMissing
     expr: up == 0
     for: 0m
-- 
cgit v1.2.3