alerta: improve support for mailer

3 files changed, 56 insertions, 20 deletions

diff --git a/roles/monitoring/alerta/templates/alerta.conf.j2.j2 b/roles/monitoring/alerta/templates/alerta.conf.j2.j2
new file mode 100644
index 00000000..66f5f14c
--- /dev/null
+++ b/roles/monitoring/alerta/templates/alerta.conf.j2.j2
@@ -0,0 +1,24 @@
+[DEFAULT]
+sslverify = no
+output = presto
+endpoint = http://localhost:8080/api
+timezone = Europe/London
+{{ '{%-' }} if env.API_KEY {{ '%}' }}
+key = {{ '{{' }} env.API_KEY {{ '}}' }}
+{{ '{%-' }} endif {{ '%}' }}
+debug = {{ '{{' }} 'yes' if env.DEBUG else 'no' {{ '}}' }}
+{% if alerta_mailer is defined %}
+
+[alerta-mailer]
+debug = {{ '{{' }} 'yes' if env.DEBUG else 'no' {{ '}}' }}
+{{ '{%-' }} if env.API_KEY {{ '%}' }}
+key = {{ '{{' }} env.API_KEY {{ '}}' }}
+{{ '{%-' }} endif {{ '%}' }}
+endpoint = http://localhost:8080/api
+amqp_url = redis://localhost:6379
+email_type: text
+mail_template: /app/email.tmpl
+{%   for option, value in alerta_mailer.items() %}
+{{ option }} = {{ value }}
+{%   endfor %}
+{% endif %}
diff --git a/roles/monitoring/alerta/templates/alertad.conf.j2.j2 b/roles/monitoring/alerta/templates/alertad.conf.j2.j2
new file mode 100644
index 00000000..54089a76
--- /dev/null
+++ b/roles/monitoring/alerta/templates/alertad.conf.j2.j2
@@ -0,0 +1,19 @@
+DEBUG = {{ '{{' }} 'True' if env.DEBUG else 'False' {{ '}}' }}
+SECRET = "{{ '{{' }} env.SECRET_KEY {{ '}}' }}"
+ALERT_TIMEOUT = 86400
+HEARTBEAT_TIMEOUT = 7200
+PLUGINS = ['{{ alerta_plugins | join("', '") }}']
+DEFAULT_ENVIRONMENT = 'unknown'
+ALLOWED_ENVIRONMENTS = ['unknown', 'chaos-at-.*']
+{% if 'heartbeat' in alerta_plugins %}
+HEARTBEAT_EVENTS = ['PrometheusAlertmanagerE2eDeadManSwitch']
+{% endif %}
+{% if 'prometheus' in alerta_plugins %}
+ALERTMANAGER_USERNAME = 'alerta'
+ALERTMANAGER_PASSWORD = 'alerta'
+ALERTMANAGER_SILENCE_FROM_ACK = True
+ALERTMANAGER_USE_EXTERNALURL_FOR_SILENCES = True
+{% endif %}
+{% if 'amqp' in alerta_plugins %}
+AMQP_URL = 'redis://localhost:6379/'
+{% endif %}
diff --git a/roles/monitoring/alerta/templates/pod-spec.yml.j2 b/roles/monitoring/alerta/templates/pod-spec.yml.j2
index c39ec080..9ce20988 100644
--- a/roles/monitoring/alerta/templates/pod-spec.yml.j2
+++ b/roles/monitoring/alerta/templates/pod-spec.yml.j2
@@ -1,6 +1,6 @@
 containers:
 - name: alerta
-  image: "alerta-web-with-mailer:{{ alerta_web_version }}"
+  image: "alerta/alerta-web:{{ alerta_web_version }}-custom"
   env:
   - name: "DATABASE_URL"
     value: "postgres://alerta:{{ alerta_postgres_password }}@127.0.0.1:5432/alerta"
@@ -10,8 +10,6 @@ containers:
     value: "admin"
   - name: "SECRET_KEY"
     value: "{{ alerta_web_secret_key }}"
-  - name: "DEBUG"
-    value: "1"
   - name: "SUPERVISORD_LOG_LEVEL"
     value: "warn"
   volumeMounts:
@@ -19,6 +17,16 @@ containers:
     mountPath: /app/alertad.conf.j2
     subPath: alertad.conf.j2
     readOnly: true
+  - name: config
+    mountPath: /app/alerta.conf.j2
+    subPath: alerta.conf.j2
+    readOnly: true
+{% if alerta_mailer is defined %}
+  - name: config
+    mountPath: /app/email.tmpl
+    subPath: email.tmpl
+    readOnly: true
+{% endif %}
   ports:
   - containerPort: 8080
     hostPort: {{ alerta_web_port }}
@@ -39,6 +47,7 @@ containers:
   volumeMounts:
   - name: postgres
     mountPath: /var/lib/postgresql/data
+{% if 'amqp' in alerta_plugins %}
 
 - name: redis
   image: "redis:{{ alerta_redis_version }}"
@@ -46,23 +55,7 @@ containers:
   - redis-server
   - --bind
   - 127.0.0.1
-
-- name: mailer
-  image: "alerta-web-with-mailer:{{ alerta_web_version }}"
-  command:
-  - alerta-mailer
-  env:
-  - name: "ALERTA_CONF_FILE"
-    value: "/app/alerta-mailer.conf"
-  volumeMounts:
-  - name: config
-    mountPath: /app/alerta-mailer.conf
-    subPath: alerta-mailer.conf
-    readOnly: true
-  - name: config
-    mountPath: /app/email.tmpl
-    subPath: email.tmpl
-    readOnly: true
+{% endif %}
 
 volumes:
 - name: config