summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-03-24 23:21:32 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-03-24 23:21:32 +0100
commitfd5371432df742aba53d8aceca25783861757d9f (patch)
treec5b39ace3ddfbeb1f9a5607f277948e5d9db2a9d
parentch-mon/prometheus: ingore alerts from rh-router-apu (diff)
ch-mon: configure prometheus component version in group var
-rw-r--r--inventory/group_vars/promzone-chaos-at-home/vars.yml7
-rw-r--r--inventory/host_vars/ch-mon.yml10
-rw-r--r--inventory/host_vars/ch-phoebe.yml3
-rw-r--r--inventory/host_vars/ch-prometheus.yml3
4 files changed, 7 insertions, 16 deletions
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index 1a07e34d..fd217455 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -6,6 +6,13 @@ prometheus_exporters_default:
- node
prometheus_exporter_node_version: 1.3.1
+prometheus_exporter_ipmi_version: 1.5.1
+prometheus_exporter_ssl_version: 2.4.0
+prometheus_exporter_blackbox_version: 0.20.0
+prometheus_exporter_nut_version: 2.3.5
+
+prometheus_server_version: 2.32.1
+prometheus_alertmanager_version: 0.23.0
prometheus_server: ch-mon
prometheus_server_jobs:
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index e589e7ce..cbbb4dee 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -62,8 +62,6 @@ prometheus_server_storage:
size: 30G
fs: ext4
-prometheus_server_version: 2.32.1
-
prometheus_server_external_labels:
environment: chaos-at-home
monitor: "{{ inventory_hostname }}"
@@ -93,17 +91,11 @@ prometheus_exporters_extra:
- ssl
-prometheus_exporter_blackbox_version: 0.20.0
-
prometheus_exporter_blackbox_modules_extra:
icmp:
prober: icmp
-prometheus_exporter_nut_version: 2.3.5
-prometheus_exporter_ssl_version: 2.4.0
-
-
prometheus_job_multitarget_blackbox__probe:
ch-mon:
- instance: "ping-magentagw"
@@ -146,8 +138,6 @@ prometheus_server_jobs_extra: |
action: drop
-prometheus_alertmanager_version: 0.23.0
-
prometheus_alertmanager_smtp:
smarthost: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-prometheus-legacy']) | ipaddr('address') }}:25"
from: "noreply@chaos-at-home.org"
diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml
index 7a2191f8..915adbea 100644
--- a/inventory/host_vars/ch-phoebe.yml
+++ b/inventory/host_vars/ch-phoebe.yml
@@ -59,9 +59,6 @@ prometheus_exporters_extra:
- ssl
- ipmi
-prometheus_exporter_ssl_version: 2.4.0
-
-prometheus_exporter_ipmi_version: 1.5.1
prometheus_exporter_ipmi_modules:
default:
collectors:
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index f5efd1ef..9763ba2f 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -55,9 +55,6 @@ prometheus_exporters_extra:
- ssl
- ipmi
-prometheus_exporter_ssl_version: 2.4.0
-
-prometheus_exporter_ipmi_version: 1.5.1
prometheus_exporter_ipmi_modules:
default:
collectors: