From f70c36c1fedc219144d250d7d206324a24116f0d Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 9 Sep 2021 03:18:03 -0400 Subject: [PATCH] OAuth: add docs for disableAutoLogin param (#38752) (#38893) * OAuth: add docs for disableAutoLogin param * Apply suggestions from code review Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> * OAuth: add availability note for disableAutoLogin * Update docs/sources/auth/overview.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> * Update docs/sources/auth/overview.md Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> Co-authored-by: Alexander Zobnin Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com> (cherry picked from commit 49f727806304960118901bb323ad9c362fe00e2a) Co-authored-by: Marcus Andersson --- docs/sources/auth/overview.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/sources/auth/overview.md b/docs/sources/auth/overview.md index ebe0fce8849..9a3ace0a34c 100644 --- a/docs/sources/auth/overview.md +++ b/docs/sources/auth/overview.md @@ -120,6 +120,11 @@ Defaults to `false`. oauth_auto_login = true ``` +### Avoid automatic OAuth login + +To sign in with a username and password and avoid automatic OAuth login, add the `disableAutoLogin` parameter to your login URL. +For example: `grafana.example.com/login?disableAutoLogin` or `grafana.example.com/login?disableAutoLogin=true` + ### Hide sign-out menu Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy.