IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docs: added version notice to new ldap feature docs (#17929)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-07-04 14:39:11 +02:00 committed by GitHub
parent 3a18098760
commit 57c220c93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/sample.ini
View File

@ -362,6 +362,11 @@
;config_file = /etc/grafana/ldap.toml ;config_file = /etc/grafana/ldap.toml
;allow_sign_up = true ;allow_sign_up = true
# LDAP backround sync (Enterprise only)
# At 1 am every day
;sync_cron = "0 0 1 * * *"
;active_sync_enabled = false
#################################### SMTP / Emailing ########################## #################################### SMTP / Emailing ##########################
[smtp] [smtp]
;enabled = false ;enabled = false

10
docs/sources/auth/enhanced_ldap.md
View File

@ -44,22 +44,24 @@ a user as member of a team and it will not be removed when the user signs in. Th
## Active LDAP Synchronization ## Active LDAP Synchronization
> Only available in Grafana Enterprise v6.3+
In the open source version of Grafana, user data from LDAP will be synchronized only during the login process when authenticating using LDAP. In the open source version of Grafana, user data from LDAP will be synchronized only during the login process when authenticating using LDAP.
With this feature you can configure Grafana to actively sync users with LDAP server(s) in the background. Role and team membership will be updated, removed users will be disabled and logged out. Only users that have logged into Grafana at least once will be synchronized.``` With this feature you can configure Grafana to actively sync users with LDAP server(s) in the background. Role and team membership will be updated, removed users will be disabled and logged out. Only users that have logged into Grafana at least once will be synchronized.
```bash ```bash
[auth.ldap] [auth.ldap]
... ...
# You can use the Cron syntax or several predefined schedulers - # You can use the Cron syntax or several predefined schedulers -
# @yearly (or @annually) | Run once a year, midnight, Jan. 1st | 0 0 0 1 1 * # @yearly (or @annually) | Run once a year, midnight, Jan. 1st | 0 0 0 1 1 *
# @monthly | Run once a month, midnight, first of month | 0 0 0 1 * * # @monthly | Run once a month, midnight, first of month | 0 0 0 1 * *
# @weekly | Run once a week, midnight between Sat/Sun | 0 0 0 * * 0 # @weekly | Run once a week, midnight between Sat/Sun | 0 0 0 * * 0
# @daily (or @midnight) | Run once a day, midnight | 0 0 0 * * * # @daily (or @midnight) | Run once a day, midnight | 0 0 0 * * *
# @hourly | Run once an hour, beginning of hour | 0 0 * * * * # @hourly | Run once an hour, beginning of hour | 0 0 * * * *
sync_cron = "@hourly" sync_cron = "@hourly"
# This cron expression format uses 6 space-separated fields (including seconds), for example # This cron expression format uses 6 space-separated fields (including seconds), for example
# sync_cron = "* */10 * * * *" # sync_cron = "* */10 * * * *"
# This will run the LDAP Synchronization every 10th minute, which is also the minimal interval between the grafana sync times i.e. you cannot set it for every 9th minute # This will run the LDAP Synchronization every 10th minute, which is also the minimal interval between the grafana sync times i.e. you cannot set it for every 9th minute
``` ```