From 53f0928321a54e69f2f06b2cf03be33f1b155eb4 Mon Sep 17 00:00:00 2001 From: Eric Leijonmarck Date: Fri, 7 Oct 2022 17:04:37 +0100 Subject: [PATCH] Docs: Add variable expansion recommendation (#56368) * docs: add variable expansion recommendation * docs: updated the ldap docs in configure grafana --- conf/ldap.toml | 2 ++ .../configure-security/configure-authentication/ldap.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/conf/ldap.toml b/conf/ldap.toml index 49b95536b36..f8f4beee3d2 100644 --- a/conf/ldap.toml +++ b/conf/ldap.toml @@ -24,6 +24,8 @@ bind_dn = "cn=admin,dc=grafana,dc=org" # Search user bind password # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" bind_password = 'grafana' +# We recommend using variable expansion for the bind_password, for more info https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion +# bind_password = '$__env{LDAP_BIND_PASSWORD}' # Timeout in seconds (applies to each host specified in the 'host' entry (space separated)) timeout = 10 diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md index f097746d744..bd02d095d32 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md @@ -71,6 +71,8 @@ bind_dn = "cn=admin,dc=grafana,dc=org" # Search user bind password # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;""" bind_password = "grafana" +# We recommend using variable expansion for the bind_password, for more info https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#variable-expansion +# bind_password = '$__env{LDAP_BIND_PASSWORD}' # Timeout in seconds. Applies to each host specified in the 'host' entry (space separated). timeout = 10