From 07991c76fedf98d70134443feeb7af6b27e61669 Mon Sep 17 00:00:00 2001 From: Jo Date: Mon, 31 Oct 2022 15:13:27 +0000 Subject: [PATCH] Doc: Fix wrong default callback URL (#57908) * doc: fix wrong default callback URL * doc: fix gitlab typos --- .../configure-authentication/github/index.md | 4 +++- .../configure-authentication/gitlab/index.md | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md index 01f983bbaa5..f82fb1a08c4 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/github/index.md @@ -23,9 +23,11 @@ settings page). When you create the application you will need to specify a callback URL. Specify this as callback: ```bash -http://:/grafana/login/github +http://:/login/github ``` +> Note: 's value should match your grafana server's `root_url`, the URL used to access grafana. + This callback URL must match the full HTTP address that you use in your browser to access Grafana, but with the suffix path of `/login/github`. When the GitHub OAuth application is created you will get a Client ID and a diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md index cbbc5e78d3c..78a4049b498 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab/index.md @@ -33,10 +33,10 @@ instance, if you access Grafana at `http://203.0.113.31:3000`, you should use http://203.0.113.31:3000/login/gitlab ``` -Finally, select _read_api_as the_Scope_and submit the form. Note that if you're +Finally, select `read_api` as the scope and submit the form. Note that if you're not going to use GitLab groups for authorization (i.e. not setting -`allowed_groups`, see below), you can select_read_user_ instead of _read_api_as -the_Scope_, thus giving a more restricted access to your GitLab API. +`allowed_groups`, see below), you can select `read_user` instead of `read_api` as +the scope, thus giving a more restricted access to your GitLab API. You'll get an _Application Id_ and a _Secret_ in return; we'll call them `GITLAB_APPLICATION_ID` and `GITLAB_SECRET` respectively for the rest of this