From 2cfd8c45058e7a88f9404c451e0d70fd1b6986a3 Mon Sep 17 00:00:00 2001 From: Ashley Kleynhans Date: Tue, 9 Aug 2022 18:12:13 +0200 Subject: [PATCH 1/4] Fix issue templating systemd unit file --- tasks/_install_facts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/_install_facts.yml b/tasks/_install_facts.yml index 86c6545..713ad78 100644 --- a/tasks/_install_facts.yml +++ b/tasks/_install_facts.yml @@ -1,7 +1,7 @@ --- - name: 'Set {{ prometheus_software_name_version }} installation core facts' set_fact: - prometheus_software_command_args: '{{ prometheus_software_opts }} + {{ prometheus_software_extra_opts | default([], true) }}' + prometheus_software_command_args: '{{ prometheus_software_opts + (prometheus_software_extra_opts | default([], true)) }}' prometheus_software_root_dir: "{% if prometheus_exporter is defined and not prometheus_exporter %}\ {{ prometheus_root_dir }}/{{ prometheus_software_name }}\ From 799cd93f0dee096261277e92cae73a240a754982 Mon Sep 17 00:00:00 2001 From: Ashley Kleynhans Date: Fri, 12 Aug 2022 11:47:24 +0200 Subject: [PATCH 2/4] Fix RabbitMQ exporter --- tasks/rabbitmq_exporter_kbudde.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/rabbitmq_exporter_kbudde.yml b/tasks/rabbitmq_exporter_kbudde.yml index da5737a..a6c8691 100644 --- a/tasks/rabbitmq_exporter_kbudde.yml +++ b/tasks/rabbitmq_exporter_kbudde.yml @@ -24,7 +24,7 @@ {{ { "PUBLISH_ADDR": prometheus_software_host, "PUBLISH_PORT": prometheus_software_port } | combine(prometheus_software_env_vars) }} prometheus_software_url: "https://github.com/{{ prometheus_software_author }}/{{ prometheus_software_binary_name }}/releases/download/{{ prometheus_software_version }}/\ - {{ prometheus_software_binary_name }}-{{ prometheus_software_version | regex_replace('^(v)?') }}.{{ prometheus_software_architecture }}.tar.gz" + {{ prometheus_software_binary_name }}_{{ prometheus_software_version | regex_replace('^(v)?') }}_{{ prometheus_software_architecture | replace('-', '_') }}.tar.gz" - name: Include task to perform installation of {{ prometheus_software_name_version }} include_tasks: _install.yml From 252ed37536311d5670cfa5f9767ee00086f2050b Mon Sep 17 00:00:00 2001 From: Ashley Kleynhans Date: Thu, 16 Feb 2023 09:41:12 +0200 Subject: [PATCH 3/4] Bug fix for unsupported warn --- tasks/_install_from_binary.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/tasks/_install_from_binary.yml b/tasks/_install_from_binary.yml index 226314f..8755e5e 100644 --- a/tasks/_install_from_binary.yml +++ b/tasks/_install_from_binary.yml @@ -154,9 +154,6 @@ - name: Find {{ prometheus_software_name_version }} archive contents command: 'tar -tf {{ prometheus_software_archive_file }}' - args: - # Do not warn that we are running the tar command directly - warn: false register: prometheus_software_archive_contents changed_when: false when: From 19683781e23b07b14a47b31162bd206b74a13894 Mon Sep 17 00:00:00 2001 From: Ashley Kleynhans Date: Fri, 21 Jun 2024 22:29:01 +0200 Subject: [PATCH 4/4] Fix deprecated issue --- tasks/_setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/_setup.yml b/tasks/_setup.yml index 902c76f..1fdc009 100644 --- a/tasks/_setup.yml +++ b/tasks/_setup.yml @@ -3,7 +3,7 @@ include_vars: 'os-architecture/{{ ansible_system }}-{{ ansible_architecture }}.yml' - name: Include role mesaguy.prometheus common task - include: _common.yml + include_tasks: _common.yml - name: Define setup as complete set_fact: