From 09a88ab50ea1e83ccde6d90c73e91e3441d98915 Mon Sep 17 00:00:00 2001 From: Martin Hoefling Date: Wed, 20 Mar 2019 20:57:42 +0100 Subject: [PATCH] Metrics are incorrectly prefixed with ingress path (#12316) Grafana always exposes metrics at /metrics and thus are not scraped if an ingress path is provided. http://docs.grafana.org/installation/configuration/#metrics Signed-off-by: Martin Hoefling --- stable/prometheus-operator/Chart.yaml | 2 +- .../prometheus-operator/templates/grafana/servicemonitor.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index a46902263f..117d5fec5a 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -9,7 +9,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 5.0.0 +version: 5.0.1 appVersion: 0.29.0 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/templates/grafana/servicemonitor.yaml b/stable/prometheus-operator/templates/grafana/servicemonitor.yaml index b2f9150b39..c2d2228f15 100644 --- a/stable/prometheus-operator/templates/grafana/servicemonitor.yaml +++ b/stable/prometheus-operator/templates/grafana/servicemonitor.yaml @@ -19,5 +19,5 @@ spec: {{- if .Values.grafana.serviceMonitor.interval }} interval: {{ .Values.grafana.serviceMonitor.interval }} {{- end }} - path: "{{ trimSuffix "/" .Values.grafana.ingress.path }}/metrics" + path: "/metrics" {{- end }}