From 7ef80e39b906007ec9a319eabda4e0e4275f4bfe Mon Sep 17 00:00:00 2001
From: S M Y <smy.altamash@gmail.com>
Date: Mon, 8 Jul 2019 18:32:18 +0530
Subject: [PATCH] Give custom Alertrules Subject and meaningful message

---
 .../stack-monitor-stateful/templates/alertmanagerconfig.yml | 6 +++---
 .../roles/stack-monitor/templates/alertmanagerconfig.yml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml b/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml
index 545f3237c..9bc70dde9 100644
--- a/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml
+++ b/ansible/roles/stack-monitor-stateful/templates/alertmanagerconfig.yml
@@ -35,15 +35,15 @@ receivers:
         api_url: "{{ monitor_alerts_slack_url }}"
         username: 'Monitor - Alerter'
         channel: "{{ monitor_alerts_slack_channel }}"
-        text: "Instances: {% raw %}{{range .Alerts}}\n{{.Labels.nodename}} : {{.Annotations.description}}{{end}}{% endraw %}"
+        text: "[{{ env }}-{{cluster_name}}]: {% raw %}{{range .Alerts}} {{.Annotations.description}}{{end}}{% endraw %}"
         icon_emoji: ':dart:'
   {% for item in service_teams %}
-  # Dummy comment line to ensure yaml generated from ansible template has proper indentation
+  # comment line to ensure yaml generated from ansible template has proper indentation
   - name: "{{ item.team }}"
     email_configs:
       - send_resolved: true
         to: '{{ item.alerts_mailing_list }}'
         html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
         headers:
-          subject: '[{{ env }}] {% raw %}{{ template "email.default.subject" . }}{% endraw %}'
+          subject: '[{{ env }}-{{cluster_name}}] {{ .GroupLabels.alertname }}'
   {% endfor %}
diff --git a/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml b/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml
index cb3e625c8..db826b463 100644
--- a/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml
+++ b/ansible/roles/stack-monitor/templates/alertmanagerconfig.yml
@@ -36,7 +36,7 @@ receivers:
         api_url: "{{ monitor_alerts_slack_url }}"
         username: 'Monitor - Alerter'
         channel: "{{ monitor_alerts_slack_channel }}"
-        text: "[{{ env }}-{{cluster_name}}]: {% raw %}{{range .Alerts}} : {{.Annotations.description}}{{end}}{% endraw %}"
+        text: "[{{ env }}-{{cluster_name}}]: {% raw %}{{range .Alerts}} {{.Annotations.description}}{{end}}{% endraw %}"
         icon_emoji: ':dart:'
   {% for item in service_teams %}
   # comment line to ensure yaml generated from ansible template has proper indentation
@@ -46,5 +46,5 @@ receivers:
         to: '{{ item.alerts_mailing_list }}'
         html: '{% raw %}{{ template "email.default.html" . }}{% endraw %}'
         headers:
-          subject: '[{{ env }}-{{cluster_name}}] {{range .Alerts}} : {{.Annotations.summary}}{{end}}'
+          subject: '[{{ env }}-{{cluster_name}}] {{ .GroupLabels.alertname }}'
   {% endfor %}
-- 
GitLab