X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=adapter%2Fcmd%2Fadapter.go;h=76112f9634811fc02e37acb97409997fb706b1d1;hb=643241f00535c43a6e5fc3563a39f3e1c90db0e2;hp=0b2ddcec4f7439e8ac937aeedce36b0cac6ce869;hpb=3e8e2aae7fd5b5e89b5b5ada8483d5953cd7d3d7;p=ric-plt%2Falarm-go.git diff --git a/adapter/cmd/adapter.go b/adapter/cmd/adapter.go index 0b2ddce..76112f9 100755 --- a/adapter/cmd/adapter.go +++ b/adapter/cmd/adapter.go @@ -201,11 +201,11 @@ func (a *AlarmAdapter) GenerateAlertLabels(newAlarm alarm.Alarm, status AlertSta "alertname": alarmDef.AlarmText, "severity": string(newAlarm.PerceivedSeverity), "service": fmt.Sprintf("%s:%s", newAlarm.ManagedObjectId, newAlarm.ApplicationId), - "system_name": "RIC", + "system_name": fmt.Sprintf("RIC:%s:%s", newAlarm.ManagedObjectId, newAlarm.ApplicationId), } amAnnotations := models.LabelSet{ - "alarm_id": string(alarmDef.AlarmId), - "description": newAlarm.IdentifyingInfo, + "alarm_id": fmt.Sprintf("%d", alarmDef.AlarmId), + "description": fmt.Sprintf("%d:%s:%s", newAlarm.SpecificProblem, newAlarm.IdentifyingInfo, newAlarm.AdditionalInfo), "additional_info": newAlarm.AdditionalInfo, "summary": alarmDef.EventType, "instructions": alarmDef.OperationInstructions, @@ -229,7 +229,7 @@ func (a *AlarmAdapter) PostAlert(amLabels, amAnnotations models.LabelSet) (*aler } alertParams := alert.NewPostAlertsParams().WithAlerts(models.PostableAlerts{pa}) - app.Logger.Info("Posting alerts: labels: %v, annotations: %v", amLabels, amAnnotations) + app.Logger.Info("Posting alerts: labels: %+v, annotations: %+v", amLabels, amAnnotations) ok, err := a.NewAlertmanagerClient().Alert.PostAlerts(alertParams) if err != nil { app.Logger.Error("Posting alerts to '%s/%s' failed with error: %v", a.amHost, a.amBaseUrl, err)