From 1bce7bb76e2b727dbf08bcde3b1308e78877f770 Mon Sep 17 00:00:00 2001 From: "grafana-delivery-bot[bot]" <132647405+grafana-delivery-bot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 15:29:49 +0200 Subject: [PATCH] [v10.0.x] Docs: reorder auth provider pages (#71751) Docs: reorder auth provider pages (#70764) * order auth provider pages * add shorter menu titles * linting * update reference * rename Grafana auth section to basic auth (cherry picked from commit fc290281cbf3acb7e9b57b3f7132f0f510de4354) Co-authored-by: Ieva --- .../configure-authentication/auth-proxy/index.md | 3 ++- .../configure-authentication/azuread/index.md | 3 ++- .../configure-authentication/enhanced-ldap/index.md | 3 ++- .../configure-authentication/generic-oauth/index.md | 9 +++++---- .../configure-authentication/github/index.md | 3 ++- .../configure-authentication/gitlab/index.md | 3 ++- .../configure-authentication/google/index.md | 3 ++- .../configure-authentication/grafana-com/index.md | 3 ++- .../configure-authentication/grafana/index.md | 3 ++- .../configure-authentication/jwt/index.md | 3 ++- .../configure-authentication/keycloak/index.md | 3 ++- .../configure-authentication/ldap/index.md | 3 ++- .../configure-authentication/okta/index.md | 3 ++- .../configure-authentication/saml-ui/index.md | 4 ++-- .../configure-authentication/saml/index.md | 4 ++-- 15 files changed, 33 insertions(+), 20 deletions(-) diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md index c0bab7baae7..5f5c54cb58e 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy/index.md @@ -9,7 +9,8 @@ keywords: - documentation - proxy title: Configure auth proxy authentication -weight: 1300 +menuTitle: Auth proxy +weight: 1500 --- # Configure auth proxy authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md index 574f789b5ae..7429a408953 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread/index.md @@ -8,7 +8,8 @@ keywords: - documentation - oauth title: Configure Azure AD OAuth2 authentication -weight: 600 +menuTitle: Azure AD OAuth2 +weight: 800 --- # Configure Azure AD OAuth2 authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md index 8d85a1a905a..6344f7c771e 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md @@ -11,7 +11,8 @@ keywords: - active directory - enterprise title: Configure enhanced LDAP integration -weight: 900 +menuTitle: Enhanced LDAP +weight: 400 --- # Configure enhanced LDAP integration diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md index b0b8d38794a..96cd0a14dc9 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth/index.md @@ -7,15 +7,16 @@ keywords: - configuration - documentation - oauth -title: Configure generic OAuth authentication -weight: 200 +title: Configure generic OAuth2 authentication +menuTitle: Generic OAuth2 +weight: 700 --- -# Configure generic OAuth authentication +# Configure generic OAuth2 authentication You can configure many different OAuth2 authentication services with Grafana using the generic OAuth2 feature. Examples: -- [Configure generic OAuth authentication](#configure-generic-oauth-authentication) +- [Configure generic OAuth authentication](#configure-generic-oauth2-authentication) - [Email address](#email-address) - [Groups / Teams](#groups--teams) - [Login](#login) 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 2c1fb35e850..281d21236a2 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 @@ -8,7 +8,8 @@ keywords: - documentation - oauth title: Configure GitHub OAuth2 authentication -weight: 1400 +menuTitle: GitHub OAuth2 +weight: 900 --- # Configure GitHub OAuth2 authentication 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 e754cc1620e..aa58328e9ed 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 @@ -8,7 +8,8 @@ keywords: - documentation - oauth title: Configure GitLab OAuth2 authentication -weight: 700 +menuTitle: GitLab OAuth2 +weight: 1000 --- # Configure GitLab OAuth2 authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md index 722408a3158..a48b4efa215 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/google/index.md @@ -3,7 +3,8 @@ aliases: - ../../../auth/google/ description: Grafana OAuthentication Guide title: Configure Google OAuth2 authentication -weight: 300 +menuTitle: Google OAuth2 +weight: 1100 --- # Configure Google OAuth2 authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md index 14ea56f4ca9..50e3ca8bcf4 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana-com/index.md @@ -3,7 +3,8 @@ aliases: - ../../../auth/grafana-com/ description: Grafana Com Authentication title: Configure Grafana Com authentication -weight: 500 +menuTitle: Grafana Com OAuth2 +weight: 1200 --- # Configure Grafana Com authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md index c0349cda518..267b6ba78e1 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana/index.md @@ -3,7 +3,8 @@ aliases: - ../../../auth/grafana/ description: Grafana OAuthentication Guide title: Configure Grafana authentication -weight: 1000 +menuTitle: Basic auth +weight: 200 --- ## Configure Grafana authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md index ffd57967842..ede646bd428 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/jwt/index.md @@ -3,7 +3,8 @@ aliases: - ../../../auth/jwt/ description: Grafana JWT Authentication title: Configure JWT authentication -weight: 500 +menuTitle: JWT +weight: 1600 --- # Configure JWT authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md index 9806c688ef8..f4b28be9b5f 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/keycloak/index.md @@ -9,7 +9,8 @@ keywords: - documentation - oauth title: Configure Keycloak OAuth2 authentication -weight: 200 +menuTitle: Keycloak OAuth2 +weight: 1300 --- # Configure Keycloak OAuth2 authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md index 9d10395975f..86816877a35 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap/index.md @@ -4,7 +4,8 @@ aliases: - ../../../installation/ldap/ description: Grafana LDAP Authentication Guide title: Configure LDAP authentication -weight: 800 +menuTitle: LDAP +weight: 300 --- # Configure LDAP authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md index 1e48e276342..5dbf9ee9561 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/okta/index.md @@ -3,7 +3,8 @@ aliases: - ../../../auth/okta/ description: Grafana Okta OAuth Guide title: Configure Okta OAuth2 authentication -weight: 1200 +menuTitle: Okta OAuth2 +weight: 1400 --- # Configure Okta OAuth2 authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md index 1ecc67511f5..0a377d95c39 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml-ui/index.md @@ -1,8 +1,8 @@ --- description: Learn how to configure SAML authentication in Grafana's UI. -menuTitle: Configure SAML using the UI +menuTitle: SAML user interface title: Configure SAML authentication using the Grafana user interface -weight: 1150 +weight: 600 --- # Configure SAML authentication using the Grafana user interface diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md index af22f753501..40ecfe09265 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md @@ -9,13 +9,13 @@ aliases: - ../../../enterprise/saml/set-up-saml-with-okta/ - ../../../enterprise/saml/troubleshoot-saml/ description: Learn how to configure SAML authentication in Grafana's configuration file. -menuTitle: Configure SAML using the configuration file +menuTitle: SAML labels: products: - cloud - enterprise title: Configure SAML authentication using the configuration file -weight: 1100 +weight: 500 --- # Configure SAML authentication using the configuration file