X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=manager%2Fcmd%2Fmanager.go;h=660d6372c9065daf751f21e80850a401f0403bdf;hb=bd09e69f279ab1566cd92a8d6d7b5ab58418b18f;hp=6ccf4ac39d36768254a2bed95f63770d10e309ca;hpb=ba2ef5b86bc352e6a9dd931ac27a9abe1386d87f;p=ric-plt%2Falarm-go.git

diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go
index 6ccf4ac..660d637 100755
--- a/manager/cmd/manager.go
+++ b/manager/cmd/manager.go
@@ -328,6 +328,7 @@ func (a *AlarmManager) GenerateAlertLabels(alarmId int, newAlarm alarm.Alarm, st
 		"alertname":   alarmDef.AlarmText,
 		"severity":    string(newAlarm.PerceivedSeverity),
 		"service":     fmt.Sprintf("%s/%s", newAlarm.ManagedObjectId, newAlarm.ApplicationId),
+		"info":        newAlarm.IdentifyingInfo,
 		"system_name": "RIC",
 	}
 	amAnnotations := models.LabelSet{
@@ -371,14 +372,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")
 
@@ -493,6 +500,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,
@@ -503,8 +520,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"),