refactor: update notify channel api (#2508)

ccfos · Mar 5, 2025 · 52b7890 · 52b7890
1 parent 0166405
commit 52b7890
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/alert/dispatch/dispatch.go b/alert/dispatch/dispatch.go
@@ -385,6 +385,10 @@ func (e *Dispatch) HandleEventNotify(event *models.AlertCurEvent, isSubscribe bo
 		return
 	}
 
+	if len(rule.NotifyRuleIds) > 0 {
+		event.NotifyRuleIDs = rule.NotifyRuleIds
+	}
+
 	if e.blockEventNotify(rule, event) {
 		logger.Infof("block event notify: rule_id:%d event:%+v", rule.Id, event)
 		return

diff --git a/center/router/router.go b/center/router/router.go
@@ -534,7 +534,7 @@ func (rt *Router) Config(r *gin.Engine) {
 		pages.GET("/notify-channel-configs", rt.auth(), rt.user(), rt.perm("/notification-channels"), rt.notifyChannelsGet)
 		pages.GET("/simplified-notify-channel-configs", rt.notifyChannelsGetForNormalUser)
 		pages.GET("/flashduty-channel-list/:id", rt.auth(), rt.user(), rt.flashDutyNotifyChannelsGet)
-		pages.GET("/notify-channel-config", rt.auth(), rt.user(), rt.perm("/notification-channels"), rt.notifyChannelGetBy)
+		pages.GET("/notify-channel-config", rt.auth(), rt.user(), rt.notifyChannelGetBy)
 	}
 
 	r.GET("/api/n9e/versions", func(c *gin.Context) {

diff --git a/center/router/router_notify_channel.go b/center/router/router_notify_channel.go
@@ -114,6 +114,9 @@ func (rt *Router) notifyChannelGetBy(c *gin.Context) {
 		ginx.Bomb(http.StatusNotFound, "notify channel not found")
 	}
 
+	nc.ParamConfig = &models.NotifyParamConfig{}
+	nc.RequestConfig = &models.RequestConfig{}
+
 	ginx.NewRender(c).Data(nc, nil)
 }
 

diff --git a/center/router/router_notify_rule.go b/center/router/router_notify_rule.go
@@ -106,7 +106,7 @@ func (rt *Router) notifyRuleGet(c *gin.Context) {
 }
 
 func (rt *Router) notifyRulesGetByService(c *gin.Context) {
-	ginx.NewRender(c).Data(models.NotifyRulesGet(rt.Ctx, "", nil))
+	ginx.NewRender(c).Data(models.NotifyRulesGet(rt.Ctx, "enable = ?", "true"))
 }
 
 func (rt *Router) notifyRulesGet(c *gin.Context) {
@@ -193,7 +193,7 @@ func (rt *Router) notifyTest(c *gin.Context) {
 			}
 		}
 		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		ginx.NewRender(c).Message(err)
+		ginx.NewRender(c).Data(resp, err)
 	case "http":
 		client, err := models.GetHTTPClient(notifyChannel)
 		ginx.Dangerous(err)
@@ -214,15 +214,15 @@ func (rt *Router) notifyTest(c *gin.Context) {
 			if err != nil {
 				logger.Errorf("failed to send http notify: %v", err)
 			}
-			ginx.NewRender(c).Message(err)
+			ginx.NewRender(c).Data(resp, err)
 		}
 	case "smtp":
 		err := notifyChannel.SendEmail2(events, tplContent, userInfos)
 		ginx.NewRender(c).Message(err)
 	case "script":
 		resp, _, err := notifyChannel.SendScript(events, tplContent, customParams, userInfos)
 		logger.Infof("channel_name: %v, event:%+v, tplContent:%s, customParams:%v, respBody: %v, err: %v", notifyChannel.Name, events[0], tplContent, customParams, resp, err)
-		ginx.NewRender(c).Message(err)
+		ginx.NewRender(c).Data(resp, err)
 	default:
 		logger.Errorf("unsupported request type: %v", notifyChannel.RequestType)
 		ginx.NewRender(c).Message(errors.New("unsupported request type"))