merge main

Co-authored-by: Yening Qin <710leo@gmail.com>

alert/dispatch/dispatch.go

@@ -291,6 +291,7 @@ func GetNotifyConfigParams(notifyConfig *models.NotifyConfig, userCache *memsto.
 		visited[user.Id] = true
 		userInfos = append(userInfos, user)
 	}
+
 	userGroups := userGroupCache.GetByUserGroupIds(userInfoParams.UserGroupIDs)
 	for _, userGroup := range userGroups {
 		for _, user := range userGroup.Users {
@@ -311,7 +312,10 @@ func (e *Dispatch) sendV2(events []*models.AlertCurEvent, notifyRuleId int64, no
 		return
 	}
 
-	tplContent := messageTemplate.RenderEvent(events)
+	tplContent := make(map[string]string)
+	if notifyChannel.RequestType != "flashduty" {
+		tplContent = messageTemplate.RenderEvent(events)
+	}
 
 	userInfos, flashDutyChannelIDs, customParams := GetNotifyConfigParams(notifyConfig, e.userCache, e.userGroupCache)
 
@@ -343,7 +347,7 @@ func (e *Dispatch) sendV2(events []*models.AlertCurEvent, notifyRuleId int64, no
 			sender.NotifyRecord(e.ctx, events, notifyRuleId, notifyChannel.Name, notifyChannel.RequestConfig.HTTPRequestConfig.URL, respBody, err)
 		}
 
-	case "email":
+	case "smtp":
 		err := notifyChannel.SendEmail(events, tplContent, userInfos, e.notifyChannelCache.GetSmtpClient(notifyChannel.ID))
 		if err != nil {
 			logger.Errorf("send email error: %v", err)

memsto/notify_channel_cache.go

@@ -172,7 +172,7 @@ func (ncc *NotifyChannelCacheType) syncNotifyChannels() error {
 		// todo 优化变更粒度
 
 		switch lst[i].RequestType {
-		case "http":
+		case "http", "flashduty":
 			if lst[i].RequestConfig == nil || lst[i].RequestConfig.HTTPRequestConfig == nil {
 				logger.Warningf("notify channel %+v http request config not found", lst[i])
 				continue

models/message_tpl.go

@@ -597,6 +597,9 @@ func (t *MessageTemplate) Upsert(ctx *ctx.Context, ident string) error {
 }
 
 func (t *MessageTemplate) RenderEvent(events []*AlertCurEvent) map[string]string {
+	if t == nil {
+		return nil
+	}
 	// event 内容渲染到 messageTemplate
 	tplContent := make(map[string]string)
 	for key, msgTpl := range t.Content {

models/notify_channel.go

@@ -409,6 +409,7 @@ func (ncc *NotifyChannelConfig) SendFlashDuty(events []*AlertCurEvent, flashDuty
 	query := req.URL.Query()
 	query.Add("channel_id", strconv.FormatInt(flashDutyChannelID, 10))
 	req.URL.RawQuery = query.Encode()
+	req.Header.Add("Content-Type", "application/json")
 
 	// 重试机制
 	for i := 0; i <= 3; i++ {
@@ -1146,6 +1147,9 @@ var NotiChMap = map[string]*NotifyChannelConfig{
 		RequestConfig: &RequestConfig{
 			HTTPRequestConfig: &HTTPRequestConfig{
 				Timeout: 10000, Concurrency: 5, RetryTimes: 3, RetryInterval: 100,
+				Headers: map[string]string{
+					"Content-Type": "application/json",
+				},
 			},
 			FlashDutyRequestConfig: &FlashDutyRequestConfig{
 				IntegrationUrl: "flashduty integration url",