summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-mon.yml4
-rw-r--r--chaos-at-home/ch-testvm-prometheus.yml3
-rw-r--r--inventory/host_vars/ch-mon.yml4
-rw-r--r--roles/monitoring/prometheus/exporter/defaults/main.yml3
-rw-r--r--roles/monitoring/prometheus/exporter/meta/main.yml7
5 files changed, 16 insertions, 5 deletions
diff --git a/chaos-at-home/ch-mon.yml b/chaos-at-home/ch-mon.yml
index bce4adab..248de5d6 100644
--- a/chaos-at-home/ch-mon.yml
+++ b/chaos-at-home/ch-mon.yml
@@ -10,7 +10,5 @@
- role: storage/lvm/groups
- role: apt-repo/spreadspace
- role: monitoring/prometheus/ca
- - role: monitoring/prometheus/exporter/base
- - role: monitoring/prometheus/exporter/node
- - role: monitoring/prometheus/exporter/blackbox
+ - role: monitoring/prometheus/exporter
- role: monitoring/prometheus/server
diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml
index 9caa2f9a..3fd99d41 100644
--- a/chaos-at-home/ch-testvm-prometheus.yml
+++ b/chaos-at-home/ch-testvm-prometheus.yml
@@ -8,7 +8,6 @@
- role: core/zsh
- role: core/ntp
- role: apt-repo/spreadspace
- - role: monitoring/prometheus/exporter/base
- - role: monitoring/prometheus/exporter/node
+ - role: monitoring/prometheus/exporter
# - role: kubernetes/base
# - role: kubernetes/standalone/base
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index 222b0e08..25dae3ac 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -61,6 +61,10 @@ prometheus_server_storage:
size: 30G
fs: ext4
+prometheus_exporters:
+ - node
+ - blackbox
+
prometheus_exporter_blackbox_modules_extra:
icmp:
prober: icmp
diff --git a/roles/monitoring/prometheus/exporter/defaults/main.yml b/roles/monitoring/prometheus/exporter/defaults/main.yml
new file mode 100644
index 00000000..858c1837
--- /dev/null
+++ b/roles/monitoring/prometheus/exporter/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+prometheus_exporters:
+ - node
diff --git a/roles/monitoring/prometheus/exporter/meta/main.yml b/roles/monitoring/prometheus/exporter/meta/main.yml
new file mode 100644
index 00000000..ddb30f9a
--- /dev/null
+++ b/roles/monitoring/prometheus/exporter/meta/main.yml
@@ -0,0 +1,7 @@
+---
+dependencies:
+ - role: monitoring/prometheus/exporter/base
+ - role: monitoring/prometheus/exporter/node
+ when: "'node' in prometheus_exporters"
+ - role: monitoring/prometheus/exporter/blackbox
+ when: "'blackbox' in prometheus_exporters"