From 2b04207026e74ccf6bd710d482c9ead535057429 Mon Sep 17 00:00:00 2001 From: Thomas Venieris Date: Sat, 29 Jul 2023 00:17:22 +0200 Subject: [PATCH 1/2] feature: Make config installation dir configurable Signed-off-by: Thomas Venieris --- roles/blackbox_exporter/defaults/main.yml | 3 +++ roles/blackbox_exporter/tasks/configure.yml | 2 +- roles/blackbox_exporter/templates/blackbox_exporter.service.j2 | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/blackbox_exporter/defaults/main.yml b/roles/blackbox_exporter/defaults/main.yml index 3b1f54533..9899eb478 100644 --- a/roles/blackbox_exporter/defaults/main.yml +++ b/roles/blackbox_exporter/defaults/main.yml @@ -65,3 +65,6 @@ blackbox_exporter_configuration_modules: # preferred_ip_protocol: ip6 # validate_answer_rrs: # fail_if_matches_regexp: [test] + +# Where to put the blackbox_exporter.yml main configuration file +blackbox_exporter_conf_dir: /etc diff --git a/roles/blackbox_exporter/tasks/configure.yml b/roles/blackbox_exporter/tasks/configure.yml index 256fc9139..0e0b88899 100644 --- a/roles/blackbox_exporter/tasks/configure.yml +++ b/roles/blackbox_exporter/tasks/configure.yml @@ -12,7 +12,7 @@ - name: Configure blackbox exporter ansible.builtin.template: src: blackbox_exporter.yml.j2 - dest: /etc/blackbox_exporter.yml + dest: "{{ blackbox_exporter_conf_dir }}/blackbox_exporter.yml" owner: blackbox-exp group: blackbox-exp mode: 0644 diff --git a/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 b/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 index bdec6043c..b0774ec5e 100644 --- a/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 +++ b/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 @@ -12,7 +12,7 @@ Group=blackbox-exp PermissionsStartOnly=true ExecReload=/bin/kill -HUP $MAINPID ExecStart=/usr/local/bin/blackbox_exporter \ - --config.file=/etc/blackbox_exporter.yml \ + --config.file={{ blackbox_exporter_conf_dir }}/blackbox_exporter.yml \ {% for flag, flag_value in blackbox_exporter_cli_flags.items() -%} --{{ flag }}={{ flag_value }} \ {% endfor -%} From d446cddb124abe8d72a020e04e6d9b96a6281145 Mon Sep 17 00:00:00 2001 From: Thomas Venieris Date: Sat, 29 Jul 2023 15:06:58 +0200 Subject: [PATCH 2/2] fix: blackbox_exporter_config_dir consistent - Made blackbox_exporter_config_dir parameter consistent with other collection roles - Added new parameter to meta/argument_specs.yml Signed-off-by: Thomas Venieris --- roles/blackbox_exporter/defaults/main.yml | 2 +- roles/blackbox_exporter/meta/argument_specs.yml | 3 +++ roles/blackbox_exporter/tasks/configure.yml | 2 +- roles/blackbox_exporter/templates/blackbox_exporter.service.j2 | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/blackbox_exporter/defaults/main.yml b/roles/blackbox_exporter/defaults/main.yml index 9899eb478..7a991cb40 100644 --- a/roles/blackbox_exporter/defaults/main.yml +++ b/roles/blackbox_exporter/defaults/main.yml @@ -67,4 +67,4 @@ blackbox_exporter_configuration_modules: # fail_if_matches_regexp: [test] # Where to put the blackbox_exporter.yml main configuration file -blackbox_exporter_conf_dir: /etc +blackbox_exporter_config_dir: /etc diff --git a/roles/blackbox_exporter/meta/argument_specs.yml b/roles/blackbox_exporter/meta/argument_specs.yml index 5848269a2..b5c9b23d2 100644 --- a/roles/blackbox_exporter/meta/argument_specs.yml +++ b/roles/blackbox_exporter/meta/argument_specs.yml @@ -34,3 +34,6 @@ argument_specs: http: method: GET valid_status_codes: [] + blackbox_exporter_config_dir: + description: "Directory where the blackbox exporter configuration file is placed" + default: "/etc" diff --git a/roles/blackbox_exporter/tasks/configure.yml b/roles/blackbox_exporter/tasks/configure.yml index 0e0b88899..72a9fd1a3 100644 --- a/roles/blackbox_exporter/tasks/configure.yml +++ b/roles/blackbox_exporter/tasks/configure.yml @@ -12,7 +12,7 @@ - name: Configure blackbox exporter ansible.builtin.template: src: blackbox_exporter.yml.j2 - dest: "{{ blackbox_exporter_conf_dir }}/blackbox_exporter.yml" + dest: "{{ blackbox_exporter_config_dir }}/blackbox_exporter.yml" owner: blackbox-exp group: blackbox-exp mode: 0644 diff --git a/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 b/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 index b0774ec5e..84490cf99 100644 --- a/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 +++ b/roles/blackbox_exporter/templates/blackbox_exporter.service.j2 @@ -12,7 +12,7 @@ Group=blackbox-exp PermissionsStartOnly=true ExecReload=/bin/kill -HUP $MAINPID ExecStart=/usr/local/bin/blackbox_exporter \ - --config.file={{ blackbox_exporter_conf_dir }}/blackbox_exporter.yml \ + --config.file={{ blackbox_exporter_config_dir }}/blackbox_exporter.yml \ {% for flag, flag_value in blackbox_exporter_cli_flags.items() -%} --{{ flag }}={{ flag_value }} \ {% endfor -%}