X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=manager%2Fcmd%2Fmanager.go;h=da689dcd43208831a82185b6ac11eff5e287c344;hb=44be37f7fc8cc9d52ca454a7a08ac2d6a883561c;hp=0036679f42c1693da3810dcc6412314d609cdb1d;hpb=e92822cba904bab04c5c71a9ffa99a1d89409640;p=ric-plt%2Falarm-go.git diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go index 0036679..da689dc 100755 --- a/manager/cmd/manager.go +++ b/manager/cmd/manager.go @@ -39,13 +39,49 @@ import ( "github.com/spf13/viper" ) +func (a *AlarmManager) ClearExpiredAlarms(m AlarmNotification, idx int, mLocked bool) bool { + d, ok := alarm.RICAlarmDefinitions[m.Alarm.SpecificProblem] + if !ok || d.TimeToLive == 0 { + return false + } + + elapsed := (time.Now().UnixNano() - m.AlarmTime) / 1e9 + if int(elapsed) >= d.TimeToLive { + app.Logger.Info("Alarm (sp=%d id=%d) with TTL=%d expired, clearing ...", m.Alarm.SpecificProblem, m.AlarmId, d.TimeToLive) + + m.AlarmAction = alarm.AlarmActionClear + m.AlarmTime = time.Now().UnixNano() + + if !mLocked { // For testing purpose + a.mutex.Lock() + } + a.ProcessClearAlarm(&m, d, idx) + return true + } + return false +} + +func (a *AlarmManager) StartTTLTimer(interval int) { + tick := time.Tick(time.Duration(interval) * time.Second) + for range tick { + a.mutex.Lock() + for idx, m := range a.activeAlarms { + if a.ClearExpiredAlarms(m, idx, true) { + a.mutex.Lock() // ClearExpiredAlarms unlocks the mutex, so re-lock here + continue + } + } + a.mutex.Unlock() + } +} + func (a *AlarmManager) StartAlertTimer() { tick := time.Tick(time.Duration(a.alertInterval) * time.Millisecond) for range tick { a.mutex.Lock() for _, m := range a.activeAlarms { app.Logger.Info("Re-raising alarm: %v", m) - a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive, m.AlarmTime)) + a.PostAlert(a.GenerateAlertLabels(m.AlarmId, m.Alarm, AlertStatusActive, m.AlarmTime)) } a.mutex.Unlock() } @@ -102,53 +138,28 @@ func (a *AlarmManager) ProcessAlarm(m *AlarmNotification) (*alert.PostAlertsOK, } // Clear alarm if found from active alarm list - if m.AlarmAction == alarm.AlarmActionClear { - if !found { - app.Logger.Info("No matching active alarm found, suppressing ...") - a.mutex.Unlock() - return nil, nil - } - - if a.ProcessClearAlarm(m, alarmDef, idx) == false { - return nil, nil - } - - a.mutex.Unlock() - if !a.postClear { - app.Logger.Info("Sending clear notification disabled!") - return nil, nil - } - - // Send alarm notification to NOMA, if enabled - if app.Config.GetBool("controls.noma.enabled") { - m.PerceivedSeverity = alarm.SeverityCleared - return a.PostAlarm(m) - } + if found && m.AlarmAction == alarm.AlarmActionClear { + return a.ProcessClearAlarm(m, alarmDef, idx) } // New alarm -> update active alarms and post to Alert Manager if m.AlarmAction == alarm.AlarmActionRaise { - if a.ProcessRaiseAlarm(m, alarmDef) == false { - return nil, nil - } - // Send alarm notification to NOMA, if enabled - if app.Config.GetBool("controls.noma.enabled") { - return a.PostAlarm(m) - } - return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive, m.AlarmTime)) + return a.ProcessRaiseAlarm(m, alarmDef) } a.mutex.Unlock() return nil, nil } -func (a *AlarmManager)ProcessRaiseAlarm(m *AlarmNotification, alarmDef *alarm.AlarmDefinition) bool { +func (a *AlarmManager) ProcessRaiseAlarm(m *AlarmNotification, alarmDef *alarm.AlarmDefinition) (*alert.PostAlertsOK, error) { app.Logger.Debug("Raise alarmDef.RaiseDelay = %v, AlarmNotification = %v", alarmDef.RaiseDelay, *m) + // RaiseDelay > 0 in an alarm object in active alarm table indicates that raise delay is still ongoing for the alarm m.AlarmDefinition.RaiseDelay = alarmDef.RaiseDelay a.UpdateAlarmFields(a.GenerateAlarmId(), m) a.UpdateActiveAlarmList(m) a.mutex.Unlock() + if alarmDef.RaiseDelay > 0 { timerDelay(alarmDef.RaiseDelay) a.mutex.Lock() @@ -162,16 +173,22 @@ func (a *AlarmManager)ProcessRaiseAlarm(m *AlarmNotification, alarmDef *alarm.Al } else { app.Logger.Debug("Alarm deleted during raise delay. AlarmNotification = %v", *m) a.mutex.Unlock() - return false + return nil, nil } } + m.AlarmDefinition.RaiseDelay = 0 a.UpdateAlarmHistoryList(m) - a.WriteAlarmInfoToPersistentVolume() - return true + a.WriteAlarmInfoToPersistentVolume() + + // Send alarm notification to NOMA, if enabled + if app.Config.GetBool("controls.noma.enabled") { + return a.PostAlarm(m) + } + return a.PostAlert(a.GenerateAlertLabels(m.AlarmId, m.Alarm, AlertStatusActive, m.AlarmTime)) } -func (a *AlarmManager)ProcessClearAlarm(m *AlarmNotification, alarmDef *alarm.AlarmDefinition, idx int) bool { +func (a *AlarmManager) ProcessClearAlarm(m *AlarmNotification, alarmDef *alarm.AlarmDefinition, idx int) (*alert.PostAlertsOK, error) { app.Logger.Debug("Clear alarmDef.ClearDelay = %v, AlarmNotification = %v", alarmDef.ClearDelay, *m) if alarmDef.ClearDelay > 0 { a.mutex.Unlock() @@ -182,9 +199,8 @@ func (a *AlarmManager)ProcessClearAlarm(m *AlarmNotification, alarmDef *alarm.Al var found bool idx, found = a.IsMatchFound(m.Alarm) if !found { - app.Logger.Debug("Alarm not anymore in the active alarms table. AlarmNotification = %v", *m) a.mutex.Unlock() - return false + return nil, nil } } a.UpdateAlarmFields(a.activeAlarms[idx].AlarmId, m) @@ -202,8 +218,14 @@ func (a *AlarmManager)ProcessClearAlarm(m *AlarmNotification, alarmDef *alarm.Al if a.exceededAlarmHistoryOn && m.Alarm.SpecificProblem == alarm.ALARM_HISTORY_EXCEED_MAX_THRESHOLD { a.exceededAlarmHistoryOn = false } - a.WriteAlarmInfoToPersistentVolume() - return true + a.WriteAlarmInfoToPersistentVolume() + + a.mutex.Unlock() + if a.postClear && app.Config.GetBool("controls.noma.enabled") { + m.PerceivedSeverity = alarm.SeverityCleared + return a.PostAlarm(m) + } + return nil, nil } func timerDelay(delay int) { @@ -244,7 +266,7 @@ func (a *AlarmManager) GenerateThresholdAlarm(sp int, data string) bool { thresholdMessage := alarm.AlarmMessage{ Alarm: thresholdAlarm, AlarmAction: alarm.AlarmActionRaise, - AlarmTime: (time.Now().UnixNano()), + AlarmTime: time.Now().UnixNano(), } alarmDef := alarm.RICAlarmDefinitions[sp] alarmId := a.GenerateAlarmId() @@ -299,7 +321,7 @@ func (a *AlarmManager) PostAlarm(m *AlarmNotification) (*alert.PostAlertsOK, err return nil, err } -func (a *AlarmManager) GenerateAlertLabels(newAlarm alarm.Alarm, status AlertStatus, alarmTime int64) (models.LabelSet, models.LabelSet) { +func (a *AlarmManager) GenerateAlertLabels(alarmId int, newAlarm alarm.Alarm, status AlertStatus, alarmTime int64) (models.LabelSet, models.LabelSet) { alarmDef := alarm.RICAlarmDefinitions[newAlarm.SpecificProblem] amLabels := models.LabelSet{ "status": string(status), @@ -309,7 +331,7 @@ func (a *AlarmManager) GenerateAlertLabels(newAlarm alarm.Alarm, status AlertSta "system_name": "RIC", } amAnnotations := models.LabelSet{ - "alarm_id": fmt.Sprintf("%d", alarmDef.AlarmId), + "alarm_id": fmt.Sprintf("%d", alarmId), "specific_problem": fmt.Sprintf("%d", newAlarm.SpecificProblem), "event_type": alarmDef.EventType, "identifying_info": newAlarm.IdentifyingInfo, @@ -349,14 +371,20 @@ func (a *AlarmManager) StatusCB() bool { if !a.rmrReady { app.Logger.Info("RMR not ready yet!") } - return a.rmrReady } func (a *AlarmManager) ConfigChangeCB(configparam string) { - a.maxActiveAlarms = app.Config.GetInt("controls.maxActiveAlarms") + if a.maxActiveAlarms == 0 { + a.maxActiveAlarms = 5000 + } + a.maxAlarmHistory = app.Config.GetInt("controls.maxAlarmHistory") + if a.maxAlarmHistory == 0 { + a.maxAlarmHistory = 20000 + } + a.alertInterval = viper.GetInt("controls.promAlertManager.alertInterval") a.amHost = viper.GetString("controls.promAlertManager.address") @@ -389,6 +417,7 @@ func (a *AlarmManager) ReadAlarmDefinitionFromJson() { ricAlarmDefintion.OperationInstructions = alarmDefinition.OperationInstructions ricAlarmDefintion.RaiseDelay = alarmDefinition.RaiseDelay ricAlarmDefintion.ClearDelay = alarmDefinition.ClearDelay + ricAlarmDefintion.TimeToLive = alarmDefinition.TimeToLive alarm.RICAlarmDefinitions[alarmDefinition.AlarmId] = ricAlarmDefintion } } @@ -424,8 +453,10 @@ func (a *AlarmManager) WriteAlarmInfoToPersistentVolume() { alarmpersistentinfo.UniqueAlarmId = a.uniqueAlarmId alarmpersistentinfo.ActiveAlarms = make([]AlarmNotification, len(a.activeAlarms)) alarmpersistentinfo.AlarmHistory = make([]AlarmNotification, len(a.alarmHistory)) + copy(alarmpersistentinfo.ActiveAlarms, a.activeAlarms) copy(alarmpersistentinfo.AlarmHistory, a.alarmHistory) + wdata, err := json.MarshalIndent(alarmpersistentinfo, "", " ") if err != nil { app.Logger.Error("alarmpersistentinfo json marshal error %v", err) @@ -437,7 +468,7 @@ func (a *AlarmManager) WriteAlarmInfoToPersistentVolume() { } } -func (a *AlarmManager) Run(sdlcheck bool) { +func (a *AlarmManager) Run(sdlcheck bool, ttlInterval int) { app.Logger.SetMdc("alarmManager", fmt.Sprintf("%s:%s", Version, Hash)) app.SetReadyCB(func(d interface{}) { a.rmrReady = true }, true) app.Resource.InjectStatusCb(a.StatusCB) @@ -446,19 +477,12 @@ func (a *AlarmManager) Run(sdlcheck bool) { alarm.RICAlarmDefinitions = make(map[int]*alarm.AlarmDefinition) a.ReadAlarmDefinitionFromJson() - app.Resource.InjectRoute("/ric/v1/alarms", a.RaiseAlarm, "POST") - app.Resource.InjectRoute("/ric/v1/alarms", a.ClearAlarm, "DELETE") - app.Resource.InjectRoute("/ric/v1/alarms/active", a.GetActiveAlarms, "GET") - app.Resource.InjectRoute("/ric/v1/alarms/history", a.GetAlarmHistory, "GET") - app.Resource.InjectRoute("/ric/v1/alarms/config", a.SetAlarmConfig, "POST") - app.Resource.InjectRoute("/ric/v1/alarms/config", a.GetAlarmConfig, "GET") - app.Resource.InjectRoute("/ric/v1/alarms/define", a.SetAlarmDefinition, "POST") - app.Resource.InjectRoute("/ric/v1/alarms/define/{alarmId}", a.DeleteAlarmDefinition, "DELETE") - app.Resource.InjectRoute("/ric/v1/alarms/define", a.GetAlarmDefinition, "GET") - app.Resource.InjectRoute("/ric/v1/alarms/define/{alarmId}", a.GetAlarmDefinition, "GET") + a.InjectRoutes() // Start background timer for re-raising alerts go a.StartAlertTimer() + go a.StartTTLTimer(ttlInterval) + a.alarmClient, _ = alarm.InitAlarm("SEP", "ALARMMANAGER") a.ReadAlarmInfoFromPersistentVolume() @@ -475,6 +499,16 @@ func NewAlarmManager(amHost string, alertInterval int, clearAlarm bool) *AlarmMa amHost = viper.GetString("controls.promAlertManager.address") } + maxActiveAlarms := app.Config.GetInt("controls.maxActiveAlarms") + if maxActiveAlarms == 0 { + maxActiveAlarms = 5000 + } + + maxAlarmHistory := app.Config.GetInt("controls.maxAlarmHistory") + if maxAlarmHistory == 0 { + maxAlarmHistory = 20000 + } + return &AlarmManager{ rmrReady: false, postClear: clearAlarm, @@ -485,8 +519,8 @@ func NewAlarmManager(amHost string, alertInterval int, clearAlarm bool) *AlarmMa activeAlarms: make([]AlarmNotification, 0), alarmHistory: make([]AlarmNotification, 0), uniqueAlarmId: 0, - maxActiveAlarms: app.Config.GetInt("controls.maxActiveAlarms"), - maxAlarmHistory: app.Config.GetInt("controls.maxAlarmHistory"), + maxActiveAlarms: maxActiveAlarms, + maxAlarmHistory: maxAlarmHistory, exceededActiveAlarmOn: false, exceededAlarmHistoryOn: false, alarmInfoPvFile: app.Config.GetString("controls.alarmInfoPvFile"), @@ -495,5 +529,5 @@ func NewAlarmManager(amHost string, alertInterval int, clearAlarm bool) *AlarmMa // Main function func main() { - NewAlarmManager("", 0, true).Run(true) + NewAlarmManager("", 0, true).Run(true, 10) }