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

Jump to bottom

[grafana] tpl for host in grafana.ini #3127

Merged
merged 9 commits into from
Aug 10, 2024
Merged

[grafana] tpl for host in grafana.ini #3127

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
52d8f90
Patch https://github.com/grafana/helm-charts/issues/2343
nanori May 11, 2024
4454bbd
Update Chart.yaml
zanhsieh May 12, 2024
d3d6f13
Merge branch 'main' into main
zanhsieh Jul 30, 2024
6b2e33a
Update Chart.yaml
zanhsieh Jul 30, 2024
7157756
Merge branch 'main' into main
zanhsieh Jul 31, 2024
ef1dc28
Merge branch 'main' into main
zanhsieh Aug 10, 2024
0962967
Create with-nondefault-values.yaml
zanhsieh Aug 10, 2024
2ceb9e3
Update Chart.yaml
zanhsieh Aug 10, 2024
450d4c9
Update with-nondefault-values.yaml
zanhsieh Aug 10, 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.4.3
version: 8.4.4
appVersion: 11.1.3
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
Expand Down
6 changes: 6 additions & 0 deletions charts/grafana/ci/with-nondefault-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
global:
environment: prod
ingress:
enabled: true
hosts:
- monitoring-{{ .Values.global.environment }}.example.com
2 changes: 1 addition & 1 deletion charts/grafana/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ grafana.ini:
grafana_net:
url: https://grafana.net
server:
domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ .Values.ingress.hosts | first }}{{ else }}''{{ end }}"
domain: "{{ if (and .Values.ingress.enabled .Values.ingress.hosts) }}{{ tpl (.Values.ingress.hosts | first) . }}{{ else }}''{{ end }}"
## grafana Authentication can be enabled with the following values on grafana.ini
# server:
# The full public facing url you use in browser, used for redirects and emails
Expand Down
Loading