apps: Grafana- add config option for using external dex with user grafana #2406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pavan-Gunda
approved these changes
Jan 22, 2025
| auth_url: https://{{ .Values.grafana.user.oidc.externalDexDomain }}{{ $trailingDot }}/auth | ||
| token_url: https://{{ .Values.grafana.user.oidc.externalDexDomain }}{{ $trailingDot }}/token | ||
| api_url: https://{{ .Values.grafana.user.oidc.externalDexDomain }}{{ $trailingDot }}/api | ||
| {{- end }} |
There was a problem hiding this comment.
Should you add these settings to the grafana-ops.yaml.gotmpl aswell?
As otherwise i'm wondering why the keys aren't just added to the grafana.user section as they do nothing for the ops grafana version currently.
Zash
requested changes
Jan 23, 2025
Comment on lines
+150
to
+151
| useInternalDex: true | ||
| externalDexDomain: set-me |
There was a problem hiding this comment.
You can get a starting point for schema by:
yq4 -i '.properties.grafana.properties.ops.properties.oidc.properties.useInternalDex.type="boolean"' config/schemas/config.yaml
yq4 -i '.properties.grafana.properties.ops.properties.oidc.properties.externalDexDomain.type="string"' config/schemas/config.yaml| @@ -112,9 +112,15 @@ grafana.ini: | |||
| client_secret: $__env{clientSecret} | |||
| use_pkce: true | |||
| scopes: {{ .Values.grafana.user.oidc.scopes }} | |||
| {{- if .Values.grafana.user.oidc.useInternalDex }} | |||
There was a problem hiding this comment.
Might be simpler if this was conditional on externalDexDomain being set instead of having two settings?
|
What is the reason for pointing Grafana at a custom dex instead of pointing Dex at another OIDC instance? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Warning
This is a public repository, ensure not to disclose:
What kind of PR is this?
Required: Mark one of the following that is applicable:
Optional: Mark one or more of the following that are applicable:
Important
Breaking changes should be marked
kind/admin-changeorkind/dev-changedepending on typeCritical security fixes should be marked with
kind/securityWhat does this PR do / why do we need this PR?
In this PR we add a config option in user grafana to use external dex
Information to reviewers
Checklist