X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=manager%2Fcmd%2Fmanager.go;h=9a4218706f3f417770dc30700d4c50d092ed3155;hb=refs%2Fchanges%2F67%2F4767%2F5;hp=d74c62d894361c9615abaab491551f6c552bce02;hpb=121e8b6026904eb245c6f8ac805efa7c3dad3ae5;p=ric-plt%2Falarm-go.git

diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go
index d74c62d..9a42187 100755
--- a/manager/cmd/manager.go
+++ b/manager/cmd/manager.go
@@ -42,7 +42,7 @@ func (a *AlarmManager) StartAlertTimer() {
 		a.mutex.Lock()
 		for _, m := range a.activeAlarms {
 			app.Logger.Info("Re-raising alarm: %v", m)
-			a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive))
+			a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive, m.AlarmTime))
 		}
 		a.mutex.Unlock()
 	}
@@ -90,10 +90,11 @@ func (a *AlarmManager) ProcessAlarm(m *alarm.AlarmMessage) (*alert.PostAlertsOK,
 	// Clear alarm if found from active alarm list
 	if m.AlarmAction == alarm.AlarmActionClear {
 		if found {
+			a.alarmHistory = append(a.alarmHistory, *m)
 			a.activeAlarms = a.RemoveAlarm(a.activeAlarms, idx, "active")
 
 			if a.postClear {
-				return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusResolved))
+				return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusResolved, m.AlarmTime))
 			}
 		}
 		app.Logger.Info("No matching active alarm found, suppressing ...")
@@ -103,7 +104,7 @@ func (a *AlarmManager) ProcessAlarm(m *alarm.AlarmMessage) (*alert.PostAlertsOK,
 	// New alarm -> update active alarms and post to Alert Manager
 	if m.AlarmAction == alarm.AlarmActionRaise {
 		a.UpdateAlarmLists(m)
-		return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive))
+		return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive, m.AlarmTime))
 	}
 
 	return nil, nil
