diff --git a/models/history_alert_event.go b/models/history_alert_event.go index f16251fe..a611383d 100644 --- a/models/history_alert_event.go +++ b/models/history_alert_event.go @@ -4,20 +4,18 @@ import ( "encoding/json" "strings" - //"github.com/didi/nightingale/v5/vos" - "github.com/toolkits/pkg/logger" "xorm.io/builder" ) type HistoryAlertEvent struct { - Id int64 `json:"id"` - 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"` + Id int64 `json:"id"` + 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"` HashId string `json:"hash_id"` // 唯一标识 IsPromePull int `json:"is_prome_pull"` // 代表是否是prometheus pull告警,为1时前端使用 ReadableExpression 拉取最近1小时数据 ResClasspaths string `json:"res_classpaths"` @@ -82,13 +80,15 @@ func (hae *HistoryAlertEvent) FillObjs() error { hae.NotifyUserObjs = users } - if hae.ProcessorUid != 0 { - processor, err := UserGetById(hae.ProcessorUid) - if err != nil { - return err + /* + if hae.ProcessorUid != 0 { + processor, err := UserGetById(hae.ProcessorUid) + if err != nil { + return err + } + hae.ProcessorObj = *processor } - hae.ProcessorObj = *processor - } + */ return nil } diff --git a/sql/n9e.sql b/sql/n9e.sql index 63be4eb8..aca23cbd 100644 --- a/sql/n9e.sql +++ b/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,