fix: 自检告警附加信息错误最佳和触发消除操作
This commit is contained in:
@@ -112,20 +112,20 @@ func (s *NeAlarmStateCheckCMDProcessor) Execute(data any) (any, error) {
|
||||
|
||||
// 检查状态
|
||||
err := s.serverState(neInfo.ServerState, params.CPUUseGt, params.MemUseGt, params.DiskUseGt)
|
||||
if err == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
// 附加信息
|
||||
addInfo := params.AddInfo
|
||||
if addInfo != "" {
|
||||
addInfo = addInfo + ", " + err.Error()
|
||||
} else {
|
||||
addInfo = err.Error()
|
||||
if err != nil {
|
||||
if addInfo != "" {
|
||||
addInfo = addInfo + ", " + err.Error()
|
||||
} else {
|
||||
addInfo = err.Error()
|
||||
}
|
||||
}
|
||||
|
||||
neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
|
||||
// 告警ID
|
||||
params.AlarmId = fmt.Sprintf("%d%d", constants.ALARM_CMD_CHECK, neInfo.CreateTime)
|
||||
|
||||
neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
|
||||
// 检查网元告警ID是否唯一
|
||||
alarmIdArr := s.alarmService.Find(neDataModel.Alarm{
|
||||
NeType: neInfo.NeType,
|
||||
|
||||
@@ -92,15 +92,15 @@ func (s *NeAlarmStateCheckLicenseProcessor) Execute(data any) (any, error) {
|
||||
|
||||
// 检查状态
|
||||
err := s.serverState(neInfo.ServerState, params.DayLt)
|
||||
if err == nil {
|
||||
continue
|
||||
}
|
||||
|
||||
// 附加信息
|
||||
addInfo := params.AddInfo
|
||||
if addInfo != "" {
|
||||
addInfo = addInfo + ", " + err.Error()
|
||||
} else {
|
||||
addInfo = err.Error()
|
||||
if err != nil {
|
||||
if addInfo != "" {
|
||||
addInfo = addInfo + ", " + err.Error()
|
||||
} else {
|
||||
addInfo = err.Error()
|
||||
}
|
||||
}
|
||||
|
||||
neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
|
||||
|
||||
Reference in New Issue
Block a user