From 6ea5710fac86be2e382389642d0620001c6d8a62 Mon Sep 17 00:00:00 2001 From: modship Date: Tue, 19 Dec 2023 11:50:26 +0100 Subject: [PATCH 1/2] allow using web config file Signed-off-by: modship --- roles/alertmanager/tasks/configure.yml | 9 +++++++++ roles/alertmanager/templates/alertmanager.service.j2 | 3 +++ 2 files changed, 12 insertions(+) diff --git a/roles/alertmanager/tasks/configure.yml b/roles/alertmanager/tasks/configure.yml index 806c14b8..aa57930d 100644 --- a/roles/alertmanager/tasks/configure.yml +++ b/roles/alertmanager/tasks/configure.yml @@ -21,6 +21,15 @@ notify: - restart alertmanager +- name: Configure alertmanager web + ansible.builtin.copy: + content: "{{ alertmanager_web_config | to_nice_yaml(indent=2, sort_keys=False) }}" + dest: "{{ alertmanager_config_dir }}/web.yml" + force: true + owner: alertmanager + group: alertmanager + mode: 0644 + - name: Create systemd service unit ansible.builtin.template: src: alertmanager.service.j2 diff --git a/roles/alertmanager/templates/alertmanager.service.j2 b/roles/alertmanager/templates/alertmanager.service.j2 index 34ffdba7..45e01512 100644 --- a/roles/alertmanager/templates/alertmanager.service.j2 +++ b/roles/alertmanager/templates/alertmanager.service.j2 @@ -42,6 +42,9 @@ ExecStart={{ _alertmanager_binary_install_dir }}/alertmanager \ {% endfor %} {% else %} {{ pre }}-web.listen-address={{ alertmanager_web_listen_address }} \ +{% endif %} +{% if alertmanager_web_config is defined %} + {{ pre }}-web.config.file={{ alertmanager_config_dir }}/web.yml {% endif %} {{ pre }}-web.external-url={{ alertmanager_web_external_url }}{% for flag, flag_value in alertmanager_config_flags_extra.items() %} \ {{ pre }}-{{ flag }}={{ flag_value }}{% endfor %} From e6b7d9d92161a5fe12d957526a7ea906cf535ddb Mon Sep 17 00:00:00 2001 From: modship Date: Mon, 3 Jun 2024 16:31:00 +0200 Subject: [PATCH 2/2] use ansible.builtin.template Signed-off-by: modship --- roles/alertmanager/tasks/configure.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/alertmanager/tasks/configure.yml b/roles/alertmanager/tasks/configure.yml index aa57930d..7e7bc53f 100644 --- a/roles/alertmanager/tasks/configure.yml +++ b/roles/alertmanager/tasks/configure.yml @@ -22,8 +22,8 @@ - restart alertmanager - name: Configure alertmanager web - ansible.builtin.copy: - content: "{{ alertmanager_web_config | to_nice_yaml(indent=2, sort_keys=False) }}" + ansible.builtin.template: + src: "{{ alertmanager_web_config }}" dest: "{{ alertmanager_config_dir }}/web.yml" force: true owner: alertmanager