commit 51921586f6361cd73d71b8b58c0816ca1997a6ac
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Apr 07 16:48:25 2020 +0000
committer Gerrit Code Review <mail@domain.com> Tue Apr 07 16:48:25 2020 +0000
tree b2421711fc139abbe2d565af41f8104b319b5ef0
parent 22ebb3e1071eca6a3a9dc4916eca7ecead4dc009
parent 28a14c4d6a82280f4f4cc871cbcf226aa8c23824

Merge "Added config file for alertad." into release/proposed/2019.2.0

docker/swarm/stack/monitoring/alerta.yml

diff --git a/docker/swarm/stack/monitoring/alerta.yml b/docker/swarm/stack/monitoring/alerta.yml
index 6112b60..acd4d70 100644
--- a/docker/swarm/stack/monitoring/alerta.yml
+++ b/docker/swarm/stack/monitoring/alerta.yml
@@ -24,6 +24,7 @@
                 - 15017:8080
               volumes:
                 - ${prometheus:alerta:config_dir}/alerta.conf:/web/config.js
+                - ${prometheus:alerta:config_dir}/alertad.conf:/app/alertad.conf
               environment:
                 ADMIN_USERS: ${_param:alerta_admin_username}
                 ADMIN_PASSWORD: ${_param:alerta_admin_password}

prometheus/alerta/init.yml

diff --git a/prometheus/alerta/init.yml b/prometheus/alerta/init.yml
index a82e8d4..6e16b63 100644
--- a/prometheus/alerta/init.yml
+++ b/prometheus/alerta/init.yml
@@ -1,2 +1,7 @@
 classes:
   - service.prometheus.alerta
+parameters:
+  prometheus:
+    alerta:
+      timeouts:
+        alert: 28800