IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-21 16:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Feature: add cron setting for the ldap settings (#16673)

Browse Source 
* Feature: add cron setting for the ldap settings

* Move ldap configuration read to special function

* Introduce cron setting (no docs for it yet, pending approval)

* Chore: address code review comments
This commit is contained in:
Oleg Gaidarenko 2019-04-25 17:12:56 +03:00 committed by GitHub
parent 8ca5add4ec
commit 78cd9058a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/defaults.ini
View File

@ -363,6 +363,9 @@ enabled = false
config_file = /etc/grafana/ldap.toml
allow_sign_up = true
# LDAP backround sync (Enterprise only)
sync_cron = @hourly
#################################### SMTP / Emailing #####################
[smtp]
enabled = false

2
devenv/docker/blocks/openldap/notes.md
View File

@ -39,7 +39,5 @@ frontend
ldap-daniel
editors
ldap-editors
no groups
ldap-viewer

18
pkg/setting/setting.go
View File

@ -166,6 +166,7 @@ var (
// LDAP
LdapEnabled bool
LdapConfigFile string
LdapSyncCron string
LdapAllowSignup = true
// QUOTA
@ -877,14 +878,6 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
return err
}
ldapSec := iniFile.Section("auth.ldap")
LdapEnabled = ldapSec.Key("enabled").MustBool(false)
LdapConfigFile, err = valueAsString(ldapSec, "config_file", "")
if err != nil {
return err
}
LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
alerting := iniFile.Section("alerting")
AlertingEnabled = alerting.Key("enabled").MustBool(true)
ExecuteAlerts = alerting.Key("execute_alerts").MustBool(true)
@ -917,6 +910,7 @@ func (cfg *Cfg) Load(args *CommandLineArgs) error {
cfg.PluginsEnableAlpha = true
}
cfg.readLDAPConfig()
cfg.readSessionConfig()
cfg.readSmtpSettings()
cfg.readQuotaSettings()
@ -981,6 +975,14 @@ type RemoteCacheOptions struct {
ConnStr string
}
func (cfg *Cfg) readLDAPConfig() {
ldapSec := cfg.Raw.Section("auth.ldap")
LdapEnabled = ldapSec.Key("enabled").MustBool(false)
LdapConfigFile = ldapSec.Key("config_file").String()
LdapAllowSignup = ldapSec.Key("allow_sign_up").MustBool(true)
LdapSyncCron = ldapSec.Key("sync_cron").String()
}
func (cfg *Cfg) readSessionConfig() {
sec, _ := cfg.Raw.GetSection("session")