Skip to content

Commit 513f414

Browse files
authored
Merge branch 'master' into autoupdate/node_exporter/1.10.2
2 parents b4824e2 + c287f86 commit 513f414

File tree

10 files changed

+19
-19
lines changed

10 files changed

+19
-19
lines changed

ansible/group_vars/all.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ nginx_exporter_port: "9113"
9494
# Image version
9595
###############
9696

97-
prometheus_version: "3.1.0"
98-
alertmanager_version: "0.28.0"
97+
prometheus_version: "3.8.1"
98+
alertmanager_version: "0.30.0"
9999
node_exporter_version: "1.10.2"
100-
cadvisor_version: "0.49.2"
101-
grafana_version: "11.4.0"
100+
cadvisor_version: "0.55.1"
101+
grafana_version: "12.3.1"
102102
haproxy_version: "lts-alpine"
103103
mysqld_exporter_version: "0.15.1"
104104
fluentd_version: "1.17"

ansible/roles/alertmanager/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
alertmanager_repo: "github.com/prometheus/alertmanager"
2-
alertmanager_version: "0.28.0"
2+
alertmanager_version: "0.30.0"
33
alertmanager_port: 9093
44
alertmanager_container_name: "alertmanager"
55
alertmanager_docker_namespace: "{{ docker_namespace if docker_namespace else 'prom' }}"

ansible/roles/alertmanager/meta/argument_specs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ argument_specs:
1010
options:
1111
alertmanager_version:
1212
description: "Alertmanager package version. Also accepts `latest` as parameter."
13-
default: 0.28.0
13+
default: 0.30.0
1414
alertmanager_web_listen_address:
1515
description: "Address on which alertmanager will be listening"
1616
default: "<ip-adress>:9093"

ansible/roles/cadvisor/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cadvisor_repo: "github.com/google/cadvisor"
2-
cadvisor_version: "0.49.2"
2+
cadvisor_version: "0.55.1"
33
cadvisor_port: "8080"
44
cadvisor_container_name: "cadvisor"
55
cadvisor_docker_namespace: "{{ docker_namespace if docker_namespace else 'cadvisor' }}"

ansible/roles/cadvisor/meta/argument_specs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ argument_specs:
1010
options:
1111
cadvisor_version:
1212
description: "cAdvisor package version. Also accepts latest as parameter."
13-
default: "0.49.2"
13+
default: "0.55.1"
1414
cadvisor_port:
1515
description: "Port on which cadvisor will listen"
1616
default: "8080"

ansible/roles/grafana/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
grafana_repo: "github.com/grafana/grafana"
3-
grafana_version: "11.4.0"
3+
grafana_version: "12.3.1"
44
grafana_container_name: "grafana"
55
grafana_docker_namespace: "{{ docker_namespace if docker_namespace else 'grafana' }}"
66
grafana_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ grafana_docker_namespace }}/grafana:{{ grafana_version }}"

ansible/roles/prometheus/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
prometheus_repo: "github.com/prometheus/prometheus"
3-
prometheus_version: "3.1.0"
3+
prometheus_version: "3.8.1"
44
prometheus_docker_namespace: "{{ docker_namespace if docker_namespace else 'prom' }}"
55
prometheus_port: 9090
66
prometheus_container_name: "prometheus"

ansible/roles/prometheus/meta/argument_specs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ argument_specs:
1212
description:
1313
- "Prometheus package version. Also accepts C(latest) as parameter."
1414
- "Only prometheus 2.x is supported"
15-
default: "2.51.2"
15+
default: "3.8.1"
1616
prometheus_config_dir:
1717
description: "Path to directory with prometheus configuration"
1818
default: "/etc/ansitheus/prometheus"

docs/quickstart.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ Commands:
168168
- Image: You can change the Docker image version by setting `*_version` variables. This is used mostly in upgrade case. The current version is listed here:
169169

170170
```yaml
171-
prometheus_version: "3.1.0"
172-
alertmanager_version: "0.28.0"
171+
prometheus_version: "3.8.1"
172+
alertmanager_version: "0.30.0"
173173
node_exporter_version: "1.10.2"
174-
cadvisor_version: "0.49.2"
175-
grafana_version: "11.4.0"
174+
cadvisor_version: "0.55.1"
175+
grafana_version: "12.3.1"
176176
haproxy_version: "lts-alpine"
177177
```
178178

etc/ansitheus/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ nginx_exporter_port: "9113"
6565
# Image version
6666
###############
6767

68-
prometheus_version: "3.1.0"
69-
alertmanager_version: "0.28.0"
68+
prometheus_version: "3.8.1"
69+
alertmanager_version: "0.30.0"
7070
node_exporter_version: "1.10.2"
71-
cadvisor_version: "0.49.2"
72-
grafana_version: "11.4.0"
71+
cadvisor_version: "0.55.1"
72+
grafana_version: "12.3.1"
7373
haproxy_version: "lts-alpine"
7474
mysqld_exporter_version: "0.15.1"
7575
fluentd_version: "1.17"

0 commit comments

Comments
 (0)