Merge pull request #229 from wanjunlei/master

change the format of notification history
kubesphere · Nov 29, 2023 · f25bf86 · f25bf86
2 parents 4ce1c9e + 25c1070
commit f25bf86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/pkg/internal/webhook/types.go b/pkg/internal/webhook/types.go
@@ -3,6 +3,7 @@ package webhook
 import (
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/kubesphere/notification-manager/pkg/apis/v2beta2"
 	"github.com/kubesphere/notification-manager/pkg/constants"
@@ -58,7 +59,7 @@ func NewReceiver(tenantID string, obj *v2beta2.Receiver) internal.Receiver {
 		}
 
 		if service.Path != nil {
-			r.URL = fmt.Sprintf("%s%s", r.URL, *service.Path)
+			r.URL = fmt.Sprintf("%s%s", r.URL, strings.TrimPrefix(*service.Path, "/"))
 		}
 	}
 

diff --git a/pkg/notify/notifier/webhook/webhook.go b/pkg/notify/notifier/webhook/webhook.go
@@ -174,7 +174,6 @@ func (n *Notifier) Notify(ctx context.Context, data *template.Data) error {
 }
 
 func generateNotificationHistory(buf *bytes.Buffer, data *template.Data) error {
-	var res []interface{}
 	for _, alert := range data.Alerts {
 		m := make(map[string]interface{})
 		m[Status] = alert.Status
@@ -201,10 +200,12 @@ func generateNotificationHistory(buf *bytes.Buffer, data *template.Data) error {
 		}
 		m[Message] = message
 
-		res = append(res, m)
+		if err := utils.JsonEncode(buf, m); err != nil {
+			return err
+		}
 	}
 
-	return utils.JsonEncode(buf, res)
+	return nil
 }
 
 func (n *Notifier) getTransport(r *webhook.Receiver) (http.RoundTripper, error) {