@@ -132,13 +133,22 @@ func (a *AlarmManager) UpdateAlarmLists(newAlarm *alarm.AlarmMessage) {
 	a.mutex.Lock()
 	defer a.mutex.Unlock()
 
-	// If maximum number of active alarms is reached, purge the oldest alarm
-	if len(a.activeAlarms) >= viper.GetInt("controls.maxActiveAlarms") {
-		a.activeAlarms = a.RemoveAlarm(a.activeAlarms, 0, "active")
+	/* If maximum number of active alarms is reached, an error log writing is made, and new alarm indicating the problem is raised.
+	   The attempt to raise the alarm next time will be supressed when found as duplicate. */
+	if len(a.activeAlarms) >= a.maxActiveAlarms {
+		app.Logger.Error("active alarm count exceeded maxActiveAlarms threshold")
+		actAlarm := a.alarmClient.NewAlarm(alarm.ACTIVE_ALARM_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "clear alarms or raise threshold", "active alarms full")
+		actAlarmMessage := alarm.AlarmMessage{Alarm: actAlarm, AlarmAction: alarm.AlarmActionRaise, AlarmTime: (time.Now().UnixNano())}
+		a.activeAlarms = append(a.activeAlarms, actAlarmMessage)
+		a.alarmHistory = append(a.alarmHistory, actAlarmMessage)
 	}
 
-	if len(a.alarmHistory) >= viper.GetInt("controls.maxAlarmHistory") {
-		a.alarmHistory = a.RemoveAlarm(a.alarmHistory, 0, "history")
+	if len(a.alarmHistory) >= a.maxAlarmHistory {
+		app.Logger.Error("alarm history count exceeded maxAlarmHistory threshold")
+		histAlarm := a.alarmClient.NewAlarm(alarm.ALARM_HISTORY_EXCEED_MAX_THRESHOLD, alarm.SeverityWarning, "clear alarms or raise threshold", "alarm history full")
+		histAlarmMessage := alarm.AlarmMessage{Alarm: histAlarm, AlarmAction: alarm.AlarmActionRaise, AlarmTime: (time.Now().UnixNano())}
+		a.activeAlarms = append(a.activeAlarms, histAlarmMessage)
+		a.alarmHistory = append(a.alarmHistory, histAlarmMessage)
 	}
 
 	// @todo: For now just keep the alarms (both active and history) in-memory. Use SDL later for persistence
@@ -146,7 +156,7 @@ func (a *AlarmManager) UpdateAlarmLists(newAlarm *alarm.AlarmMessage) {
 	a.alarmHistory = append(a.alarmHistory, *newAlarm)
 }
 
-func (a *AlarmManager) GenerateAlertLabels(newAlarm alarm.Alarm, status AlertStatus) (models.LabelSet, models.LabelSet) {
+func (a *AlarmManager) GenerateAlertLabels(newAlarm alarm.Alarm, status AlertStatus, alarmTime int64) (models.LabelSet, models.LabelSet) {
 	alarmDef := alarm.RICAlarmDefinitions[newAlarm.SpecificProblem]
 	amLabels := models.LabelSet{
 		"status":      string(status),
@@ -161,6 +171,7 @@ func (a *AlarmManager) GenerateAlertLabels(newAlarm alarm.Alarm, status AlertSta
 		"additional_info": newAlarm.AdditionalInfo,
 		"summary":         alarmDef.EventType,
 		"instructions":    alarmDef.OperationInstructions,
+		"timestamp":       fmt.Sprintf("%s", time.Unix(0, alarmTime).Format("02/01/2006, 15:04:05")),
 	}
 
 	return amLabels, amAnnotations
@@ -197,19 +208,34 @@ func (a *AlarmManager) StatusCB() bool {
 	return a.rmrReady
 }
 
+func (a *AlarmManager) ConfigChangeCB(configparam string) {
+
+	a.maxActiveAlarms = app.Config.GetInt("controls.maxActiveAlarms")
+	a.maxAlarmHistory = app.Config.GetInt("controls.maxAlarmHistory")
+
+	app.Logger.Debug("ConfigChangeCB: maxActiveAlarms %v", a.maxActiveAlarms)
+	app.Logger.Debug("ConfigChangeCB: maxAlarmHistory = %v", a.maxAlarmHistory)
+
+	return
+}
+
 func (a *AlarmManager) Run(sdlcheck bool) {
 	app.Logger.SetMdc("alarmManager", fmt.Sprintf("%s:%s", Version, Hash))
 	app.SetReadyCB(func(d interface{}) { a.rmrReady = true }, true)
 	app.Resource.InjectStatusCb(a.StatusCB)
+	app.AddConfigChangeListener(a.ConfigChangeCB)
 
 	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")
 
 	// Start background timer for re-raising alerts
 	a.postClear = sdlcheck
 	go a.StartAlertTimer()
+	a.alarmClient, _ = alarm.InitAlarm("SEP", "ALARMMANAGER")
 
 	app.RunWithParams(a, sdlcheck)
 }
@@ -224,13 +250,15 @@ func NewAlarmManager(amHost string, alertInterval int) *AlarmManager {
 	}
 
 	return &AlarmManager{
-		rmrReady:      false,
-		amHost:        amHost,
-		amBaseUrl:     viper.GetString("controls.promAlertManager.baseUrl"),
-		amSchemes:     []string{viper.GetString("controls.promAlertManager.schemes")},
-		alertInterval: alertInterval,
-		activeAlarms:  make([]alarm.AlarmMessage, 0),
-		alarmHistory:  make([]alarm.AlarmMessage, 0),
+		rmrReady:        false,
+		amHost:          amHost,
+		amBaseUrl:       viper.GetString("controls.promAlertManager.baseUrl"),
+		amSchemes:       []string{viper.GetString("controls.promAlertManager.schemes")},
+		alertInterval:   alertInterval,
+		activeAlarms:    make([]alarm.AlarmMessage, 0),
+		alarmHistory:    make([]alarm.AlarmMessage, 0),
+		maxActiveAlarms: app.Config.GetInt("controls.maxActiveAlarms"),
+		maxAlarmHistory: app.Config.GetInt("controls.maxAlarmHistory"),
 	}
 }