From 845f0d0737a9077db874820f5c59f33375524666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Sat, 16 Nov 2024 00:11:12 +0100 Subject: [PATCH 1/2] [grafana] Expose basicAuth property for ServiceMonitor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 2 +- charts/grafana/templates/servicemonitor.yaml | 4 ++++ charts/grafana/values.yaml | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 2e3260979a..1acd70e631 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.0 +version: 8.6.1 appVersion: 11.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/templates/servicemonitor.yaml b/charts/grafana/templates/servicemonitor.yaml index 0359013520..e3d1520be9 100644 --- a/charts/grafana/templates/servicemonitor.yaml +++ b/charts/grafana/templates/servicemonitor.yaml @@ -38,6 +38,10 @@ spec: metricRelabelings: {{- toYaml . | nindent 6 }} {{- end }} + {{- with .Values.serviceMonitor.basicAuth }} + basicAuth: + {{- toYaml . | nindent 6 }} + {{- end }} jobLabel: "{{ .Release.Name }}" selector: matchLabels: diff --git a/charts/grafana/values.yaml b/charts/grafana/values.yaml index 6467c4cc61..f668bb3829 100644 --- a/charts/grafana/values.yaml +++ b/charts/grafana/values.yaml @@ -260,6 +260,7 @@ serviceMonitor: scrapeTimeout: 30s relabelings: [] metricRelabelings: [] + basicAuth: {} targetLabels: [] extraExposePorts: [] From 4891180c6de5e78508874bb31ae89b3ef9bde5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Fri, 29 Nov 2024 16:25:08 +0100 Subject: [PATCH 2/2] Update charts/grafana/Chart.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jan-Otto Kröpke --- charts/grafana/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index f8ff539e08..c8e6e9d123 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 8.6.4 +version: 8.6.5 appVersion: 11.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics.