modify some detail

linkernetworks · Sep 20, 2018 · 8700786 · 8700786
1 parent 375b6b9
commit 8700786
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 37 deletions.
diff --git a/deploy/helm/apps/charts/prometheus/charts/alertmanager/templates/config.yaml b/deploy/helm/apps/charts/prometheus/charts/alertmanager/templates/config.yaml
@@ -12,7 +12,7 @@ data:
       smtp_auth_password: '{{ .Values.config.smtpPassword }}'
 
     route:
-      group_by: ['admin', 'email_to']
+      group_by: ['admin', 'email_account', 'email_domain']
       receiver: admin
       routes:
       - match:
@@ -26,12 +26,12 @@ data:
     - name: admin
       email_configs:
       - to: "{{ .Values.config.adminEmail }}"
-        headers: { Subject: "[WARN] Alert Email From Vortex" }
+        headers: { Subject: "[WARN] Alert Email From Vortex Alertmanager" }
         html: '{{ "{{" }} template "email.html" . {{ "}}" }}'
     - name: email_router
       email_configs:
-      - to: "{{ "{{" }} .GroupLabels.email_to {{ "}}" }}@gmail.com"
-        headers: { Subject: "[WARN] Alert Email From Vortex" }
+      - to: "{{ "{{" }} .GroupLabels.email_account {{ "}}" }}@{{ "{{" }} .GroupLabels.email_domain {{ "}}" }}"
+        headers: { Subject: "[WARN] Alert Email From Vortex Alertmanager" }
         html: '{{ "{{" }} template "email.html" . {{ "}}" }}'
 
     templates:

diff --git a/deploy/helm/apps/charts/prometheus/charts/alertmanager/templates/email-tempalte.yaml b/deploy/helm/apps/charts/prometheus/charts/alertmanager/templates/email-tempalte.yaml
@@ -309,10 +309,8 @@ data:
                       {{ "{{" }} range .Alerts.Firing {{ "}}" }}
                       <tr>
                         <td class="content-block">
-                          <strong>Labels</strong><br />
-                          {{ "{{" }} range .Labels.SortedPairs {{ "}}" }}{{ "{{" }} .Name {{ "}}" }} = {{ "{{" }} .Value {{ "}}" }}<br />{{ "{{" }} end {{ "}}" }}
-                          {{ "{{" }} if gt (len .Annotations) 0 {{ "}}" }}<strong>Annotations</strong><br />{{ "{{" }} end {{ "}}" }}
-                          {{ "{{" }} range .Annotations.SortedPairs {{ "}}" }}{{ "{{" }} .Name {{ "}}" }} = {{ "{{" }} .Value {{ "}}" }}<br />{{ "{{" }} end {{ "}}" }}
+                          {{ "{{" }} if gt (len .Annotations) 0 {{ "}}" }}<strong>Description</strong><br />{{ "{{" }} end {{ "}}" }}
+                          {{ "{{" }} range .Annotations.SortedPairs {{ "}}" }}{{ "{{" }} .Value {{ "}}" }}<br />{{ "{{" }} end {{ "}}" }}
                         </td>
                       </tr>
                       {{ "{{" }} end {{ "}}" }}
@@ -336,10 +334,8 @@ data:
                       {{ "{{" }} range .Alerts.Resolved {{ "}}" }}
                       <tr>
                         <td class="content-block">
-                          <strong>Labels</strong><br />
-                          {{ "{{" }} range .Labels.SortedPairs {{ "}}" }}{{ "{{" }} .Name {{ "}}" }} = {{ "{{" }} .Value {{ "}}" }}<br />{{ "{{" }} end {{ "}}" }}
-                          {{ "{{" }} if gt (len .Annotations) 0 {{ "}}" }}<strong>Annotations</strong><br />{{ "{{" }} end {{ "}}" }}
-                          {{ "{{" }} range .Annotations.SortedPairs {{ "}}" }}{{ "{{" }} .Name {{ "}}" }} = {{ "{{" }} .Value {{ "}}" }}<br />{{ "{{" }} end {{ "}}" }}
+                          {{ "{{" }} if gt (len .Annotations) 0 {{ "}}" }}<strong>Description</strong><br />{{ "{{" }} end {{ "}}" }}
+                          {{ "{{" }} range .Annotations.SortedPairs {{ "}}" }}{{ "{{" }} .Value {{ "}}" }}<br />{{ "{{" }} end {{ "}}" }}
                         </td>
                       </tr>
                       {{ "{{" }} end {{ "}}" }}
