Feature: add cron setting for the ldap settings #16673
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xlson
approved these changes
Apr 24, 2019
| @@ -393,6 +393,7 @@ headers = | |||
| enabled = false | |||
| config_file = /etc/grafana/ldap.toml | |||
| allow_sign_up = true | |||
| sync_cron = @hourly | |||
There was a problem hiding this comment.
I'd add a comment explaining that this is related to ldap sync in enterprise.
Something like: # LDAP backround sync (Enterprise)
There was a problem hiding this comment.
Oh, I definitely want to do that! Was thinking to add such comment with the rest of the documentation, but I can do it in this pull right away :)
There was a problem hiding this comment.
Great! You can merge this when you have added the comment.
* Move ldap configuration read to special function * Introduce cron setting (no docs for it yet, pending approval)
ryantxu
added a commit
to ryantxu/grafana
that referenced
this pull request
Apr 25, 2019
* grafana/master: GraphLegendEditor: use stats picker rather than switches (grafana#16759) Feature: add cron setting for the ldap settings (grafana#16673) Build: Disables gosec until identified performance problems (grafana#16764) Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761) elasticsearch: add 7.x version support (grafana#16646) Provisioning: Add API endpoint to reload provisioning configs (grafana#16579) Config: Show user-friendly error message instead of stack trace (grafana#16564) Chore: Lowered implicit anys limit to 5954 Feature: Enable React based options editors for Datasource plugins (grafana#16748) sqlstore: use column name in order by (grafana#16583) user friendly guide (grafana#16743) Provisioning: Interpolate env vars in provisioning files (grafana#16499) admin: add more stats about roles (grafana#16667) Feature: Migrate Legend components to grafana/ui (grafana#16468) playlist: fix loading dashboards by tag (grafana#16727) CloudWatch: Use default alias if there is no alias for metrics (grafana#16732) Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
ryantxu
added a commit
to ryantxu/grafana
that referenced
this pull request
Apr 25, 2019
…MetricPanelCtrl * grafana/master: (34 commits) Streaming: support streaming and a javascript test datasource (grafana#16729) GraphLegendEditor: use stats picker rather than switches (grafana#16759) Feature: add cron setting for the ldap settings (grafana#16673) Build: Disables gosec until identified performance problems (grafana#16764) Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761) elasticsearch: add 7.x version support (grafana#16646) Provisioning: Add API endpoint to reload provisioning configs (grafana#16579) Config: Show user-friendly error message instead of stack trace (grafana#16564) Chore: Lowered implicit anys limit to 5954 Feature: Enable React based options editors for Datasource plugins (grafana#16748) sqlstore: use column name in order by (grafana#16583) user friendly guide (grafana#16743) Provisioning: Interpolate env vars in provisioning files (grafana#16499) admin: add more stats about roles (grafana#16667) Feature: Migrate Legend components to grafana/ui (grafana#16468) playlist: fix loading dashboards by tag (grafana#16727) CloudWatch: Use default alias if there is no alias for metrics (grafana#16732) Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559) Refactor: Make SelectOptionItem a generic type to enable select value typing (grafana#16718) docs: fix upgrade instructions ...
ryantxu
added a commit
to ryantxu/grafana
that referenced
this pull request
Apr 25, 2019
* grafana/master: Streaming: support streaming and a javascript test datasource (grafana#16729) GraphLegendEditor: use stats picker rather than switches (grafana#16759) Feature: add cron setting for the ldap settings (grafana#16673) Build: Disables gosec until identified performance problems (grafana#16764) Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761) elasticsearch: add 7.x version support (grafana#16646) Provisioning: Add API endpoint to reload provisioning configs (grafana#16579) Config: Show user-friendly error message instead of stack trace (grafana#16564) Chore: Lowered implicit anys limit to 5954 Feature: Enable React based options editors for Datasource plugins (grafana#16748) sqlstore: use column name in order by (grafana#16583) user friendly guide (grafana#16743) Provisioning: Interpolate env vars in provisioning files (grafana#16499) admin: add more stats about roles (grafana#16667) Feature: Migrate Legend components to grafana/ui (grafana#16468) playlist: fix loading dashboards by tag (grafana#16727) CloudWatch: Use default alias if there is no alias for metrics (grafana#16732) Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559)
ryantxu
added a commit
to ryantxu/grafana
that referenced
this pull request
Apr 25, 2019
* grafana/master: (31 commits) Streaming: support streaming and a javascript test datasource (grafana#16729) GraphLegendEditor: use stats picker rather than switches (grafana#16759) Feature: add cron setting for the ldap settings (grafana#16673) Build: Disables gosec until identified performance problems (grafana#16764) Chore: bump jQuery to 3.4.0 including prototype pollution vulnerability fix (grafana#16761) elasticsearch: add 7.x version support (grafana#16646) Provisioning: Add API endpoint to reload provisioning configs (grafana#16579) Config: Show user-friendly error message instead of stack trace (grafana#16564) Chore: Lowered implicit anys limit to 5954 Feature: Enable React based options editors for Datasource plugins (grafana#16748) sqlstore: use column name in order by (grafana#16583) user friendly guide (grafana#16743) Provisioning: Interpolate env vars in provisioning files (grafana#16499) admin: add more stats about roles (grafana#16667) Feature: Migrate Legend components to grafana/ui (grafana#16468) playlist: fix loading dashboards by tag (grafana#16727) CloudWatch: Use default alias if there is no alias for metrics (grafana#16732) Provisioning: Support FolderUid in Dashboard Provisioning Config (grafana#16559) Refactor: Make SelectOptionItem a generic type to enable select value typing (grafana#16718) docs: fix upgrade instructions ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Move ldap configuration read to special function
Introduce cron setting (no docs for it yet, pending approval)