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

diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go
index 10f5115..6ccf4ac 100755
--- a/manager/cmd/manager.go
+++ b/manager/cmd/manager.go
@@ -81,7 +81,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, m.AlarmTime))
+			a.PostAlert(a.GenerateAlertLabels(m.AlarmId, m.Alarm, AlertStatusActive, m.AlarmTime))
 		}
 		a.mutex.Unlock()
 	}
@@ -185,7 +185,7 @@ func (a *AlarmManager) ProcessRaiseAlarm(m *AlarmNotification, alarmDef *alarm.A
 	if app.Config.GetBool("controls.noma.enabled") {
 		return a.PostAlarm(m)
 	}
-	return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusActive, m.AlarmTime))
+	return a.PostAlert(a.GenerateAlertLabels(m.AlarmId, m.Alarm, AlertStatusActive, m.AlarmTime))
 }
 
 func (a *AlarmManager) ProcessClearAlarm(m *AlarmNotification, alarmDef *alarm.AlarmDefinition, idx int) (*alert.PostAlertsOK, error) {
@@ -321,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),
@@ -331,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,