OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: event alarm not insert to table alarm_event as manual sync alarm

Browse Source
This commit is contained in:
simonzhangsz
2024-07-18 20:10:23 +08:00
parent db5107e06f
commit 01487e3ba6
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
database/upgrade/upg_alarm_event.sql
View File

@@ -133,4 +133,9 @@ DELETE FROM `alarm` WHERE `orig_severity` = 'Event';
COMMIT; COMMIT;
DELETE FROM alarm_event WHERE id NOT IN (SELECT MIN(id) FROM alarm_event GROUP BY `ne_type`, `ne_id`, `alarm_id`, `event_time`);
ALTER TABLE `alarm_event`
ADD UNIQUE INDEX IF NOT EXISTS `idx_uni_aid_ne_time`(`ne_type`, `ne_id`, `alarm_id`, `event_time`) USING BTREE;
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;

19
features/fm/alarm.go
View File

@@ -320,7 +320,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
alarmLog.AlarmCode = alarmData.AlarmCode alarmLog.AlarmCode = alarmData.AlarmCode
alarmLog.AlarmStatus = alarmData.AlarmStatus alarmLog.AlarmStatus = alarmData.AlarmStatus
alarmLog.EventTime = eventTime alarmLog.EventTime = eventTime
log.Debug("alarmLog:", alarmLog) log.Trace("alarmLog:", alarmLog)
affected, err := session.Insert(alarmLog) affected, err := session.Insert(alarmLog)
if err != nil && affected <= 0 { if err != nil && affected <= 0 {
@@ -434,7 +434,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
if IsNeedToAckAlarm(valueJson, &alarmData) { if IsNeedToAckAlarm(valueJson, &alarmData) {
SetAlarmAckInfo(valueJson, &alarmData) SetAlarmAckInfo(valueJson, &alarmData)
} }
log.Debug("alarmData:", alarmData) log.Trace("alarmData:", alarmData)
if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm { if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
affected, err := xEngine.Table("alarm_event").InsertOne(alarmData) affected, err := xEngine.Table("alarm_event").InsertOne(alarmData)
if err != nil && affected <= 0 { if err != nil && affected <= 0 {
@@ -744,7 +744,20 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
SetAlarmAckInfo(valueJson, &alarmData) SetAlarmAckInfo(valueJson, &alarmData)
} }
log.Trace("alarmData:", alarmData) log.Trace("alarmData:", alarmData)
affected, err := session.Insert(alarmData) var affected int64
if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
affected, err = session.Table("alarm_event").InsertOne(alarmData)
if err != nil && affected <= 0 {
log.Error("Failed to insert alarm_event:", err)
continue
}
} else {
affected, err = session.Table("alarm").Insert(alarmData)
if err != nil && affected <= 0 {
log.Error("Failed to insert alarm:", err)
continue
}
}
if err == nil && affected > 0 { if err == nil && affected > 0 {
alarmLog := new(AlarmLog) alarmLog := new(AlarmLog)
alarmLog.NeType = alarmData.NeType alarmLog.NeType = alarmData.NeType