fix: 更新告警参数描述,修正CPU使用率计算逻辑, license检查天数错误
This commit is contained in:
@@ -15,6 +15,10 @@ import (
|
||||
"be.ems/lib/global"
|
||||
"be.ems/lib/log"
|
||||
"be.ems/lib/services"
|
||||
"be.ems/src/framework/constants"
|
||||
neDataModel "be.ems/src/modules/network_data/model"
|
||||
neDataService "be.ems/src/modules/network_data/service"
|
||||
traceService "be.ems/src/modules/trace/service"
|
||||
"xorm.io/xorm"
|
||||
|
||||
"github.com/go-resty/resty/v2"
|
||||
@@ -476,6 +480,23 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
log.Error("Failed to AlarmSMSForward:", err)
|
||||
}
|
||||
}
|
||||
|
||||
// 网元重启后,清除活动告警
|
||||
if alarmData.AlarmCode == constants.ALARM_EVENT_REBOOT {
|
||||
alarmService := neDataService.NewAlarm
|
||||
rows := alarmService.Find(neDataModel.Alarm{
|
||||
NeType: alarmData.NeType,
|
||||
NeId: alarmData.NeId,
|
||||
AlarmStatus: "1",
|
||||
})
|
||||
for _, v := range rows {
|
||||
alarmService.AlarmClearByIds([]string{v.ID}, "system")
|
||||
}
|
||||
}
|
||||
// 网元重启后,有跟踪任务的需要重新补发启动任务
|
||||
if alarmData.AlarmCode == constants.ALARM_EVENT_REBOOT {
|
||||
traceService.NewTraceTask.RunUnstopped()
|
||||
}
|
||||
}
|
||||
|
||||
services.ResponseStatusOK200Null(w)
|
||||
@@ -788,6 +809,23 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
|
||||
log.Error("Failed to AlarmSMSForward:", err)
|
||||
}
|
||||
}
|
||||
|
||||
// 网元重启后,清除活动告警
|
||||
if alarmData.AlarmCode == constants.ALARM_EVENT_REBOOT {
|
||||
alarmService := neDataService.NewAlarm
|
||||
rows := alarmService.Find(neDataModel.Alarm{
|
||||
NeType: alarmData.NeType,
|
||||
NeId: alarmData.NeId,
|
||||
AlarmStatus: "1",
|
||||
})
|
||||
for _, v := range rows {
|
||||
alarmService.AlarmClearByIds([]string{v.ID}, "system")
|
||||
}
|
||||
}
|
||||
// 网元重启后,有跟踪任务的需要重新补发启动任务
|
||||
if alarmData.AlarmCode == constants.ALARM_EVENT_REBOOT {
|
||||
traceService.NewTraceTask.RunUnstopped()
|
||||
}
|
||||
}
|
||||
log.Warn("Failed to insert alarm data:", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user