diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2023-02-21 01:12:42 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2023-02-21 01:12:42 +0100 |
| commit | ffe060c1cfc37f7cce52f1b719161c338ba94d96 (patch) | |
| tree | 7266884433a7c392573f12013643b7be56e6a125 | |
| parent | ele-(dione|telesto): no need for special ntp config anymore (diff) | |
some more prometheus role cleanups
| -rw-r--r-- | dan/ele-emc-ctrl.yml | 2 | ||||
| -rw-r--r-- | dan/emc-cdn.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/promzone-chaos-at-home/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/group_vars/promzone-elevate-festival/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/hosts.ini | 23 |
5 files changed, 13 insertions, 16 deletions
diff --git a/dan/ele-emc-ctrl.yml b/dan/ele-emc-ctrl.yml index fc6456cb..9cdd3ca7 100644 --- a/dan/ele-emc-ctrl.yml +++ b/dan/ele-emc-ctrl.yml @@ -13,6 +13,6 @@ roles: - role: apt-repo/spreadspace - role: nginx/base -# - role: monitoring/prometheus/exporter + - role: monitoring/prometheus/exporter - role: storage/lvm/groups - role: elevate/emc-stats diff --git a/dan/emc-cdn.yml b/dan/emc-cdn.yml index 25d96d85..2afa25ea 100644 --- a/dan/emc-cdn.yml +++ b/dan/emc-cdn.yml @@ -14,4 +14,4 @@ - role: storage/lvm/groups - role: apt-repo/spreadspace - role: nginx/base -# - role: monitoring/prometheus/exporter + - role: monitoring/prometheus/exporter diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml index 19ddc6aa..a4f44866 100644 --- a/inventory/group_vars/promzone-chaos-at-home/vars.yml +++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml @@ -31,7 +31,6 @@ prometheus_server_jobs: - bind prometheus_zone_name: chaos@home -prometheus_zone_targets: "{{ groups['promzone-chaos-at-home'] }}" ## TODO: ## potential extra alert rule: (bind_zone_serial{instance="ch-mimas"} == bool on(job, view, zone_name) bind_zone_serial{instance="ch-pan"}) != 1 diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml index 08b7a0d3..795f2da1 100644 --- a/inventory/group_vars/promzone-elevate-festival/vars.yml +++ b/inventory/group_vars/promzone-elevate-festival/vars.yml @@ -25,4 +25,3 @@ prometheus_server_jobs: - ipmi prometheus_zone_name: Elevate Festival -prometheus_zone_targets: "{{ groups['promzone-elevate-festival'] }}" diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 418c9c83..568a7dfa 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -224,7 +224,6 @@ ele-infobeamer [ele-ap] # ele-ap-forum[0:3] # ele-ap-parkhouse0 -# ele-ap-orpheum0 # ele-ap-uhrturm0 # ele-ap-nextlib[0:6] ele-ap-hmtsaal[0:3] @@ -439,8 +438,8 @@ ch-pan ch-mimas [promzone-chaos-at-home:children] chaos-at-home-ap -#chaos-at-home-ups -#chaos-at-home-sensors +chaos-at-home-ups +chaos-at-home-sensors promzone-chaos-at-home-server [promzone-elevate-festival-server] @@ -450,17 +449,17 @@ ele-media ele-helene ele-dione ele-telesto -#ele-router-hmtsaal -#ele-router-emc -#ele-ap-hmtsaal[0:3] -#ele-ups-hmtsaal[0:2] -#ele-router-orpheum -#ele-thetys +ele-router-hmtsaal +ele-router-emc +ele-ap-hmtsaal[0:3] +ele-ups-hmtsaal[0:2] +ele-router-orpheum +ele-thetys [promzone-elevate-festival:children] -#ele-ap -#ele-ups +ele-ap +ele-ups promzone-elevate-festival-server -#elevate-mediachannel +elevate-mediachannel ## openvpn |