From 979021f5c40c812d7a9edf22bf8945f691badeed Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Wed, 15 Feb 2023 20:23:49 +0100
Subject: Import Prometheus server configuration

* add new roles:
  - monitoring.prometheus
  - monitoring.prometheus-alertmanager
  - monitoring.prometheus-exporter-blackbox
* add common Prometheus and Prometheus Alertmanager pillar data
* add moni.lysergic.dev specific Prometheus pillar data

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 salt/role/monitoring/prometheus-alertmanager.sls      | 2 ++
 salt/role/monitoring/prometheus-exporter-blackbox.sls | 2 ++
 salt/role/monitoring/prometheus.sls                   | 2 ++
 3 files changed, 6 insertions(+)
 create mode 100644 salt/role/monitoring/prometheus-alertmanager.sls
 create mode 100644 salt/role/monitoring/prometheus-exporter-blackbox.sls
 create mode 100644 salt/role/monitoring/prometheus.sls

(limited to 'salt/role/monitoring')

diff --git a/salt/role/monitoring/prometheus-alertmanager.sls b/salt/role/monitoring/prometheus-alertmanager.sls
new file mode 100644
index 0000000..017d914
--- /dev/null
+++ b/salt/role/monitoring/prometheus-alertmanager.sls
@@ -0,0 +1,2 @@
+include:
+  - .prometheus
diff --git a/salt/role/monitoring/prometheus-exporter-blackbox.sls b/salt/role/monitoring/prometheus-exporter-blackbox.sls
new file mode 100644
index 0000000..017d914
--- /dev/null
+++ b/salt/role/monitoring/prometheus-exporter-blackbox.sls
@@ -0,0 +1,2 @@
+include:
+  - .prometheus
diff --git a/salt/role/monitoring/prometheus.sls b/salt/role/monitoring/prometheus.sls
new file mode 100644
index 0000000..adf0b70
--- /dev/null
+++ b/salt/role/monitoring/prometheus.sls
@@ -0,0 +1,2 @@
+include:
+  - prometheus.config
-- 
cgit v1.2.3


From 2bafbeedd72e4d3c02da56cf361f98e50382ce13 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Wed, 15 Feb 2023 20:59:46 +0100
Subject: Manage Prometheus targets

Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
 salt/role/monitoring/prometheus-alertmanager.sls      | 2 +-
 salt/role/monitoring/prometheus-exporter-blackbox.sls | 2 +-
 salt/role/monitoring/prometheus.sls                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'salt/role/monitoring')

diff --git a/salt/role/monitoring/prometheus-alertmanager.sls b/salt/role/monitoring/prometheus-alertmanager.sls
index 017d914..adf0b70 100644
--- a/salt/role/monitoring/prometheus-alertmanager.sls
+++ b/salt/role/monitoring/prometheus-alertmanager.sls
@@ -1,2 +1,2 @@
 include:
-  - .prometheus
+  - prometheus.config
diff --git a/salt/role/monitoring/prometheus-exporter-blackbox.sls b/salt/role/monitoring/prometheus-exporter-blackbox.sls
index 017d914..adf0b70 100644
--- a/salt/role/monitoring/prometheus-exporter-blackbox.sls
+++ b/salt/role/monitoring/prometheus-exporter-blackbox.sls
@@ -1,2 +1,2 @@
 include:
-  - .prometheus
+  - prometheus.config
diff --git a/salt/role/monitoring/prometheus.sls b/salt/role/monitoring/prometheus.sls
index adf0b70..9a96176 100644
--- a/salt/role/monitoring/prometheus.sls
+++ b/salt/role/monitoring/prometheus.sls
@@ -1,2 +1,3 @@
 include:
   - prometheus.config
+  - profile.prometheus.targets
-- 
cgit v1.2.3