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

marge: 合并11.2版本

Browse Source
This commit is contained in:
TsMask
2024-11-22 10:06:51 +08:00
parent 86ba2fb4a6
commit 1bdb13a2ab
67 changed files with 3536 additions and 3765 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
features/fm/alarm.go
View File

@@ -435,7 +435,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
SetAlarmAckInfo(valueJson, &alarmData)
}
log.Trace("alarmData:", alarmData)
if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
if (alarmData.OrigSeverity == "Event" || alarmData.OrigSeverity == "5") && config.GetYamlConfig().Alarm.SplitEventAlarm {
affected, err := xEngine.Table("alarm_event").InsertOne(alarmData)
if err != nil && affected <= 0 {
log.Error("Failed to insert alarm_event:", err)
@@ -466,10 +466,12 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
}
session.Commit()
}
if config.GetYamlConfig().Alarm.ForwardAlarm {
if config.GetYamlConfig().Alarm.EmailForward.Enable {
if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err)
}
}
if config.GetYamlConfig().Alarm.SMSCForward.Enable {
if err = AlarmSMSForward(&alarmData); err != nil {
log.Error("Failed to AlarmSMSForward:", err)
}
@@ -593,7 +595,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
exist, err := session.Table("alarm").
Where("ne_type=? and ne_id=? and alarm_id=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.AlarmId).
Exist()
if err == nil || !exist {
if err != nil || !exist {
log.Infof("Not found active alarm: ne_id=%s, alarm_id=%s", alarmData.NeId, alarmData.AlarmId)
continue
}
@@ -737,9 +739,10 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
}
}
evenTime := global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
alarmData.ObjectUid = alarmData.NeId
alarmData.ObjectType = "VNFM"
alarmData.EventTime = global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
alarmData.EventTime = evenTime
if IsNeedToAckAlarm(valueJson, &alarmData) {
SetAlarmAckInfo(valueJson, &alarmData)
}
@@ -766,8 +769,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
alarmLog.AlarmId = alarmData.AlarmId
alarmLog.AlarmCode = alarmData.AlarmCode
alarmLog.AlarmStatus = alarmData.AlarmStatus
alarmLog.EventTime = global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
log.Debug("alarmLog:", alarmLog)
alarmLog.EventTime = evenTime
log.Trace("alarmLog:", alarmLog)
affected, err = session.Insert(alarmLog)
if err != nil && affected <= 0 {
log.Error("Failed to insert data:", err)
@@ -775,10 +778,12 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
continue
}
session.Commit()
if config.GetYamlConfig().Alarm.ForwardAlarm {
if config.GetYamlConfig().Alarm.EmailForward.Enable {
if err = AlarmEmailForward(&alarmData); err != nil {
log.Error("Failed to AlarmEmailForward:", err)
}
}
if config.GetYamlConfig().Alarm.SMSCForward.Enable {
if err = AlarmSMSForward(&alarmData); err != nil {
log.Error("Failed to AlarmSMSForward:", err)
}