Skip to content
This repository was archived by the owner on Mar 6, 2023. It is now read-only.

Commit 8925f49

Browse files
authored
simplify automated CPU arch choosing (#64)
* simplify automated CPU arch choosing * change name to go_arch
1 parent 8b95583 commit 8925f49

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

tasks/install.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
- name: Download node_exporter binary to local folder
2525
become: false
2626
get_url:
27-
url: "https://github.com/prometheus/node_exporter/releases/download/v{{ node_exporter_version }}/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.tar.gz"
28-
dest: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.tar.gz"
27+
url: "https://github.com/prometheus/node_exporter/releases/download/v{{ node_exporter_version }}/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
28+
dest: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
2929
checksum: "sha256:{{ node_exporter_checksum }}"
3030
register: _download_binary
3131
until: _download_binary is succeeded
@@ -37,9 +37,9 @@
3737
- name: Unpack node_exporter binary
3838
become: false
3939
unarchive:
40-
src: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}.tar.gz"
40+
src: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}.tar.gz"
4141
dest: "/tmp"
42-
creates: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/node_exporter"
42+
creates: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}/node_exporter"
4343
delegate_to: localhost
4444
check_mode: false
4545

@@ -51,7 +51,7 @@
5151

5252
- name: Propagate node_exporter binaries
5353
copy:
54-
src: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}/node_exporter"
54+
src: "/tmp/node_exporter-{{ node_exporter_version }}.linux-{{ go_arch }}/node_exporter"
5555
dest: "/usr/local/bin/node_exporter"
5656
mode: 0750
5757
owner: "{{ node_exporter_system_user }}"

tasks/preflight.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
_checksums: "{{ lookup('url', 'https://github.com/prometheus/node_exporter/releases/download/v' + node_exporter_version + '/sha256sums.txt', wantlist=True) | list }}"
2121
run_once: true
2222

23-
- name: "Get checksum for {{ go_arch_map[ansible_architecture] | default(ansible_architecture) }} architecture"
23+
- name: "Get checksum for {{ go_arch }} architecture"
2424
set_fact:
2525
node_exporter_checksum: "{{ item.split(' ')[0] }}"
2626
with_items: "{{ _checksums }}"
27-
when: "('linux-' + (go_arch_map[ansible_architecture] | default(ansible_architecture)) + '.tar.gz') in item"
27+
when: "('linux-' + go_arch + '.tar.gz') in item"

vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@ go_arch_map:
66
armv7l: 'armv7'
77
armv6l: 'armv6'
88

9+
go_arch: "{{ go_arch_map[ansible_architecture] | default(ansible_architecture) }}"
10+
911
node_exporter_system_group: "node-exp"
1012
node_exporter_system_user: "{{ node_exporter_system_group }}"

0 commit comments

Comments
 (0)