forked from grafana/grafana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'grafana/master'
* grafana/master: new dashboard is now hidden from viewer, fixes grafana#10815 (grafana#10854) fixed bg gradient, fixes grafana#10869 (grafana#10875) login: fix broken reset password form (grafana#10881) docs: spelling. dashboard: always make sure dashboard exist in dashboard acl http api (grafana#10856) Fix grafana#10823 (grafana#10851) provisioning: better variable naming provisioning: dont return error unless you want to cancel all operations provisioning: createWalkFn doesnt have to be attached to the filereader anymore provisioning: update sample config to use path provisioning: avoid caching and use updated field from db provisioning: delete dashboards before insert/update provisioning: fixed bug in saving dashboards. provisioning: delete dashboards from db when file is missing provisioning: enables title changes for dashboards dashboards: save provisioning meta data provisioing: add lookup table provisioned dashboards codestyle: extract code into methods
- Loading branch information
Showing
26 changed files
with
572 additions
and
264 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,4 +3,4 @@ | |
# folder: '' | ||
# type: file | ||
# options: | ||
# folder: /var/lib/grafana/dashboards | ||
# path: /var/lib/grafana/dashboards |
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
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
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
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
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
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
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
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.