@@ -351,7 +347,7 @@ data:
               <div class="footer">
                 <table width="100%">
                   <tr>
-                    <td class="aligncenter content-block">Sent by {{ "{{" }} template "__alertmanager" . {{ "}}" }}</td>
+                    <td class="aligncenter content-block">Sent by Vortex{{ "{{" }} template "__alertmanager" . {{ "}}" }}</td>
                   </tr>
                 </table>
               </div></div>

diff --git a/deploy/helm/apps/charts/prometheus/templates/alert-rules.yaml b/deploy/helm/apps/charts/prometheus/templates/alert-rules.yaml
@@ -5,22 +5,21 @@ data:
     - name: pod-alert-rule
       rules:
       - alert: Deployment_Not_Running
-        expr: (max(kube_deployment_status_replicas_available{namespace!~"vortex|kube-system" }) by (deployment,namespace) == 0) * on(deployment,namespace) group_left(label_email_to)(kube_deployment_labels)
+        expr: (max(kube_deployment_status_replicas_available{namespace!~"vortex|kube-system" }) by (deployment,namespace) == 0) * on(deployment,namespace) group_left(label_email_account,label_email_domain)(kube_deployment_labels)
         for: 2m
         labels:
           admin: false
-          email_to: "{{ "{{" }}$labels.label_email_to{{ "}}" }}"
+          email_account: "{{ "{{" }}$labels.label_email_account{{ "}}" }}"
+          email_domain: "{{ "{{" }}$labels.label_email_domain{{ "}}" }}"
         annotations:
-          summary: "Deployment \"{{ "{{" }}$labels.deployment{{ "}}" }}\" in namespace \"{{ "{{" }}$labels.namespace{{ "}}" }}\" is not running."
           description: "There is no avaiable pod for the deployment \"{{ "{{" }}$labels.deployment{{ "}}" }}\" in namespace \"{{ "{{" }}$labels.namespace{{ "}}" }}\"."
       - alert: Vortex_Not_Running
         expr: (max(kube_deployment_status_replicas_available{namespace=~"vortex|kube-system" }) by (deployment,namespace) == 0)
         for: 2m
         labels:
           admin: true
-          email_to: admin
+          email_account: admin
         annotations:
-          summary: "Deployment \"{{ "{{" }}$labels.deployment{{ "}}" }}\" in namespace \"{{ "{{" }}$labels.namespace{{ "}}" }}\" is not running."
           description: "There is no avaiable pod for the deployment \"{{ "{{" }}$labels.deployment{{ "}}" }}\" in namespace \"{{ "{{" }}$labels.namespace{{ "}}" }}\"."
 kind: ConfigMap
 metadata:

diff --git a/deploy/kubernetes/apps/monitoring/alertmanager/config.yaml b/deploy/kubernetes/apps/monitoring/alertmanager/config.yaml
@@ -7,12 +7,12 @@ data:
   alertmanager.yml: |-
     global:
       smtp_smarthost: 'smtp.sendgrid.net:587'
-      smtp_from: 'develop@linkernetworks.com'
+      smtp_from: 'vortex@linkernetworks.com'
       smtp_auth_username: 'apikey'
       smtp_auth_password: 'key'
 
     route:
-      group_by: ['admin', 'email_to']
+      group_by: ['admin', 'email_account', 'email_domain']
       receiver: admin
       routes:
       - match:
@@ -26,12 +26,12 @@ data:
     - name: admin
       email_configs:
       - to: "[email protected]"
-        headers: { Subject: "[WARN] Alert Email From Vortex" }
+        headers: { Subject: "[WARN] Alert Email From Vortex Alertmanager" }
         html: '{{ template "email.html" . }}'
     - name: email_router
       email_configs:
