Merge branch 'master' of github.com:didi/nightingale

models/history_alert_event.go

@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"strings"
 
-	//"github.com/didi/nightingale/v5/vos"
-
 	"github.com/toolkits/pkg/logger"
 	"xorm.io/builder"
 )
@@ -15,9 +13,9 @@ type HistoryAlertEvent struct {
 	RuleId   int64  `json:"rule_id"`
 	RuleName string `json:"rule_name"`
 	RuleNote string `json:"rule_note"`
-	ProcessorUid       int64           `json:"processor_uid"`
-	ProcessorObj       User            `json:"processor_user_objs" xorm:"-"`
-	EventNote          string          `json:"event_note"`
+	//ProcessorUid       int64           `json:"processor_uid"`
+	//ProcessorObj       User            `json:"processor_user_objs" xorm:""`
+	//EventNote          string          `json:"event_note"`
 	HashId             string          `json:"hash_id"`       // 唯一标识
 	IsPromePull        int             `json:"is_prome_pull"` // 代表是否是prometheus pull告警，为1时前端使用 ReadableExpression 拉取最近1小时数据
 	ResClasspaths      string          `json:"res_classpaths"`
@@ -82,6 +80,7 @@ func (hae *HistoryAlertEvent) FillObjs() error {
 		hae.NotifyUserObjs = users
 	}
 
+	/*
 		if hae.ProcessorUid != 0 {
 			processor, err := UserGetById(hae.ProcessorUid)
 			if err != nil {
@@ -89,6 +88,7 @@ func (hae *HistoryAlertEvent) FillObjs() error {
 			}
 			hae.ProcessorObj = *processor
 		}
+	*/
 
 	return nil
 }

sql/n9e.sql

@@ -321,8 +321,6 @@ CREATE TABLE `history_alert_event` (
   `rule_id` bigint unsigned not null,
   `rule_name` varchar(255) not null,
   `rule_note` varchar(512) not null default 'alert rule note',
-  `processor_uid` bigint not null default 0,
-  `event_note` varchar(512) not null default 'alert event note',
   `res_classpaths` varchar(1024) not null default '' COMMENT 'belong classpaths',
   `priority` tinyint(1) not null,
   `status` tinyint(1) not null,