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.

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] don't break ldap if admin is disabled #1090

Merged
merged 1 commit into from
Mar 3, 2022

Conversation

naseemkullah
Copy link
Contributor

@naseemkullah naseemkullah commented Mar 2, 2022

closes #817

thanks @TomyLobo for flagging

The secret can be in charge of both, either or none of admin credentials and ldap config.

If either ldap config or admin credential provisioning is applicable the secret is created, the content of the secret will vary depending on if admin credentials and/or ldap config require existence there

if neither ldap nor admin user are needed, the secret is not created

closes grafana#817

thanks @TomyLobo for flagging

Signed-off-by: Naseem Ullah <24660299+naseemkullah@users.noreply.github.com>
@naseemkullah naseemkullah changed the title fix(grafana): don't break ldap if admin is disabled [grafana]: fix - don't break ldap if admin is disabled Mar 2, 2022
naseemkullah referenced this pull request Mar 2, 2022
Signed-off-by: naseemkullah <naseem@transit.app>
@naseemkullah naseemkullah changed the title [grafana]: fix - don't break ldap if admin is disabled [grafana] don't break ldap if admin is disabled Mar 2, 2022
@zanhsieh zanhsieh merged commit ee47364 into grafana:main Mar 3, 2022
@naseemkullah naseemkullah deleted the fix-ldap-secret-creation branch March 3, 2022 04:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GF_SECURITY_DISABLE_INITIAL_ADMIN_CREATION breaks LDAP authentication
2 participants