From 0bcc3c01bc83bc26879a9b692d0db8698a4bbdef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 3 Feb 2023 12:58:44 +0100 Subject: [PATCH] Set OpenMetrics content header See: https://github.com/prometheus/common/blob/main/expfmt/encode.go#L86 See: https://github.com/kubernetes/kube-state-metrics/issues/1973 --- pkg/app/server.go | 2 +- pkg/metricshandler/metrics_handler.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/app/server.go b/pkg/app/server.go index 2af7e6d446..0f0254f422 100644 --- a/pkg/app/server.go +++ b/pkg/app/server.go @@ -376,7 +376,7 @@ func buildTelemetryServer(registry prometheus.Gatherer) *http.ServeMux { mux := http.NewServeMux() // Add metricsPath - mux.Handle(metricsPath, promhttp.HandlerFor(registry, promhttp.HandlerOpts{ErrorLog: promLogger{}})) + mux.Handle(metricsPath, promhttp.HandlerFor(registry, promhttp.HandlerOpts{ErrorLog: promLogger{}, EnableOpenMetrics: true})) // Add index mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { w.Write([]byte(` diff --git a/pkg/metricshandler/metrics_handler.go b/pkg/metricshandler/metrics_handler.go index a6a245dfe2..532a822ea7 100644 --- a/pkg/metricshandler/metrics_handler.go +++ b/pkg/metricshandler/metrics_handler.go @@ -183,7 +183,7 @@ func (m *MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { resHeader := w.Header() var writer io.Writer = w - resHeader.Set("Content-Type", `text/plain; version=`+"0.0.4") + resHeader.Set("Content-Type", `application/openmetrics-text; version=`+"0.0.1"+`; charset=utf-8`) if m.enableGZIPEncoding { // Gzip response if requested. Taken from