🚀 Refactor notice object route logic

Cairry · Cairry · commit 8b1b5f0583ce · 2025-12-18T19:21:57.000+08:00
diff --git a/alert/consumer/subscribe.go b/alert/consumer/subscribe.go
@@ -2,13 +2,14 @@ package consumer
 
 import (
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logc"
 	"strings"
 	"watchAlert/internal/ctx"
 	"watchAlert/internal/models"
 	"watchAlert/pkg/sender"
 	"watchAlert/pkg/templates"
 	"watchAlert/pkg/tools"
+
+	"github.com/zeromicro/go-zero/core/logc"
 )
 
 type toUser struct {
@@ -85,7 +86,7 @@ func sendToSubscribeUser(ctx *ctx.Context, alert models.AlertCurEvent, toUsers [
 				// 释放信号量
 				<-sem
 			}()
-			emailTemp := templates.NewTemplate(ctx, alert, models.AlertNotice{NoticeType: "Email", NoticeTmplId: u.NoticeTemplateId})
+			emailTemp := templates.NewTemplate(ctx, alert, models.Route{NoticeType: "Email", NoticeTmplId: u.NoticeTemplateId})
 			err := sender.NewEmailSender().Send(sender.SendParams{
 				IsRecovered: alert.IsRecovered,
 				Email: models.Email{
diff --git a/alert/probe/service.go b/alert/probe/service.go
@@ -257,7 +257,7 @@ func (s *ProbeService) getOrCreateWriter(datasourceId string) (MetricsWriter, er
 	}
 
 	// 检查数据源是否启用
-	if !*datasource.GetEnabled() || datasource.Write.Enabled == "Off" {
+	if !datasource.GetEnabled() || datasource.Write.Enabled == "Off" {
 		logc.Infof(s.ctx.Ctx, "数据源 %s 已禁用或未开启写入，跳过指标写入", datasourceId)
 		return nil, nil
 	}
diff --git a/alert/process/handle.go b/alert/process/handle.go
@@ -2,6 +2,7 @@ package process
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 	"watchAlert/internal/ctx"
@@ -46,47 +47,53 @@ func HandleAlert(ctx *ctx.Context, processType string, faultCenter models.FaultC
 				return nil
 			}
 
-			// 获取当前事件等级对应的 Hook 和 Sign
-			Hook, Sign := getNoticeHookUrlAndSign(noticeData, severity)
-
+			// 获取当前事件等级对应的路由配置
+			routes := getNoticeRoutes(noticeData, severity)
 			for _, event := range events {
 				if processType == "alarm" && !event.IsRecovered {
 					event.LastSendTime = curTime
 					ctx.Redis.Alert().PushAlertEvent(event)
 				}
 
-				phoneNumber := func() []string {
-					if len(event.DutyUserPhoneNumber) > 0 {
-						return event.DutyUserPhoneNumber
+				if len(routes) == 0 {
+					logc.Infof(ctx.Ctx, "没用匹配的通知策略, 告警事件名称: %s, 通知对象名称: %s", event.RuleName, noticeData.Name)
+				}
+
+				for _, route := range routes {
+					// 设置值班用户信息
+					event.DutyUser = strings.Join(GetDutyUsers(ctx, noticeData, route.NoticeType), " ")
+
+					// 生成告警内容
+					content := generateAlertContent(ctx, event, noticeData, route)
+
+					// 构建邮件信息
+					email := models.Email{
+						Subject: route.Subject,
+						To:      route.To,
+						CC:      route.CC,
 					}
-					if len(noticeData.PhoneNumber) > 0 {
-						return noticeData.PhoneNumber
+
+					// 发送告警
+					err := sender.Sender(ctx, sender.SendParams{
+						TenantId:    event.TenantId,
+						EventId:     event.EventId,
+						RuleName:    event.RuleName,
+						Severity:    event.Severity,
+						NoticeType:  route.NoticeType,
+						NoticeId:    noticeId,
+						NoticeName:  noticeData.Name,
+						IsRecovered: event.IsRecovered,
+						Hook:        route.Hook,
+						Email:       email,
+						Content:     content,
+						Sign:        route.Sign,
+					})
+					if err != nil {
+						logc.Error(ctx.Ctx, fmt.Sprintf("Failed to send alert: %v", err))
 					}
-					return []string{}
-				}()
-
-				event.DutyUser = strings.Join(GetDutyUsers(ctx, noticeData), " ")
-				event.DutyUserPhoneNumber = GetDutyUserPhoneNumber(ctx, noticeData)
-				content := generateAlertContent(ctx, event, noticeData)
-				err := sender.Sender(ctx, sender.SendParams{
-					TenantId:    event.TenantId,
-					EventId:     event.EventId,
-					RuleName:    event.RuleName,
-					Severity:    event.Severity,
-					NoticeType:  noticeData.NoticeType,
-					NoticeId:    noticeId,
-					NoticeName:  noticeData.Name,
-					IsRecovered: event.IsRecovered,
-					Hook:        Hook,
-					Email:       getNoticeEmail(noticeData, severity),
-					Content:     content,
-					PhoneNumber: phoneNumber,
-					Sign:        Sign,
-				})
-				if err != nil {
-					logc.Error(ctx.Ctx, fmt.Sprintf("Failed to send alert: %v", err))
 				}
 			}
+
 			return nil
 		})
 	}
@@ -143,32 +150,18 @@ func getNoticeData(ctx *ctx.Context, tenantId, noticeId string) (models.AlertNot
 	return ctx.DB.Notice().Get(tenantId, noticeId)
 }
 
-// getNoticeHookUrlAndSign 获取事件等级对应的 Hook 和 Sign
-func getNoticeHookUrlAndSign(notice models.AlertNotice, severity string) (string, string) {
-	if notice.Routes != nil {
-		for _, hook := range notice.Routes {
-			if hook.Severity == severity {
-				return hook.Hook, hook.Sign
-			}
-		}
-	}
-	return notice.DefaultHook, notice.DefaultSign
-}
-
-// getNoticeEmail 获取事件等级对应的 Email
-func getNoticeEmail(notice models.AlertNotice, severity string) models.Email {
+// getNoticeRoutes 获取事件等级对应的路由配置
+func getNoticeRoutes(notice models.AlertNotice, severity string) []models.Route {
+	var routes []models.Route
 	if notice.Routes != nil {
 		for _, route := range notice.Routes {
-			if route.Severity == severity {
-				return models.Email{
-					Subject: notice.Email.Subject,
-					To:      route.To,
-					CC:      route.CC,
-				}
+			if slices.Contains(route.Severitys, severity) {
+				routes = append(routes, route)
 			}
 		}
 	}
-	return notice.Email
+
+	return routes
 }
 
 type WebhookContent struct {
@@ -177,8 +170,8 @@ type WebhookContent struct {
 }
 
 // generateAlertContent 生成告警内容
-func generateAlertContent(ctx *ctx.Context, alert *models.AlertCurEvent, noticeData models.AlertNotice) string {
-	if noticeData.NoticeType == "CustomHook" {
+func generateAlertContent(ctx *ctx.Context, alert *models.AlertCurEvent, noticeData models.AlertNotice, route models.Route) string {
+	if route.NoticeType == "WebHook" {
 		users, ok := ctx.DB.DutyCalendar().GetDutyUserInfo(*noticeData.GetDutyId(), time.Now().Format("2006-1-2"))
 		if !ok || len(users) == 0 {
 			logc.Error(ctx.Ctx, "Failed to get duty users, noticeName: ", noticeData.Name)
@@ -200,5 +193,7 @@ func generateAlertContent(ctx *ctx.Context, alert *models.AlertCurEvent, noticeD
 
 		return tools.JsonMarshalToString(content)
 	}
-	return templates.NewTemplate(ctx, *alert, noticeData).CardContentMsg
+
+	// 使用新的模板系统
+	return templates.NewTemplate(ctx, *alert, route).CardContentMsg
 }
diff --git a/alert/process/process.go b/alert/process/process.go
@@ -105,11 +105,11 @@ func IsSilencedEvent(event *models.AlertCurEvent) bool {
 	})
 }
 
-func GetDutyUsers(ctx *ctx.Context, noticeData models.AlertNotice) []string {
+func GetDutyUsers(ctx *ctx.Context, noticeData models.AlertNotice, noticeType string) []string {
 	var us []string
 	users, ok := ctx.DB.DutyCalendar().GetDutyUserInfo(*noticeData.GetDutyId(), time.Now().Format("2006-1-2"))
 	if ok {
-		switch noticeData.NoticeType {
+		switch noticeType {
 		case "FeiShu":
 			for _, user := range users {
 				us = append(us, fmt.Sprintf("<at id=%s></at>", user.DutyUserId))
@@ -120,7 +120,7 @@ func GetDutyUsers(ctx *ctx.Context, noticeData models.AlertNotice) []string {
 				us = append(us, fmt.Sprintf("@%s", user.DutyUserId))
 			}
 			return us
-		case "Email", "WeChat", "CustomHook":
+		case "Email", "WeChat", "WebHook":
 			for _, user := range users {
 				us = append(us, fmt.Sprintf("@%s", user.UserName))
 			}
@@ -136,20 +136,6 @@ func GetDutyUsers(ctx *ctx.Context, noticeData models.AlertNotice) []string {
 	return []string{"暂无"}
 }
 
-// GetDutyUserPhoneNumber 获取当班人员手机号
-func GetDutyUserPhoneNumber(ctx *ctx.Context, noticeData models.AlertNotice) []string {
-	//user, ok := ctx.DB.DutyCalendar().GetDutyUserInfo(*noticeData.GetDutyId(), time.Now().Format("2006-1-2"))
-	//if ok {
-	//	switch noticeData.NoticeType {
-	//	case "PhoneCall":
-	//		if len(user.DutyUserId) > 1 {
-	//			return []string{user.Phone}
-	//		}
-	//	}
-	//}
-	return []string{}
-}
-
 // RecordAlertHisEvent 记录历史告警
 func RecordAlertHisEvent(ctx *ctx.Context, alert models.AlertCurEvent) error {
 	hisData := models.AlertHisEvent{
diff --git a/api/datasource.go b/api/datasource.go
@@ -151,6 +151,11 @@ func (datasourceController datasourceController) PromQuery(ctx *gin.Context) {
 			if err != nil {
 				return nil, err
 			}
+
+			if !source.GetEnabled() {
+				return nil, fmt.Errorf("数据源「%s」已被禁用!", source.Name)
+			}
+
 			fullURL := fmt.Sprintf("%s%s?%s", source.HTTP.URL, path, params.Encode())
 			get, err := tools.Get(tools.CreateBasicAuthHeader(source.Auth.User, source.Auth.Pass), fullURL, 10)
 			if err != nil {
@@ -195,6 +200,11 @@ func (datasourceController datasourceController) PromQueryRange(ctx *gin.Context
 			if err != nil {
 				return nil, err
 			}
+
+			if !source.GetEnabled() {
+				return nil, fmt.Errorf("数据源「%s」已被禁用!", source.Name)
+			}
+
 			fullURL := fmt.Sprintf("%s%s?%s", source.HTTP.URL, path, params.Encode())
 			get, err := tools.Get(tools.CreateBasicAuthHeader(source.Auth.User, source.Auth.Pass), fullURL, 10)
 			if err != nil {
diff --git a/initialization/init.go b/initialization/init.go
@@ -77,7 +77,7 @@ func importClientPools(ctx *ctx.Context) {
 	g := new(errgroup.Group)
 	for _, datasource := range list {
 		ds := datasource
-		if !*ds.GetEnabled() {
+		if !ds.GetEnabled() {
 			continue
 		}
 		g.Go(func() error {
diff --git a/internal/models/alert_current_event.go b/internal/models/alert_current_event.go
@@ -42,7 +42,6 @@ type AlertCurEvent struct {
 	RecoverTime            int64                  `json:"recover_time" gorm:"-"`   // 恢复时间
 	RecoverTimeFormat      string                 `json:"recover_time_format" gorm:"-"`
 	DutyUser               string                 `json:"duty_user" gorm:"-"`
-	DutyUserPhoneNumber    []string               `json:"duty_user_phone_number" gorm:"-"`
 	EffectiveTime          EffectiveTime          `json:"effectiveTime" gorm:"effectiveTime;serializer:json"`
 	FaultCenterId          string                 `json:"faultCenterId"`
 	FaultCenter            FaultCenter            `json:"faultCenter" gorm:"-"`
diff --git a/internal/models/datasource.go b/internal/models/datasource.go
@@ -66,10 +66,10 @@ type AWSCloudWatch struct {
 //	Value  []interface{}          `json:"value"`
 //}
 
-func (d *AlertDataSource) GetEnabled() *bool {
+func (d *AlertDataSource) GetEnabled() bool {
 	if d.Enabled == nil {
 		isOk := false
-		return &isOk
+		return isOk
 	}
-	return d.Enabled
+	return *d.Enabled
 }
diff --git a/internal/models/notice.go b/internal/models/notice.go
@@ -1,19 +1,13 @@
 package models
 
 type AlertNotice struct {
-	TenantId     string   `json:"tenantId"`
-	Uuid         string   `json:"uuid"`
-	Name         string   `json:"name"`
-	DutyId       *string  `json:"dutyId"`
-	NoticeType   string   `json:"noticeType"`
-	NoticeTmplId string   `json:"noticeTmplId"`
-	DefaultHook  string   `json:"hook" gorm:"column:hook"`
-	DefaultSign  string   `json:"sign" gorm:"column:sign"`
-	Routes       []Route  `json:"routes" gorm:"column:routes;serializer:json"`
-	Email        Email    `json:"email" gorm:"email;serializer:json"`
-	PhoneNumber  []string `json:"phoneNumber" gorm:"phoneNumber;serializer:json"`
-	UpdateAt     int64    `json:"updateAt"`
-	UpdateBy     string   `json:"updateBy"`
+	TenantId string  `json:"tenantId"`
+	Uuid     string  `json:"uuid"`
+	Name     string  `json:"name"`
+	DutyId   *string `json:"dutyId"`
+	Routes   []Route `json:"routes" gorm:"column:routes;serializer:json"`
+	UpdateAt int64   `json:"updateAt"`
+	UpdateBy string  `json:"updateBy"`
 }
 
 func (alertNotice *AlertNotice) GetDutyId() *string {
@@ -24,12 +18,18 @@ func (alertNotice *AlertNotice) GetDutyId() *string {
 }
 
 type Route struct {
+	// 通知类型
+	NoticeType string `json:"noticeType"`
+	// 通知模版 ID
+	NoticeTmplId string `json:"noticeTmplId"`
 	// 告警等级
-	Severity string `json:"severity"`
+	Severitys []string `json:"severitys"`
 	// WebHook
 	Hook string `json:"hook"`
 	// 签名
 	Sign string `json:"sign"`
+	// 邮件主题
+	Subject string `json:"subject"`
 	// 收件人
 	To []string `json:"to" gorm:"column:to;serializer:json"`
 	// 抄送人
diff --git a/internal/repo/notice.go b/internal/repo/notice.go
@@ -23,7 +23,7 @@ type (
 		Update(r models.AlertNotice) error
 		Delete(tenantId, id string) error
 		AddRecord(r models.NoticeRecord) error
-		ListRecord(tenantId, eventId, severity, status, query string, page models.Page) (models.ResponseNoticeRecords, error)
+		ListRecord(tenantId, eventId, severity, status, noticeId, query string, page models.Page) (models.ResponseNoticeRecords, error)
 		CountRecord(r models.CountRecord) (int64, error)
 		DeleteRecord() error
 	}
@@ -150,7 +150,7 @@ func (nr NoticeRepo) AddRecord(r models.NoticeRecord) error {
 	return nil
 }
 
-func (nr NoticeRepo) ListRecord(tenantId, eventId, severity, status, query string, page models.Page) (models.ResponseNoticeRecords, error) {
+func (nr NoticeRepo) ListRecord(tenantId, eventId, severity, status, noticeId, query string, page models.Page) (models.ResponseNoticeRecords, error) {
 	var (
 		records []models.NoticeRecord
 		count   int64
@@ -167,6 +167,9 @@ func (nr NoticeRepo) ListRecord(tenantId, eventId, severity, status, query strin
 	if status != "" {
 		db.Where("status = ?", status)
 	}
+	if noticeId != "" {
+		db.Where("n_obj LIKE ?", "%"+noticeId+"%")
+	}
 	if query != "" {
 		db.Where("rule_name LIKE ? OR alarm_msg LIKE ? OR err_msg LIKE ?", "%"+query+"%", "%"+query+"%", "%"+query+"%")
 	}
diff --git a/internal/services/notice.go b/internal/services/notice.go
diff --git a/internal/types/notice.go b/internal/types/notice.go
diff --git a/pkg/sender/entry.go b/pkg/sender/entry.go
diff --git a/pkg/sender/phoneCall.go b/pkg/sender/phoneCall.go
diff --git a/pkg/templates/new.go b/pkg/templates/new.go

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ func (s *ProbeService) getOrCreateWriter(datasourceId string) (MetricsWriter, er`
`257`	`257`	`}`
`258`	`258`
`259`	`259`	`// 检查数据源是否启用`
`260`		`- if !*datasource.GetEnabled() \|\| datasource.Write.Enabled == "Off" {`
	`260`	`+ if !datasource.GetEnabled() \|\| datasource.Write.Enabled == "Off" {`
`261`	`261`	`logc.Infof(s.ctx.Ctx, "数据源 %s 已禁用或未开启写入，跳过指标写入", datasourceId)`
`262`	`262`	`return nil, nil`
`263`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func importClientPools(ctx *ctx.Context) {`
`77`	`77`	`g := new(errgroup.Group)`
`78`	`78`	`for _, datasource := range list {`
`79`	`79`	`ds := datasource`
`80`		`- if !*ds.GetEnabled() {`
	`80`	`+ if !ds.GetEnabled() {`
`81`	`81`	`continue`
`82`	`82`	`}`
`83`	`83`	`g.Go(func() error {`
Original file line number	Diff line number	Diff line change
`@@ -66,10 +66,10 @@ type AWSCloudWatch struct {`
`66`	`66`	// Value []interface{} `json:"value"`
`67`	`67`	`//}`
`68`	`68`
`69`		`-func (d AlertDataSource) GetEnabled() bool {`
	`69`	`+func (d *AlertDataSource) GetEnabled() bool {`
`70`	`70`	`if d.Enabled == nil {`
`71`	`71`	`isOk := false`
`72`		`- return &isOk`
	`72`	`+ return isOk`
`73`	`73`	`}`
`74`		`- return d.Enabled`
	`74`	`+ return *d.Enabled`
`75`	`75`	`}`