[kube-prometheus-stack] Allow modifying ServiceMonitor path (promethe…

…us-community#364) Signed-off-by: Marc Troelitzsch <Marc.Troelitzsch@gmail.com>
christopherleech · Nov 15, 2020 · 3dd4c80 · 3dd4c80
1 parent c5d2e34
commit 3dd4c80
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/charts/kube-prometheus-stack/Chart.yaml b/charts/kube-prometheus-stack/Chart.yaml
@@ -17,7 +17,7 @@ name: kube-prometheus-stack
 sources:
   - https://github.com/prometheus-community/helm-charts
   - https://github.com/prometheus-operator/kube-prometheus
-version: 11.1.2
+version: 11.1.3
 appVersion: 0.43.2
 tillerVersion: ">=2.12.0"
 kubeVersion: ">=1.16.0-0"

diff --git a/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml b/charts/kube-prometheus-stack/templates/grafana/servicemonitor.yaml
@@ -20,7 +20,7 @@ spec:
     {{- if .Values.grafana.serviceMonitor.interval }}
     interval: {{ .Values.grafana.serviceMonitor.interval }}
     {{- end }}
-    path: "/metrics"
+    path: {{ .Values.grafana.serviceMonitor.path | quote }}
 {{- if .Values.grafana.serviceMonitor.metricRelabelings }}
     metricRelabelings:
 {{ tpl (toYaml .Values.grafana.serviceMonitor.metricRelabelings | indent 6) . }}

diff --git a/charts/kube-prometheus-stack/values.yaml b/charts/kube-prometheus-stack/values.yaml
@@ -655,6 +655,10 @@ grafana:
     interval: ""
     selfMonitor: true
 
+    # Path to use for scraping metrics. Might be different if server.root_url is set
+    # in grafana.ini
+    path: "/metrics"
+
     ## 	metric relabel configs to apply to samples before ingestion.
     ##
     metricRelabelings: []