X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Frestapi.go;h=54e18ea6d00d17400e31ecf67a83db86ae2433ba;hb=refs%2Fchanges%2F12%2F8912%2F1;hp=12101a8814cdf465549c327b49728d7c9ef3b479;hpb=8fd8b8d5fffb319b31eac745ff1d93c941bd9723;p=ric-plt%2Fxapp-frame.git diff --git a/pkg/xapp/restapi.go b/pkg/xapp/restapi.go index 12101a8..54e18ea 100755 --- a/pkg/xapp/restapi.go +++ b/pkg/xapp/restapi.go @@ -158,7 +158,7 @@ func (r *Router) CollectDefaultSymptomData(fileName string, data interface{}) st // // Collect metrics // - if metrics, err := r.GetLocalMetrics(GetPortData("http").Port); err == nil { + if metrics, err := r.GetLocalMetrics(); err == nil { if err := Util.WriteToFile(baseDir+"metrics.json", metrics); err != nil { Logger.Error("writeToFile failed for metrics.json: %v", err) } @@ -235,7 +235,7 @@ func (r *Router) SendSymptomDataError(w http.ResponseWriter, req *http.Request, http.Error(w, message, http.StatusInternalServerError) } -func (r *Router) GetLocalMetrics(port int) (string, error) { +func (r *Router) GetLocalMetrics() (string, error) { buf := &bytes.Buffer{} enc := expfmt.NewEncoder(buf, expfmt.FmtText) vals, err := prometheus.DefaultGatherer.Gather() @@ -251,6 +251,14 @@ func (r *Router) GetLocalMetrics(port int) (string, error) { return string(buf.Bytes()), nil } +//Resource.InjectRoute(url, metricsHandler, "GET") +//func metricsHandler(w http.ResponseWriter, r *http.Request) { +// w.Header().Set("Content-Type", "text/plain") +// w.WriteHeader(http.StatusOK) +// metrics, _ := Resource.GetLocalMetrics() +// w.Write([]byte(metrics)) +//} + func IsHealthProbeReady() bool { return healthReady }