From 657d679072652ea47d85c7f50bf97e3cde31c2a8 Mon Sep 17 00:00:00 2001 From: Anton Boritskiy Date: Tue, 14 Jul 2020 12:31:55 +0100 Subject: [PATCH 1/3] ADHOC fix change-ownership: replace home links this repo was started by Andrew in private account and then was tranferred to Sitewards account - updaing references --- README.md | 2 +- templates/etc/systemd/system/node_exporter.service.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5a461bb..f872bc1 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ This will allow the role to be discovered. Then, add this repo as a submodule: ``` $ cd path/to/playbook/root $ mkdir roles/ -$ git submodule add https://github.com/littlemanco/ansible-role-node-exporter roles/node-exporter +$ git submodule add https://github.com/sitewards/ansible-role-node-exporter roles/node-exporter ``` This should work! diff --git a/templates/etc/systemd/system/node_exporter.service.j2 b/templates/etc/systemd/system/node_exporter.service.j2 index 89c1c9b..96c5bb9 100644 --- a/templates/etc/systemd/system/node_exporter.service.j2 +++ b/templates/etc/systemd/system/node_exporter.service.j2 @@ -1,6 +1,6 @@ [Unit] Description=The prometheus node exporter -Documentation=https://github.com/littlemanco/ansible-role-node-exporter +Documentation=https://github.com/sitewards/ansible-role-node-exporter [Service] From 1c74b0f0ff62c56c4579deb321e8e10802f7fffc Mon Sep 17 00:00:00 2001 From: Anton Boritskiy Date: Tue, 14 Jul 2020 12:32:52 +0100 Subject: [PATCH 2/3] ADHOC fix service-definition: repair compatibility repairing compatibility issue that is introduced by upstream changes https://github.com/prometheus/node_exporter/releases BREAKING CHANGES: The flag library has been changed, all flags now require double-dashs. (-foo becomes --foo) --- templates/etc/systemd/system/node_exporter.service.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/etc/systemd/system/node_exporter.service.j2 b/templates/etc/systemd/system/node_exporter.service.j2 index 96c5bb9..7c93436 100644 --- a/templates/etc/systemd/system/node_exporter.service.j2 +++ b/templates/etc/systemd/system/node_exporter.service.j2 @@ -10,8 +10,8 @@ Restart=always # Start the service, bound to localhost. It will be exposed by another service, such as NGINX or stunnel. ExecStart=/usr/local/bin/node_exporter \ --collector.textfile.directory="{{ node_exporter_textfile_directory }}" \ - -web.listen-address="127.0.0.1:9100" \ - -collectors.enabled="{{ node_exporter_exporters | join(',') }}" + --web.listen-address="127.0.0.1:9100" \ + --collectors.enabled="{{ node_exporter_exporters | join(',') }}" [Install] From 20cf5a630abf6f7b7a3d2aa548f9504e4c5b6784 Mon Sep 17 00:00:00 2001 From: Anton Boritskiy Date: Tue, 14 Jul 2020 12:40:24 +0100 Subject: [PATCH 3/3] ADHOC feat node-exporter-version: bump the version to match the upstream upgrade, taking latest stable version and not an RC --- defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index c671ab1..2cf710e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,7 +1,7 @@ --- ## The version of the node exporter to download and install. A full list of versions can be found at the following URL: ## https://github.com/prometheus/node_exporter/releases -node_exporter_version: "0.14.0" +node_exporter_version: "0.15.2" ## The architecture that the node exporter supports. The exporter is built for a series of architectures; see the above ## releases link for further details @@ -13,10 +13,10 @@ node_exporter_checksum_algorithm: "sha512" ## There are two checksums that matter: The archive, and the binary. The binary is the executable node exporter, ## the archive the thing it's downloaded with. -node_exporter_checksum_binary: "8aa6be677870c8b7dc3c5e1ff5824838c005b5413e2ea7781bd8763ca14c6aba04a0cad4698fc613ef013797821c39405e1566855f0c63495ebb4a2f733f75a7" +node_exporter_checksum_binary: "b2a4c62e33e2414aeb9ee80a3d54dc0ca35922398c528c46dc9b9074d39c8d19737b79abbc1bef64c4a36f36f67fb24073f470f451d93aa035a291726606a970" ## See above -node_exporter_checksum_archive: "8748f88480a2995a8188ed65c5b3f7d80bacac5fd1bde9e7f909299a4eee11479e9cca7fc1654a171b15b50654c92f353e86f24192410f0fcadea3b01c904913" +node_exporter_checksum_archive: "7987aac1fdf892e1f38262db11ce93b2a4a8a71921e733613336e8218c4c37724ba1d694abf94fd74a5b9ea49c75fac3d823b4d3aedb333b6fbc8fe9b6b73307" ## These are the default exporters that are enabled as of v0.14.0. To get a list of the available exporters, run ##