Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[grafana] Expose basicAuth property for ServiceMonitor #3432

Merged
merged 9 commits into from
Dec 16, 2024
Merged

[grafana] Expose basicAuth property for ServiceMonitor #3432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
845f0d0
[grafana] Expose basicAuth property for ServiceMonitor
jkroepke Nov 15, 2024
dcd090f
Merge branch 'main' into grafana/basic
zanhsieh Nov 17, 2024
498786b
Merge branch 'main' into grafana/basic
zanhsieh Nov 29, 2024
4891180
Update charts/grafana/Chart.yaml
jkroepke Nov 29, 2024
7e4d236
Merge branch 'main' into grafana/basic
jkroepke Nov 29, 2024
7fa0a8f
Merge branch 'main' into grafana/basic
zanhsieh Dec 9, 2024
06679f1
Merge branch 'main' into grafana/basic
zanhsieh Dec 15, 2024
252be45
Merge branch 'main' into grafana/basic
Sheikh-Abubaker Dec 16, 2024
983b8a5
Merge branch 'main' into grafana/basic
Sheikh-Abubaker Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/grafana/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: grafana
version: 8.8.1
version: 8.8.2
appVersion: 11.4.0
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
Expand Down
4 changes: 4 additions & 0 deletions charts/grafana/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ spec:
metricRelabelings:
{{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.serviceMonitor.basicAuth }}
basicAuth:
{{- toYaml . | nindent 6 }}
{{- end }}
jobLabel: "{{ .Release.Name }}"
selector:
matchLabels:
Expand Down
1 change: 1 addition & 0 deletions charts/grafana/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ serviceMonitor:
scrapeTimeout: 30s
relabelings: []
metricRelabelings: []
basicAuth: {}
targetLabels: []

extraExposePorts: []
Expand Down
Loading