From d02db0e40169ae465d462ba999fb518d1db5a5f8 Mon Sep 17 00:00:00 2001
From: zhaoxiangchun <1422928955@qq.com>
Date: Mon, 16 Nov 2020 14:27:17 +0800
Subject: [PATCH] modify  alertResource ws info
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ignore_alert:ture 前端不再进行弹窗提示
---
 pkg/monitor/models/alertresource.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/monitor/models/alertresource.go b/pkg/monitor/models/alertresource.go
index 3073ccb543..286037527c 100644
--- a/pkg/monitor/models/alertresource.go
+++ b/pkg/monitor/models/alertresource.go
@@ -495,7 +495,7 @@ func (manager *SAlertResourceManager) GetAdminRoleUsers(ctx context.Context, use
 			userId, err := roleAssign.GetString("user", "id")
 			if err != nil {
 				log.Errorf("roleAssign:%v", roleAssign)
-				return
+				continue
 			}
 			//_, err = mc_modules.NotifyReceiver.GetById(session, userId, jsonutils.NewDict())
 			//if err != nil {
@@ -519,6 +519,7 @@ func (manager *SAlertResourceManager) sendWebsocketInfo(uids []string, alertReso
 	params.Set("obj_name", jsonutils.NewString(""))
 	params.Set("success", jsonutils.JSONTrue)
 	params.Set("action", jsonutils.NewString("alertResourceCount"))
+	params.Set("ignore_alert", jsonutils.JSONTrue)
 	params.Set("notes", jsonutils.NewString(fmt.Sprintf("priority=%s; content=%s", string(npk.NotifyPriorityCritical),
 		jsonutils.Marshal(&alertResourceCount).String())))
 	for _, uid := range uids {