Skip to content

Commit da146e0

Browse files
authored
Merge pull request #301 from mark-tomich/main
bugfix: use temporary directory to make compatible with multi-user controllers
2 parents cf1a5db + 8a9c4e6 commit da146e0

File tree

57 files changed

+207
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+207
-93
lines changed

roles/alertmanager/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,3 +134,6 @@ alertmanager_amtool_config_alertmanager_url: "{{ alertmanager_web_external_url }
134134

135135
# Extended output of `amtool` commands, use '' for less verbosity
136136
alertmanager_amtool_config_output: 'extended'
137+
138+
# Local path to stash the archive and its extraction
139+
alertmanager_archive_path: /tmp

roles/alertmanager/meta/argument_specs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,3 +110,6 @@ argument_specs:
110110
alertmanager_amtool_config_output:
111111
description: 'Extended output, use C("") for simple output.'
112112
default: "extended"
113+
alertmanager_archive_path:
114+
description: 'Local path to stash the archive and its extraction'
115+
default: "/tmp"

roles/alertmanager/tasks/install.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
become: false
3737
ansible.builtin.get_url:
3838
url: "{{ alertmanager_binary_url }}"
39-
dest: "/tmp/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
39+
dest: "{{ alertmanager_archive_path }}/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
4040
checksum: "sha256:{{ __alertmanager_checksum }}"
4141
mode: 0644
4242
register: _download_archive
@@ -50,16 +50,16 @@
5050
- name: Unpack alertmanager binaries
5151
become: false
5252
ansible.builtin.unarchive:
53-
src: "/tmp/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
54-
dest: "/tmp"
53+
src: "{{ alertmanager_archive_path }}/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}.tar.gz"
54+
dest: "{{ alertmanager_archive_path }}"
5555
mode: 0755
56-
creates: "/tmp/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}/alertmanager"
56+
creates: "{{ alertmanager_archive_path }}/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}/alertmanager"
5757
delegate_to: localhost
5858
check_mode: false
5959

6060
- name: Propagate official alertmanager and amtool binaries
6161
ansible.builtin.copy:
62-
src: "/tmp/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}/{{ item }}"
62+
src: "{{ alertmanager_archive_path }}/alertmanager-{{ alertmanager_version }}.linux-{{ go_arch }}/{{ item }}"
6363
dest: "{{ _alertmanager_binary_install_dir }}/{{ item }}"
6464
mode: 0755
6565
owner: root

roles/blackbox_exporter/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,3 +75,6 @@ blackbox_exporter_configuration_modules:
7575
blackbox_exporter_config_dir: /etc/blackbox_exporter
7676

7777
blackbox_exporter_binary_install_dir: "/usr/local/bin"
78+
79+
# Local path to stash the archive and its extraction
80+
blackbox_exporter_archive_path: /tmp

roles/blackbox_exporter/meta/argument_specs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ argument_specs:
5656
blackbox_exporter_group:
5757
description: "The group the exporter runs as"
5858
default: "blackbox-exp"
59+
blackbox_exporter_archive_path:
60+
description: 'Local path to stash the archive and its extraction'
61+
default: "/tmp"

roles/blackbox_exporter/tasks/install.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
become: false
2626
ansible.builtin.get_url:
2727
url: "{{ blackbox_exporter_binary_url }}"
28-
dest: "/tmp/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}.tar.gz"
28+
dest: "{{ blackbox_exporter_archive_path }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}.tar.gz"
2929
checksum: "sha256:{{ __blackbox_exporter_checksum }}"
3030
mode: '0644'
3131
register: _download_binary
@@ -38,15 +38,15 @@
3838
- name: Unpack blackbox_exporter binary
3939
become: false
4040
ansible.builtin.unarchive:
41-
src: "/tmp/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}.tar.gz"
42-
dest: "/tmp"
43-
creates: "/tmp/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}/blackbox_exporter"
41+
src: "{{ blackbox_exporter_archive_path }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}.tar.gz"
42+
dest: "{{ blackbox_exporter_archive_path }}"
43+
creates: "{{ blackbox_exporter_archive_path }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}/blackbox_exporter"
4444
delegate_to: localhost
4545
check_mode: false
4646

4747
- name: Propagate blackbox_exporter binaries
4848
ansible.builtin.copy:
49-
src: "/tmp/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}/blackbox_exporter"
49+
src: "{{ blackbox_exporter_archive_path }}/blackbox_exporter-{{ blackbox_exporter_version }}.linux-{{ go_arch }}/blackbox_exporter"
5050
dest: "{{ blackbox_exporter_binary_install_dir }}/blackbox_exporter"
5151
mode: 0755
5252
owner: root

roles/cadvisor/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ cadvisor_prometheus_endpoint: "/metrics"
1212
cadvisor_binary_install_dir: "/usr/local/bin"
1313
cadvisor_system_group: "root"
1414
cadvisor_system_user: "{{ cadvisor_system_group }}"
15+
16+
# Local path to stash the archive and its extraction
17+
cadvisor_archive_path: /tmp

roles/cadvisor/meta/argument_specs.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,6 @@ argument_specs:
4747
- "I(Advanced)"
4848
- "cAdvisor user"
4949
default: "root"
50+
cadvisor_archive_path:
51+
description: 'Local path to stash the archive and its extraction'
52+
default: "/tmp"

roles/cadvisor/tasks/install.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
become: false
2828
ansible.builtin.get_url:
2929
url: "{{ cadvisor_binary_url }}"
30-
dest: "/tmp/cadvisor-v{{ cadvisor_version }}-linux-{{ go_arch }}"
30+
dest: "{{ cadvisor_archive_path }}/cadvisor-v{{ cadvisor_version }}-linux-{{ go_arch }}"
3131
mode: '0644'
3232
register: _download_binary
3333
until: _download_binary is succeeded
@@ -38,7 +38,7 @@
3838

3939
- name: Propagate cadvisor binaries
4040
ansible.builtin.copy:
41-
src: "/tmp/cadvisor-v{{ cadvisor_version }}-linux-{{ go_arch }}"
41+
src: "{{ cadvisor_archive_path }}/cadvisor-v{{ cadvisor_version }}-linux-{{ go_arch }}"
4242
dest: "{{ cadvisor_binary_install_dir }}/cadvisor"
4343
mode: 0755
4444
owner: root

roles/chrony_exporter/defaults/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ chrony_exporter_disabled_collectors: []
2424
chrony_exporter_binary_install_dir: "/usr/local/bin"
2525
chrony_exporter_system_group: "chrony-exp"
2626
chrony_exporter_system_user: "{{ chrony_exporter_system_group }}"
27+
28+
# Local path to stash the archive and its extraction
29+
chrony_exporter_archive_path: /tmp

0 commit comments

Comments
 (0)