From ffa67c888bf15de2f96d3bb1209073334cb5907f Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Wed, 12 Oct 2022 05:02:57 -0400
Subject: [PATCH] Fixes 48972 - Exposes channels.WebhookMessage (#56140)
 (#56778)

(cherry picked from commit 26bb1394709d8c26b21b33aeb080f83132e37e7f)

Co-authored-by: Matt <cadnce@users.noreply.github.com>
---
 pkg/services/ngalert/notifier/channels/webhook.go      | 6 +++---
 pkg/services/ngalert/notifier/channels/webhook_test.go | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/services/ngalert/notifier/channels/webhook.go b/pkg/services/ngalert/notifier/channels/webhook.go
index 21917df1a02..bef644de432 100644
--- a/pkg/services/ngalert/notifier/channels/webhook.go
+++ b/pkg/services/ngalert/notifier/channels/webhook.go
@@ -115,8 +115,8 @@ func NewWebHookNotifier(config *WebhookConfig, ns notifications.WebhookSender, i
 	}
 }
 
-// webhookMessage defines the JSON object send to webhook endpoints.
-type webhookMessage struct {
+// WebhookMessage defines the JSON object send to webhook endpoints.
+type WebhookMessage struct {
 	*ExtendedData
 
 	// The protocol version.
@@ -153,7 +153,7 @@ func (wn *WebhookNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 		},
 		as...)
 
-	msg := &webhookMessage{
+	msg := &WebhookMessage{
 		Version:         "1",
 		ExtendedData:    data,
 		GroupKey:        groupKey.String(),
diff --git a/pkg/services/ngalert/notifier/channels/webhook_test.go b/pkg/services/ngalert/notifier/channels/webhook_test.go
index 5dd1798e8ed..58aa731a80b 100644
--- a/pkg/services/ngalert/notifier/channels/webhook_test.go
+++ b/pkg/services/ngalert/notifier/channels/webhook_test.go
@@ -31,7 +31,7 @@ func TestWebhookNotifier(t *testing.T) {
 		settings string
 		alerts   []*types.Alert
 
-		expMsg        *webhookMessage
+		expMsg        *WebhookMessage
 		expUrl        string
 		expUsername   string
 		expPassword   string
@@ -53,7 +53,7 @@ func TestWebhookNotifier(t *testing.T) {
 			},
 			expUrl:        "http://localhost/test",
 			expHttpMethod: "POST",
-			expMsg: &webhookMessage{
+			expMsg: &WebhookMessage{
 				ExtendedData: &ExtendedData{
 					Receiver: "my_receiver",
 					Status:   "firing",
@@ -126,7 +126,7 @@ func TestWebhookNotifier(t *testing.T) {
 			expHttpMethod: "PUT",
 			expUsername:   "user1",
 			expPassword:   "mysecret",
-			expMsg: &webhookMessage{
+			expMsg: &WebhookMessage{
 				ExtendedData: &ExtendedData{
 					Receiver: "my_receiver",
 					Status:   "firing",
@@ -191,7 +191,7 @@ func TestWebhookNotifier(t *testing.T) {
 					},
 				},
 			},
-			expMsg: &webhookMessage{
+			expMsg: &WebhookMessage{
 				ExtendedData: &ExtendedData{
 					Receiver: "my_receiver",
 					Status:   "firing",