-      - to: "{{ .GroupLabels.email_to }}@gmail.com"
-        headers: { Subject: "[WARN] Alert Email From Vortex" }
+      - to: "{{ .GroupLabels.email_account }}@{{ .GroupLabels.email_domain }}"
+        headers: { Subject: "[WARN] Alert Email From Vortex Alertmanager" }
         html: '{{ template "email.html" . }}'
 
     templates:

diff --git a/deploy/kubernetes/apps/monitoring/alertmanager/email-tempalte.yaml b/deploy/kubernetes/apps/monitoring/alertmanager/email-tempalte.yaml
@@ -309,11 +309,10 @@ data:
                       {{ range .Alerts.Firing }}
                       <tr>
                         <td class="content-block">
-                          <strong>Labels</strong><br />
-                          {{ range .Labels.SortedPairs }}{{ .Name }} = {{ .Value }}<br />{{ end }}
-                          {{ if gt (len .Annotations) 0 }}<strong>Annotations</strong><br />{{ end }}
-                          {{ range .Annotations.SortedPairs }}{{ .Name }} = {{ .Value }}<br />{{ end }}
+                          {{ if gt (len .Annotations) 0 }}<strong>Description</strong><br />{{ end }}
+                          {{ range .Annotations.SortedPairs }}{{ .Value }}<br />{{ end }}
                         </td>
+
                       </tr>
                       {{ end }}
 
@@ -336,10 +335,8 @@ data:
                       {{ range .Alerts.Resolved }}
                       <tr>
                         <td class="content-block">
-                          <strong>Labels</strong><br />
-                          {{ range .Labels.SortedPairs }}{{ .Name }} = {{ .Value }}<br />{{ end }}
-                          {{ if gt (len .Annotations) 0 }}<strong>Annotations</strong><br />{{ end }}
-                          {{ range .Annotations.SortedPairs }}{{ .Name }} = {{ .Value }}<br />{{ end }}
+                          {{ if gt (len .Annotations) 0 }}<strong>Description</strong><br />{{ end }}
+                          {{ range .Annotations.SortedPairs }}{{ .Value }}<br />{{ end }}
                         </td>
                       </tr>
                       {{ end }}
@@ -351,7 +348,7 @@ data:
               <div class="footer">
                 <table width="100%">
                   <tr>
-                    <td class="aligncenter content-block">Sent by {{ template "__alertmanager" . }}</td>
+                    <td class="aligncenter content-block">Sent by Vortex{{ template "__alertmanager" . }}</td>
                   </tr>
                 </table>
               </div></div>

diff --git a/deploy/kubernetes/apps/monitoring/prometheus/alert-rules.yaml b/deploy/kubernetes/apps/monitoring/prometheus/alert-rules.yaml
@@ -5,22 +5,21 @@ data:
     - name: pod-alert-rule
       rules:
       - alert: Deployment_Not_Running
-        expr: (max(kube_deployment_status_replicas_available{namespace!~"vortex|kube-system" }) by (deployment,namespace) == 0) * on(deployment,namespace) group_left(label_email_to)(kube_deployment_labels)
+        expr: (max(kube_deployment_status_replicas_available{namespace!~"vortex|kube-system" }) by (deployment,namespace) == 0) * on(deployment,namespace) group_left(label_email_account,label_email_domain)(kube_deployment_labels)
         for: 2m
         labels:
           admin: false
-          email_to: "{{$labels.label_email_to}}"
+          email_account: "{{$labels.label_email_account}}"
+          email_domain: "{{$labels.label_email_domain}}"
         annotations:
-          summary: "Deployment \"{{$labels.deployment}}\" in namespace \"{{$labels.namespace}}\" is not running."
           description: "There is no avaiable pod for the deployment \"{{$labels.deployment}}\" in namespace \"{{$labels.namespace}}\"."
       - alert: Vortex_Not_Running
         expr: (max(kube_deployment_status_replicas_available{namespace=~"vortex|kube-system" }) by (deployment,namespace) == 0)
         for: 2m
         labels:
           admin: true
-          email_to: admin
+          email_account: admin
         annotations:
-          summary: "Deployment \"{{$labels.deployment}}\" in namespace \"{{$labels.namespace}}\" is not running."
           description: "There is no avaiable pod for the deployment \"{{$labels.deployment}}\" in namespace \"{{$labels.namespace}}\"."
 kind: ConfigMap
 metadata: