From 050c9d3347bffb1acf9d94c388c3a3837633d5b5 Mon Sep 17 00:00:00 2001 From: gardar Date: Sat, 28 Sep 2024 02:57:10 +0000 Subject: [PATCH] fix: remove unneeded download step that can cause ratelimit Signed-off-by: gardar --- roles/snmp_exporter/tasks/configure.yml | 30 +++++++++++-------------- roles/snmp_exporter/tasks/install.yml | 8 ------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/roles/snmp_exporter/tasks/configure.yml b/roles/snmp_exporter/tasks/configure.yml index bf52bd5e8..d6031d8a5 100644 --- a/roles/snmp_exporter/tasks/configure.yml +++ b/roles/snmp_exporter/tasks/configure.yml @@ -1,4 +1,12 @@ --- +- name: Create configuration directory + ansible.builtin.file: + path: "/etc/snmp_exporter" + state: directory + owner: root + group: root + mode: 0755 + - name: Copy the SNMP Exporter systemd service file ansible.builtin.template: src: snmp_exporter.service.j2 @@ -9,24 +17,9 @@ notify: - restart snmp_exporter -- name: Download snmp configuration file from github repository - ansible.builtin.get_url: - url: "https://raw.githubusercontent.com/prometheus/snmp_exporter/v{{ snmp_exporter_version }}/snmp.yml" - dest: /etc/snmp_exporter/snmp.yml - owner: root - group: root - mode: 0644 - register: _download_config - until: _download_config is success - retries: 5 - delay: 2 - notify: - - reload snmp_exporter - when: not (snmp_exporter_config_file) - - name: Copy configuration file ansible.builtin.template: - src: "{{ snmp_exporter_config_file }}" + src: "{{ snmp_exporter_config_file | default(__snmp_exporter_config_file, true) }}" dest: /etc/snmp_exporter/snmp.yml owner: root group: root @@ -34,4 +27,7 @@ no_log: "{{ false if (lookup('env', 'CI')) or (lookup('env', 'MOLECULE_PROVISIONER_NAME')) else true }}" notify: - reload snmp_exporter - when: (snmp_exporter_config_file) + vars: + __snmp_exporter_config_file: "{{ (snmp_exporter_binary_local_dir) | + ternary(snmp_exporter_binary_local_dir ~ '/snmp.yml', + snmp_exporter_archive_path ~ '/snmp_exporter-' ~ snmp_exporter_version ~ '.linux-' ~ go_arch ~ '/snmp.yml') }}" diff --git a/roles/snmp_exporter/tasks/install.yml b/roles/snmp_exporter/tasks/install.yml index dce9d9bc1..bcfb47dcf 100644 --- a/roles/snmp_exporter/tasks/install.yml +++ b/roles/snmp_exporter/tasks/install.yml @@ -49,11 +49,3 @@ - snmp_exporter_binary_local_dir | length > 0 - not snmp_exporter_skip_install notify: restart snmp_exporter - -- name: Create configuration directory - ansible.builtin.file: - path: "/etc/snmp_exporter" - state: directory - owner: root - group: root - mode: 0755