From 4e5f835b6dd5aee26a663155211ee5dd3642d07d Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Mon, 14 Jun 2021 00:49:48 +0200 Subject: make prometheus exporter list groupvars --- roles/monitoring/prometheus/exporter/defaults/main.yml | 3 --- roles/monitoring/prometheus/exporter/meta/main.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 roles/monitoring/prometheus/exporter/defaults/main.yml (limited to 'roles/monitoring/prometheus/exporter') diff --git a/roles/monitoring/prometheus/exporter/defaults/main.yml b/roles/monitoring/prometheus/exporter/defaults/main.yml deleted file mode 100644 index 858c1837..00000000 --- a/roles/monitoring/prometheus/exporter/defaults/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -prometheus_exporters: - - node diff --git a/roles/monitoring/prometheus/exporter/meta/main.yml b/roles/monitoring/prometheus/exporter/meta/main.yml index ddb30f9a..d1d3eac7 100644 --- a/roles/monitoring/prometheus/exporter/meta/main.yml +++ b/roles/monitoring/prometheus/exporter/meta/main.yml @@ -2,6 +2,6 @@ dependencies: - role: monitoring/prometheus/exporter/base - role: monitoring/prometheus/exporter/node - when: "'node' in prometheus_exporters" + when: "'node' in (prometheus_exporters_default | union(prometheus_exporters_extra))" - role: monitoring/prometheus/exporter/blackbox - when: "'blackbox' in prometheus_exporters" + when: "'blackbox' in (prometheus_exporters_default | union(prometheus_exporters_extra))" -- cgit v1.2.3