X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=manager%2Fcmd%2Frestapi.go;fp=manager%2Fcmd%2Frestapi.go;h=5a43a4f7cff4f31c050ddf81210cb6237cc84df4;hb=48ac36cab441829933d43b25597e7b5d68b2307b;hp=31c9f8e59569b223cd55ed2b8c17c36609ba1edd;hpb=d35b837fc26b400ed736182b160462d021124ba5;p=ric-plt%2Falarm-go.git diff --git a/manager/cmd/restapi.go b/manager/cmd/restapi.go index 31c9f8e..5a43a4f 100755 --- a/manager/cmd/restapi.go +++ b/manager/cmd/restapi.go @@ -252,25 +252,34 @@ func (a *AlarmManager) SymptomDataHandler(w http.ResponseWriter, r *http.Request return } - if b, err := json.Marshal(a.activeAlarms); err == nil { + if b, err := json.MarshalIndent(a.activeAlarms, "", " "); err == nil { if err := app.Util.WriteToFile(baseDir+"active_alarms.json", string(b)); err != nil { app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error()) return } } - if b, err := json.Marshal(a.alarmHistory); err == nil { + if b, err := json.MarshalIndent(a.alarmHistory, "", " "); err == nil { if err := app.Util.WriteToFile(baseDir+"alarm_history.json", string(b)); err != nil { app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error()) return } } + if alerts, err := a.GetAlerts(); err == nil { + if b, err := json.MarshalIndent(alerts, "", " "); err == nil { + if err := app.Util.WriteToFile(baseDir+"alerts.json", string(b)); err != nil { + app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error()) + return + } + } + } + var ac alarm.AlarmConfigParams ac.MaxActiveAlarms = a.maxActiveAlarms ac.MaxAlarmHistory = a.maxAlarmHistory - if b, err := json.Marshal(ac); err == nil { + if b, err := json.MarshalIndent(ac, "", " "); err == nil { if err := app.Util.WriteToFile(baseDir+"alarm_config.json", string(b)); err != nil { app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error()) return @@ -281,7 +290,7 @@ func (a *AlarmManager) SymptomDataHandler(w http.ResponseWriter, r *http.Request for _, alarmDefinition := range alarm.RICAlarmDefinitions { ad.AlarmDefinitions = append(ad.AlarmDefinitions, alarmDefinition) } - if b, err := json.Marshal(ad); err == nil { + if b, err := json.MarshalIndent(ad, "", " "); err == nil { if err := app.Util.WriteToFile(baseDir+"alarm_defs.json", string(b)); err != nil { app.Resource.SendSymptomDataError(w, r, "writeToFile failed: "+err.Error()) return