Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #2747 upgrade node_exporter #2761

Merged
merged 20 commits into from
Dec 20, 2021
Merged

Issue #2747 upgrade node_exporter #2761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
fc9cae2
Issue #2747 upgrade node_exporter
romsok24 Nov 29, 2021
eee0506
Issue #2747 upgrade node_exporter to v 1.3.0
romsok24 Nov 29, 2021
986eb43
Folders expected by node-exporter (comment in Issue #2747)
romsok24 Dec 2, 2021
749abc4
Upd. to 1.3.0. also for DaemonSet installation type
romsok24 Dec 2, 2021
164c6bc
Naming convention has changed between versions
romsok24 Dec 2, 2021
e2d2119
These escape chars were causing errors on ADO tests
romsok24 Dec 4, 2021
d64fc0f
To correct msg: AnsibleUndefinedVariable specification
romsok24 Dec 6, 2021
f4607da
Issue #2747 upgrade node_exporter to v 1.3.1
romsok24 Dec 6, 2021
a15eca5
Fixing unknown escape sequences error in node-exp service logs
romsok24 Dec 6, 2021
040dad9
Issue #2747 upgrade node_exporter to v 1.3.1
romsok24 Dec 6, 2021
47ebe5d
Folders expected by node-exporter (comment in Issue #2747)
romsok24 Dec 6, 2021
5b3501f
These escape chars were causing errors on ADO tests
romsok24 Dec 7, 2021
3c49e78
Removed q. marks which caused non-existent path error
romsok24 Dec 7, 2021
47bdcc0
Now output will include node-exp ver from nondefault NS
romsok24 Dec 7, 2021
b018740
Naming convention has changed between versions
romsok24 Dec 8, 2021
80fe6da
Issue #2747 upgrade node_exporter to v 1.3.1
romsok24 Dec 9, 2021
fafdbab
Discarding this change due to moving to issue #2782
romsok24 Dec 10, 2021
4d4b813
Merge branch 'develop' into feature/upgr-node-eporter-2747
romsok24 Dec 10, 2021
940e284
Merge branch 'develop' into feature/upgr-node-eporter-2747
romsok24 Dec 13, 2021
1bbfb8c
Merge branch 'develop' into feature/upgr-node-eporter-2747
romsok24 Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/playbooks/roles/node_exporter/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
exporter:
version: "1.0.1"
version: "1.3.1"
service:
description: "Service that runs Prometheus Node Exporter"
name: prometheus-node-exporter
file_name:
x86_64: "node_exporter-1.0.1.linux-amd64.tar.gz"
aarch64: "node_exporter-1.0.1.linux-arm64.tar.gz"
x86_64: "node_exporter-1.3.1.linux-amd64.tar.gz"
aarch64: "node_exporter-1.3.1.linux-arm64.tar.gz"
node_exporter_helm_chart_name: node-exporter
# Use dedicated namespace for monitoring charts such as node exporter in case of k8s as cloud service.
monitoring_chart_namespace: epi-monitoring
3 changes: 2 additions & 1 deletion ansible/playbooks/roles/node_exporter/tasks/install-node-exporter-as-system-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
vars:
file_name: "{{ exporter_file_name }}"

- name: Create /opt/node_exporter directories
- name: Create node_exporter and textfile_collector directories
file:
path: "{{ item }}"
recurse: true
Expand All @@ -35,6 +35,7 @@
state: directory
with_items:
- /opt/node_exporter
- /var/lib/prometheus/node-exporter/textfile_collector

- name: Unpack node_exporter binary
unarchive:
Expand Down
4 changes: 2 additions & 2 deletions .../playbooks/roles/repository/files/download-requirements/centos-7/requirements.aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ https://dl.grafana.com/oss/release/grafana-8.3.2-1.aarch64.rpm
https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-arm64.tar.gz
https://github.com/danielqsj/kafka_exporter/releases/download/v1.4.2/kafka_exporter-1.4.2.linux-arm64.tar.gz
https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar
https://github.com/prometheus/node_exporter/releases/download/v1.0.1/node_exporter-1.0.1.linux-arm64.tar.gz
https://github.com/prometheus/node_exporter/releases/download/v1.3.1/node_exporter-1.3.1.linux-arm64.tar.gz
https://github.com/prometheus-community/postgres_exporter/releases/download/v0.9.0/postgres_exporter-0.9.0.linux-arm64.tar.gz
# --- Misc ---
https://archive.apache.org/dist/kafka/2.6.0/kafka_2.12-2.6.0.tgz
Expand All @@ -166,7 +166,7 @@ https://releases.hashicorp.com/vault/1.7.0/vault_1.7.0_linux_arm64.zip
https://get.helm.sh/helm-v3.2.0-linux-arm64.tar.gz
https://github.com/hashicorp/vault-helm/archive/v0.11.0.tar.gz
# --- Helm charts ---
https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz
https://charts.bitnami.com/bitnami/node-exporter-2.3.17.tgz
https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz
# --- Grafana Dashboards <url> <new filename> ---
# Kubernetes Cluster
Expand Down
4 changes: 2 additions & 2 deletions ...e/playbooks/roles/repository/files/download-requirements/centos-7/requirements.x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ https://dl.grafana.com/oss/release/grafana-8.3.2-1.x86_64.rpm
https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
https://github.com/danielqsj/kafka_exporter/releases/download/v1.4.2/kafka_exporter-1.4.2.linux-amd64.tar.gz
https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar
https://github.com/prometheus/node_exporter/releases/download/v1.0.1/node_exporter-1.0.1.linux-amd64.tar.gz
https://github.com/prometheus/node_exporter/releases/download/v1.3.1/node_exporter-1.3.1.linux-amd64.tar.gz
https://github.com/prometheus-community/postgres_exporter/releases/download/v0.9.0/postgres_exporter-0.9.0.linux-amd64.tar.gz
# --- Misc ---
https://archive.apache.org/dist/kafka/2.6.0/kafka_2.12-2.6.0.tgz
Expand All @@ -168,7 +168,7 @@ https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz
https://github.com/hashicorp/vault-helm/archive/v0.11.0.tar.gz
# --- Helm charts ---
https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz
https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz
https://charts.bitnami.com/bitnami/node-exporter-2.3.17.tgz
# --- Grafana Dashboards <url> <new filename> ---
# Kubernetes Cluster
https://grafana.com/api/dashboards/7249/revisions/1/download grafana_dashboard_7249.json
Expand Down
4 changes: 2 additions & 2 deletions ...e/playbooks/roles/repository/files/download-requirements/redhat-7/requirements.x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ https://dl.grafana.com/oss/release/grafana-8.3.2-1.x86_64.rpm
https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
https://github.com/danielqsj/kafka_exporter/releases/download/v1.4.2/kafka_exporter-1.4.2.linux-amd64.tar.gz
https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar
https://github.com/prometheus/node_exporter/releases/download/v1.0.1/node_exporter-1.0.1.linux-amd64.tar.gz
https://github.com/prometheus/node_exporter/releases/download/v1.3.1/node_exporter-1.3.1.linux-amd64.tar.gz
https://github.com/prometheus-community/postgres_exporter/releases/download/v0.9.0/postgres_exporter-0.9.0.linux-amd64.tar.gz
# --- Misc ---
https://archive.apache.org/dist/kafka/2.6.0/kafka_2.12-2.6.0.tgz
Expand All @@ -164,7 +164,7 @@ https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz
https://github.com/hashicorp/vault-helm/archive/v0.11.0.tar.gz
# --- Helm charts ---
https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz
https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz
https://charts.bitnami.com/bitnami/node-exporter-2.3.17.tgz
# --- Grafana Dashboards <url> <new filename> ---
# Kubernetes Cluster
https://grafana.com/api/dashboards/7249/revisions/1/download grafana_dashboard_7249.json
Expand Down
4 changes: 2 additions & 2 deletions ...aybooks/roles/repository/files/download-requirements/ubuntu-18.04/requirements.x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ https://dl.grafana.com/oss/release/grafana_8.3.2_amd64.deb
https://github.com/prometheus/haproxy_exporter/releases/download/v0.10.0/haproxy_exporter-0.10.0.linux-amd64.tar.gz
https://github.com/danielqsj/kafka_exporter/releases/download/v1.4.2/kafka_exporter-1.4.2.linux-amd64.tar.gz
https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.16.1/jmx_prometheus_javaagent-0.16.1.jar
https://github.com/prometheus/node_exporter/releases/download/v1.0.1/node_exporter-1.0.1.linux-amd64.tar.gz
https://github.com/prometheus/node_exporter/releases/download/v1.3.1/node_exporter-1.3.1.linux-amd64.tar.gz
https://github.com/prometheus-community/postgres_exporter/releases/download/v0.9.0/postgres_exporter-0.9.0.linux-amd64.tar.gz
# --- Misc ---
https://archive.apache.org/dist/kafka/2.6.0/kafka_2.12-2.6.0.tgz
Expand All @@ -226,7 +226,7 @@ https://releases.hashicorp.com/vault/1.7.0/vault_1.7.0_linux_amd64.zip
https://get.helm.sh/helm-v3.2.0-linux-amd64.tar.gz
https://github.com/hashicorp/vault-helm/archive/v0.11.0.tar.gz
# --- Helm charts ---
https://charts.bitnami.com/bitnami/node-exporter-1.1.2.tgz
https://charts.bitnami.com/bitnami/node-exporter-2.3.17.tgz
https://helm.elastic.co/helm/filebeat/filebeat-7.9.2.tgz
# --- Grafana Dashboards <url> <new filename> ---
# Kubernetes Cluster
Expand Down
9 changes: 9 additions & 0 deletions ansible/playbooks/roles/upgrade/tasks/node-exporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,14 @@
mode: u=rwx,g=rx,o=
state: directory

- name: Node Exporter as System Service | Create /var/lib/prometheus/node-exporter/textfile_collector directory
file:
path: /var/lib/prometheus/node-exporter/textfile_collector
owner: root
group: node_exporter
mode: u=rwx,g=rx,o=
state: directory

- name: Node Exporter as System Service | Unpack binary
unarchive:
remote_src: true
Expand All @@ -126,6 +134,7 @@
mode: u=rw,go=r
vars:
exporter_service_description: "{{ exporter_defaults.exporter.service.description }}"
specification: "{{ exporter_vars.specification }}"

- name: Node Exporter as System Service | Start exporter
systemd:
Expand Down
2 changes: 1 addition & 1 deletion docs/home/COMPONENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Note that versions are default versions and can be changed in certain cases thro
| Logstash OSS | 7.12.0 | https://github.com/elastic/logstash | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Prometheus | 2.31.1 | https://github.com/prometheus/prometheus | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Grafana | 8.3.2 | https://github.com/grafana/grafana | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Node Exporter | 1.0.1 | https://github.com/prometheus/node_exporter | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Node Exporter | 1.3.1 | https://github.com/prometheus/node_exporter | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Bitnami Node Exporter Helm Chart | 1.1.2 | https://github.com/bitnami/charts | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| Kafka Exporter | 1.4.2 | https://github.com/danielqsj/kafka_exporter | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
| HAProxy Exporter | 0.10.0 | https://github.com/prometheus/haproxy_exporter | [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) |
Expand Down
12 changes: 6 additions & 6 deletions schema/common/defaults/configuration/node-exporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ specification:
port: 9100
targetPort: 9100
files:
node_exporter_helm_chart_file_name: node-exporter-1.1.2.tgz
node_exporter_helm_chart_file_name: node-exporter-2.3.17.tgz
enabled_collectors:
- conntrack
- diskstats
Expand All @@ -31,11 +31,11 @@ specification:
config_flags:
- "--web.listen-address=:9100"
- '--log.level=info'
- '--collector.diskstats.ignored-devices=^(ram|loop|fd)\d+$'
- '--collector.filesystem.ignored-mount-points=^/(sys|proc|dev|run)($|/)'
- '--collector.netdev.device-blacklist="^$"'
- '--collector.textfile.directory="/var/lib/prometheus/node-exporter"'
- '--collector.systemd.unit-whitelist="(kafka\.service|zookeeper\.service)"'
- '--collector.diskstats.ignored-devices=^(ram|loop|fd)\\d+$'
- '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|run)($|/)'
- '--collector.netdev.device-exclude="^$"'
- '--collector.textfile.directory=/var/lib/prometheus/node-exporter'
- '--collector.systemd.unit-include=(kafka.service|zookeeper.service)'

web_listen_port: "9100"
web_listen_address: ""
Expand Down