summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-03-22 19:24:17 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-03-22 19:29:27 +0100
commit70e882149f12af7be5f4dbff442fc4e70db8551e (patch)
tree61c85a7bd9934d2e5025b25ca68c9e7e1cc2ad6b
parentmonitoring/grafana: pinning packages (diff)
prometheus: upgrade all the packages
-rw-r--r--inventory/group_vars/promzone-chaos-at-home/vars.yml2
-rw-r--r--inventory/host_vars/ch-mon.yml10
-rw-r--r--inventory/host_vars/ch-phoebe.yml4
-rw-r--r--inventory/host_vars/ch-prometheus.yml4
-rw-r--r--roles/monitoring/prometheus/alertmanager/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/exporter/ipmi/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/exporter/node/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/exporter/nut/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/exporter/ssl/tasks/main.yml1
-rw-r--r--roles/monitoring/prometheus/server/tasks/main.yml1
12 files changed, 20 insertions, 8 deletions
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index cc17e0a4..1a07e34d 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -5,7 +5,7 @@ prometheus_exporters_extra: []
prometheus_exporters_default:
- node
-prometheus_exporter_node_version: 1.2.2
+prometheus_exporter_node_version: 1.3.1
prometheus_server: ch-mon
prometheus_server_jobs:
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index cc873158..47ce828e 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -62,7 +62,7 @@ prometheus_server_storage:
size: 30G
fs: ext4
-prometheus_server_version: 2.30.1
+prometheus_server_version: 2.32.1
prometheus_server_external_labels:
environment: chaos-at-home
@@ -93,15 +93,15 @@ prometheus_exporters_extra:
- ssl
-prometheus_exporter_blackbox_version: 0.19.0
+prometheus_exporter_blackbox_version: 0.20.0
prometheus_exporter_blackbox_modules_extra:
icmp:
prober: icmp
-prometheus_exporter_nut_version: 2.2.1
-prometheus_exporter_ssl_version: 2.3.1
+prometheus_exporter_nut_version: 2.3.5
+prometheus_exporter_ssl_version: 2.4.0
prometheus_job_multitarget_blackbox__probe:
@@ -146,7 +146,7 @@ prometheus_server_jobs_extra: |
action: drop
-prometheus_alertmanager_version: 0.22.2
+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"
diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml
index cb5562d5..7a2191f8 100644
--- a/inventory/host_vars/ch-phoebe.yml
+++ b/inventory/host_vars/ch-phoebe.yml
@@ -59,7 +59,9 @@ prometheus_exporters_extra:
- ssl
- ipmi
-prometheus_exporter_ipmi_version: 1.4.0
+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 af8298f2..f5efd1ef 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -55,7 +55,9 @@ prometheus_exporters_extra:
- ssl
- ipmi
-prometheus_exporter_ipmi_version: 1.4.0
+prometheus_exporter_ssl_version: 2.4.0
+
+prometheus_exporter_ipmi_version: 1.5.1
prometheus_exporter_ipmi_modules:
default:
collectors:
diff --git a/roles/monitoring/prometheus/alertmanager/tasks/main.yml b/roles/monitoring/prometheus/alertmanager/tasks/main.yml
index 796f9def..fda71151 100644
--- a/roles/monitoring/prometheus/alertmanager/tasks/main.yml
+++ b/roles/monitoring/prometheus/alertmanager/tasks/main.yml
@@ -26,6 +26,7 @@
name: "prom-alertmanager{% if prometheus_alertmanager_version is defined %}={{ prometheus_alertmanager_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus-alertmanager
- name: add user for alertmanager
user:
diff --git a/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml b/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml
index f04cf68d..a5e7a72c 100644
--- a/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/blackbox/tasks/main.yml
@@ -19,6 +19,7 @@
name: "prom-exporter-blackbox{% if prometheus_exporter_blackbox_version is defined %}={{ prometheus_exporter_blackbox_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus-blackbox-exporter
- name: create config directory
file:
diff --git a/roles/monitoring/prometheus/exporter/ipmi/tasks/main.yml b/roles/monitoring/prometheus/exporter/ipmi/tasks/main.yml
index 81039e29..e2b2597e 100644
--- a/roles/monitoring/prometheus/exporter/ipmi/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/ipmi/tasks/main.yml
@@ -19,6 +19,7 @@
name: "prom-exporter-ipmi{% if prometheus_exporter_ipmi_version is defined %}={{ prometheus_exporter_ipmi_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus-ipmi-exporter
- name: create config directory
file:
diff --git a/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml b/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml
index 45c6b03b..e84ec15b 100644
--- a/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml
@@ -19,6 +19,7 @@
name: "prom-exporter-mikrotik{% if prometheus_exporter_mikrotik_version is defined %}={{ prometheus_exporter_mikrotik_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus-mikrotik-exporter
- name: create config directory
file:
diff --git a/roles/monitoring/prometheus/exporter/node/tasks/main.yml b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
index 7860212b..af345bc5 100644
--- a/roles/monitoring/prometheus/exporter/node/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
@@ -21,6 +21,7 @@
- moreutils
state: present
allow_downgrade: yes
+ notify: restart prometheus-node-exporter
- name: create directory for textfile collector
file:
diff --git a/roles/monitoring/prometheus/exporter/nut/tasks/main.yml b/roles/monitoring/prometheus/exporter/nut/tasks/main.yml
index 79074d03..a2f2c5d7 100644
--- a/roles/monitoring/prometheus/exporter/nut/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/nut/tasks/main.yml
@@ -19,6 +19,7 @@
name: "prom-exporter-nut{% if prometheus_exporter_nut_version is defined %}={{ prometheus_exporter_nut_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus-nut-exporter
- name: generate systemd service unit
template:
diff --git a/roles/monitoring/prometheus/exporter/ssl/tasks/main.yml b/roles/monitoring/prometheus/exporter/ssl/tasks/main.yml
index 79e36389..07c1b3fb 100644
--- a/roles/monitoring/prometheus/exporter/ssl/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/ssl/tasks/main.yml
@@ -19,6 +19,7 @@
name: "prom-exporter-ssl{% if prometheus_exporter_ssl_version is defined %}={{ prometheus_exporter_ssl_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus-ssl-exporter
- name: create config directory
file:
diff --git a/roles/monitoring/prometheus/server/tasks/main.yml b/roles/monitoring/prometheus/server/tasks/main.yml
index c9acd345..518ef73e 100644
--- a/roles/monitoring/prometheus/server/tasks/main.yml
+++ b/roles/monitoring/prometheus/server/tasks/main.yml
@@ -33,6 +33,7 @@
name: "prom-server{% if prometheus_server_version is defined %}={{ prometheus_server_version }}-1{% endif %}"
state: present
allow_downgrade: yes
+ notify: restart prometheus
- name: add user for server
user: