From a3bd5d52ff30f24e4190b2f517b37006b7e7778a Mon Sep 17 00:00:00 2001 From: Catherine Fang Date: Mon, 13 Mar 2023 11:13:01 -0400 Subject: [PATCH 1/2] Only use OpenMetrics and Text in contentType --- pkg/metricshandler/metrics_handler.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/metricshandler/metrics_handler.go b/pkg/metricshandler/metrics_handler.go index 4ebb9e441f..ed31c68bc9 100644 --- a/pkg/metricshandler/metrics_handler.go +++ b/pkg/metricshandler/metrics_handler.go @@ -187,6 +187,9 @@ func (m *MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { contentType := expfmt.NegotiateIncludingOpenMetrics(r.Header) + if contentType != expfmt.FmtOpenMetrics { + contentType = expfmt.FmtText + } resHeader.Set("Content-Type", string(contentType)) if m.enableGZIPEncoding { From d46edde08bbf78999fac764a8a9772c57f7dfa98 Mon Sep 17 00:00:00 2001 From: CatherineF-dev Date: Tue, 14 Mar 2023 10:02:22 -0400 Subject: [PATCH 2/2] Update pkg/metricshandler/metrics_handler.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Manuel Rüger --- pkg/metricshandler/metrics_handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/metricshandler/metrics_handler.go b/pkg/metricshandler/metrics_handler.go index ed31c68bc9..a215fee6a3 100644 --- a/pkg/metricshandler/metrics_handler.go +++ b/pkg/metricshandler/metrics_handler.go @@ -187,6 +187,7 @@ func (m *MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { contentType := expfmt.NegotiateIncludingOpenMetrics(r.Header) + // We do not support protobuf at the moment. Fall back to FmtText if the negotiated exposition format is not FmtOpenMetrics See: https://github.com/kubernetes/kube-state-metrics/issues/2022 if contentType != expfmt.FmtOpenMetrics { contentType = expfmt.FmtText }