Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Make config installation dir configurable #173

Merged
merged 3 commits into from
Jul 29, 2023
Merged

feature: Make config installation dir configurable #173

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b04207
feature: Make config installation dir configurable
tvenieris Jul 28, 2023
d446cdd
fix: blackbox_exporter_config_dir consistent
tvenieris Jul 29, 2023
5aa1e92
Merge branch 'main' into blackbox_exporter_config_dir_configurable
tvenieris Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions roles/blackbox_exporter/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
tvenieris marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion roles/blackbox_exporter/tasks/configure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/blackbox_exporter/templates/blackbox_exporter.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%}
Expand Down