Merge "Alerta update to slience alert in Alertmanager"

alerta/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.0.2
 description: OpenStack-Helm Alerta for Alertmanager.
 name: alerta
-version: 0.1.2
+version: 0.1.3
 home: https://github.com/alerta/alerta
 sources:
   - https://github.com/alerta/alerta

alerta/templates/configmap-etc.yaml

@@ -20,7 +20,6 @@ kind: ConfigMap
 metadata:
   name: alerta-etc
 data:
-  alertad.conf: |
+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.alerta.alertad_conf "key" "alertad.conf") | indent 2 }}
-    DATABASE_URL = {{ tuple "postgresql" "internal" "admin" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" |quote}}
 {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.alerta.alerta_webui_config "key" "config.js") | indent 2 }}
 {{- end }}

alerta/values.yaml

@@ -20,7 +20,7 @@
 
 images:
   tags:
-    alerta: docker.io/alerta/alerta-web:8.0.2
+    alerta: docker.io/openstackhelm/alerta:8.0.2
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
     ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
@@ -119,6 +119,19 @@ endpoints:
     port:
       registry:
         node: 5000
+  alertmanager:
+    name: prometheus-alertmanager
+    namespace: null
+    hosts:
+      default: alerts-engine
+    host_fqdn_override:
+      default: null
+    path:
+      default: null
+    scheme: http
+    port:
+      api:
+        default: 9093
   alerta:
     name: alerta
     namespace: null
@@ -202,10 +215,12 @@ conf:
     alertaAdminKey: changeme
     alertaAPIKey: changeme
     alertadb: alerta_db
-    alerta_configs: |
+    alertad_conf: |
-      # ref: http://docs.alerta.io/en/latest/configuration.html
+      DEBUG = True
-        DEBUG: false
+      PLUGINS = ['enhance', 'forward', 'normalise', 'prometheus']
-        AUTH_REQUIRED: true
+      ALERTMANAGER_SILENCE_FROM_ACK = True
+      ALERTMANAGER_API_URL = '{{ tuple "alertmanager" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" }}://{{ tuple "alertmanager" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }}'
+      DATABASE_URL = {{ tuple "postgresql" "internal" "admin" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" |quote}}
     alerta_webui_config: |
       # ref: http://docs.alerta.io/en/latest/webui.html
       'use strict';