From f6c1f6538cbf1b795cb8eab451db35391dfa9296 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Fri, 26 Jan 2018 21:52:02 +0100 Subject: [PATCH] bump version to 0.13.0; support newer version in systemd --- defaults/main.yml | 3 +-- templates/alertmanager.service.j2 | 16 +++++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 1c43134..0577414 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,6 +1,5 @@ --- - -alertmanager_version: 0.12.0 +alertmanager_version: 0.13.0 alertmanager_root_dir: /opt/alertmanager alertmanager_config_dir: /etc/alertmanager diff --git a/templates/alertmanager.service.j2 b/templates/alertmanager.service.j2 index 1abf689..0f8c572 100644 --- a/templates/alertmanager.service.j2 +++ b/templates/alertmanager.service.j2 @@ -1,3 +1,9 @@ +{%- if alertmanager_version | version_compare('0.13.0', '>=') %} +{%- set pre = '-' %} +{%- else %} +{%- set pre = '' %} +{%- endif %} +# {{ ansible_managed }} [Unit] Description=Prometheus Alertmanager After=network.target @@ -9,11 +15,11 @@ User=alertmanager Group=alertmanager ExecReload=/bin/kill -HUP $MAINPID ExecStart={{ alertmanager_root_dir }}/alertmanager \ - -config.file={{ alertmanager_config_dir }}/alertmanager.yml \ - -storage.path={{ alertmanager_db_dir }} \ - -web.listen-address={{ alertmanager_listen_address }} \ - -web.external-url={{ alertmanager_external_url }}{% for flag, flag_value in alertmanager_cli_flags.iteritems() %} \ - -{{ flag }}={{ flag_value }}{% endfor %} + {{ pre }}-config.file={{ alertmanager_config_dir }}/alertmanager.yml \ + {{ pre }}-storage.path={{ alertmanager_db_dir }} \ + {{ pre }}-web.listen-address={{ alertmanager_listen_address }} \ + {{ pre }}-web.external-url={{ alertmanager_external_url }}{% for flag, flag_value in alertmanager_cli_flags.iteritems() %} \ + {{ pre }}-{{ flag }}={{ flag_value }}{% endfor %} SyslogIdentifier=alertmanager Restart=always