Browse Source

Merge pull request #16116 from SGI495/master

Don't include non-existing image in MS Teams alert
Torkel Ödegaard 6 years ago
parent
commit
46a75099d8
1 changed files with 11 additions and 8 deletions
  1. 11 8
      pkg/services/alerting/notifiers/teams.go

+ 11 - 8
pkg/services/alerting/notifiers/teams.go

@@ -78,6 +78,13 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 		message = evalContext.Rule.Message
 	}
 
+	images := make([]map[string]interface{}, 0)
+	if evalContext.ImagePublicUrl != "" {
+		images = append(images, map[string]interface{}{
+			"image": evalContext.ImagePublicUrl,
+		})
+	}
+
 	body := map[string]interface{}{
 		"@type":    "MessageCard",
 		"@context": "http://schema.org/extensions",
@@ -88,14 +95,10 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 		"themeColor": evalContext.GetStateModel().Color,
 		"sections": []map[string]interface{}{
 			{
-				"title": "Details",
-				"facts": fields,
-				"images": []map[string]interface{}{
-					{
-						"image": evalContext.ImagePublicUrl,
-					},
-				},
-				"text": message,
+				"title":  "Details",
+				"facts":  fields,
+				"images": images,
+				"text":   message,
 			},
 		},
 		"potentialAction": []map[string]interface{}{