Skip to content

Commit 64fb3a0

Browse files
authored
Merge pull request #68 from pietroalbini/monitoring-updates
Update monitoring-related software on our instance
2 parents 0383b78 + e6fe35a commit 64fb3a0

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

ansible/group_vars/all.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@ global_collect_metrics_from:
66
# Version of https://github.com/prometheus/node_exporter to install on our
77
# instances. The checksum is the hash of the downloadable tarball for the
88
# specified architecture, found in the GitHub releases.
9-
node_exporter_version: 1.0.1
9+
node_exporter_version: 1.1.2
1010
node_exporter_archs:
1111
x86_64:
1212
name: amd64
13-
checksum: sha256:3369b76cd2b0ba678b6d618deab320e565c3d93ccb5c2a0d5db51a53857768ae
13+
checksum: sha256:8c1f6a317457a658e0ae68ad710f6b4098db2cad10204649b51e3c043aa3e70d
1414
aarch64:
1515
name: arm64
16-
checksum: sha256:017514906922fcc4b7d727655690787faed0562bc7a17aa9f72b0651cb1b47fb
16+
checksum: sha256:eb5e7d16f18bb3272d0d832986fc8ac6cb0b6c42d487c94e15dabb10feae8e04
1717

1818
# Version of https://github.com/prometheus/prometheus to install on our
1919
# instances. The checksum is the hash of the downloadable tarball for the
2020
# specified architecture, found in the GitHub releases.
21-
prometheus_version: 2.12.0
21+
prometheus_version: 2.26.0
2222
prometheus_arch: amd64
23-
prometheus_checksum: sha256:b9f57b6e64fb3048742cfa7dbcc727e1df906d8020ef246a5e81b7959ae97e08
23+
prometheus_checksum: sha256:8dd6786c338dc62728e8891c13b62eda66c7f28a01398869f2b3712895b441b9
2424

2525
# Version of https://github.com/prometheus/alertmanager to install on our
2626
# instances. The checksum is the hash of the downloadable tarball for the
2727
# specified architecture, found in the GitHub releases.
28-
alertmanager_version: 0.18.0
28+
alertmanager_version: 0.21.0
2929
alertmanager_arch: amd64
30-
alertmanager_checksum: sha256:5f17155d669a8d2243b0d179fa46e609e0566876afd0afb09311a8bc7987ab15
30+
alertmanager_checksum: sha256:9ccd863937436fd6bfe650e22521a7f2e6a727540988eef515dde208f9aef232
3131

3232
# Version of https://grafana.com to install in our instances. The checksum is
3333
# the hash of the .deb for the specified architecture, found here:
3434
# https://grafana.com/grafana/download
35-
grafana_version: 6.3.3
35+
grafana_version: 7.5.5
3636
grafana_arch: amd64
37-
grafana_checksum: sha256:7e2c05fb8c2b2595b7230cb34c3cd761891a4c3346e6d45518669d3946755e2d
37+
grafana_checksum: sha256:a6342dc645da72a92ac50ff053f9a9ca591f8334797174b9c70521bdcd349fe9
3838

3939
# Version of https://github.com/letsencrypt/pebble to install on our instances.
4040
# The checksum is the hash of the downloadable binary for the specific

ansible/roles/monitoring-server/tasks/grafana.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
when: |
3535
grafana_capture.rc != 0 or not grafana_capture.stdout.startswith(
36-
"Grafana cli version " + grafana_version
36+
"Grafana CLI version " + grafana_version
3737
)
3838
3939
- name: check if a grafana secret key was generated

ansible/roles/monitoring-server/tasks/prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
state: absent
3535

3636
when: |
37-
prometheus_capture.rc != 0 or not prometheus_capture.stderr.startswith(
37+
prometheus_capture.rc != 0 or not prometheus_capture.stdout.startswith(
3838
"prometheus, version " + prometheus_version
3939
)
4040

0 commit comments

Comments
 (0)