diff options
| -rw-r--r-- | inventory/group_vars/promzone-chaos-at-home/vars.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-mon.yml | 3 | ||||
| -rw-r--r-- | roles/monitoring/prometheus/exporter/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/monitoring/prometheus/exporter/meta/main.yml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml index 8a0d0aa8..2345292b 100644 --- a/inventory/group_vars/promzone-chaos-at-home/vars.yml +++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml @@ -3,3 +3,7 @@ promethues_server: ch-mon promethues_zone_name: chaos@home prometheus_zone_targets: "{{ groups['promzone-chaos-at-home'] }}" + +prometheus_exporters_extra: [] +prometheus_exporters_default: + - node diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml index 25dae3ac..025289a4 100644 --- a/inventory/host_vars/ch-mon.yml +++ b/inventory/host_vars/ch-mon.yml @@ -61,8 +61,7 @@ prometheus_server_storage: size: 30G fs: ext4 -prometheus_exporters: - - node +prometheus_exporters_extra: - blackbox prometheus_exporter_blackbox_modules_extra: 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))" |