Docs: Correcting abbreviations (#24748)
* Correction in abbreviation * Minor correction in abbreviation * Correcting abbreviation * Correction in abbreviation * Correcting abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Update stack_guide_graphite.md * Update whats-new-in-v4-6.md * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Update ldap.md * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Correction in abbreviation * Update docs/sources/guides/whats-new-in-v5.md Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Co-authored-by: Diana Payton <52059945+oddlittlebird@users.noreply.github.com>
This commit is contained in:
@@ -12,7 +12,7 @@ weight = 3
|
||||
|
||||
# Generic OAuth Authentication
|
||||
|
||||
You can configure many different oauth2 authentication services with Grafana using the generic oauth2 feature. Below you
|
||||
You can configure many different OAuth2 authentication services with Grafana using the generic OAuth2 feature. Below you
|
||||
can find examples using Okta, BitBucket, OneLogin and Azure.
|
||||
|
||||
This callback URL must match the full HTTP address that you use in your browser to access Grafana, but with the prefix path of `/login/generic_oauth`.
|
||||
|
||||
@@ -37,8 +37,8 @@ enabled = true
|
||||
# Path to the LDAP specific configuration file (default: `/etc/grafana/ldap.toml`)
|
||||
config_file = /etc/grafana/ldap.toml
|
||||
|
||||
# Allow sign up should almost always be true (default) to allow new Grafana users to be created (if ldap authentication is ok). If set to
|
||||
# false only pre-existing Grafana users will be able to login (if ldap authentication is ok).
|
||||
# Allow sign up should almost always be true (default) to allow new Grafana users to be created (if LDAP authentication is ok). If set to
|
||||
# false only pre-existing Grafana users will be able to login (if LDAP authentication is ok).
|
||||
allow_sign_up = true
|
||||
```
|
||||
|
||||
@@ -54,11 +54,11 @@ See [configuration examples](#configuration-examples) for more information.
|
||||
host = "127.0.0.1"
|
||||
# Default port is 389 or 636 if use_ssl = true
|
||||
port = 389
|
||||
# Set to true if ldap server supports TLS
|
||||
# Set to true if LDAP server supports TLS
|
||||
use_ssl = false
|
||||
# Set to true if connect ldap server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
|
||||
# Set to true if connect LDAP server with STARTTLS pattern (create connection in insecure, then upgrade to secure connection with TLS)
|
||||
start_tls = false
|
||||
# set to true if you want to skip ssl cert validation
|
||||
# set to true if you want to skip SSL cert validation
|
||||
ssl_skip_verify = false
|
||||
# set to the path to your root CA certificate or leave unset to use system defaults
|
||||
# root_ca_cert = "/path/to/certificate.crt"
|
||||
@@ -83,7 +83,7 @@ search_base_dns = ["dc=grafana,dc=org"]
|
||||
# group_search_filter_user_attribute = "distinguishedName"
|
||||
# group_search_base_dns = ["ou=groups,dc=grafana,dc=org"]
|
||||
|
||||
# Specify names of the ldap attributes your ldap uses
|
||||
# Specify names of the LDAP attributes your LDAP uses
|
||||
[servers.attributes]
|
||||
name = "givenName"
|
||||
surname = "sn"
|
||||
@@ -144,7 +144,7 @@ In this case you skip providing a `bind_password` and instead provide a `bind_dn
|
||||
The search filter and search bases settings are still needed to perform the LDAP search to retrieve the other LDAP information (like LDAP groups and email).
|
||||
|
||||
### POSIX schema
|
||||
If your ldap server does not support the memberOf attribute add these options:
|
||||
If your LDAP server does not support the memberOf attribute add these options:
|
||||
|
||||
```bash
|
||||
## Group search filter, to retrieve the groups of which the user is a member (only set if memberOf attribute is not available)
|
||||
@@ -355,7 +355,7 @@ Please inspect your Active Directory configuration and documentation to find the
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
To troubleshoot and get more log info enable ldap debug logging in the [main config file]({{< relref "../installation/configuration.md" >}}).
|
||||
To troubleshoot and get more log info enable LDAP debug logging in the [main config file]({{< relref "../installation/configuration.md" >}}).
|
||||
|
||||
```bash
|
||||
[log]
|
||||
|
||||
@@ -68,7 +68,7 @@ login_maximum_lifetime_days = 30
|
||||
# How often should auth tokens be rotated for authenticated users when being active. The default is each 10 minutes.
|
||||
token_rotation_interval_minutes = 10
|
||||
|
||||
# The maximum lifetime (seconds) an api key can be used. If it is set all the api keys should have limited lifetime that is lower than this value.
|
||||
# The maximum lifetime (seconds) an API key can be used. If it is set all the API keys should have limited lifetime that is lower than this value.
|
||||
api_key_max_seconds_to_live = -1
|
||||
```
|
||||
|
||||
@@ -134,7 +134,7 @@ disable_signout_menu = true
|
||||
|
||||
### URL redirect after signing out
|
||||
|
||||
URL to redirect the user to after signing out from Grafana. This can for example be used to enable signout from oauth provider.
|
||||
URL to redirect the user to after signing out from Grafana. This can for example be used to enable signout from OAuth provider.
|
||||
|
||||
```bash
|
||||
[auth]
|
||||
|
||||
Reference in New Issue
Block a user