From 0de77598d77996994dfcc46e5c18c01cb92be938 Mon Sep 17 00:00:00 2001
From: Magnus Berglund <magnus.berglund@tieto.com>
Date: Wed, 20 Mar 2019 18:23:36 +0100
Subject: [PATCH] Don't include non-existing image in MS Teams alert

If an image section is included in the JSON payload for MS Teams alerts
when no image URL exists, rendering of the alert in the client fails.
This change makes sure that an image section is only included in the
JSON payload if an image URL exists.

Closes #16082
---
 pkg/services/alerting/notifiers/teams.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/services/alerting/notifiers/teams.go b/pkg/services/alerting/notifiers/teams.go
index 2dad11285b4..2660cacb7a4 100644
--- a/pkg/services/alerting/notifiers/teams.go
+++ b/pkg/services/alerting/notifiers/teams.go
@@ -78,6 +78,15 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 		message = evalContext.Rule.Message
 	}
 
+	images := ""
+	if evalContext.ImagePublicUrl != "" {
+		images = []map[string]interface{}{
+			{
+				"image": evalContext.ImagePublicUrl
+			}
+		}
+	}
+
 	body := map[string]interface{}{
 		"@type":    "MessageCard",
 		"@context": "http://schema.org/extensions",
@@ -90,11 +99,7 @@ func (this *TeamsNotifier) Notify(evalContext *alerting.EvalContext) error {
 			{
 				"title": "Details",
 				"facts": fields,
-				"images": []map[string]interface{}{
-					{
-						"image": evalContext.ImagePublicUrl,
-					},
-				},
+				"images": images,
 				"text": message,
 			},
 		},