bergquist
b010e4df93
provisioning: support camelcase for dashboards configs
2018-02-14 10:30:08 +01:00
bergquist
4a35244cb9
provisioning: support camcelCase provisioning files
2018-02-14 10:30:08 +01:00
Torkel Ödegaard
162439a8d6
fix: removed logging
2018-02-13 17:03:20 +01:00
Torkel Ödegaard
e3c3f3ce4c
fix: sql search permissions filter fix
2018-02-13 16:49:00 +01:00
Leonard Gram
ba0285a3ec
provisioning: Warns the user when uid or title is re-used. ( #10892 )
...
* provisioning: Warns the user when uid or title is re-used.
Closes #10880
2018-02-13 15:47:02 +01:00
Marcus Efraimsson
cb8c82f7f6
Merge branch 'master' into 10630_folder_api
2018-02-12 15:14:41 +01:00
Marcus Efraimsson
2b31465254
Merge branch 'master' into docs_v5.0
2018-02-12 14:29:22 +01:00
Leonard Gram
9a7eb5c327
Merge branch 'master' into provisioning
2018-02-12 14:19:20 +01:00
bergquist
f01890c3ff
provisioning: better variable naming
2018-02-12 08:22:34 +01:00
Marcus Efraimsson
e1e0b5f951
teams: use orgId in all team and team member operations ( #10862 )
...
Also fixes issue in org users tests for postgres
2018-02-09 17:26:15 +01:00
Torkel Ödegaard
4d5a24a6c4
permissions: might have a solution for search
2018-02-09 17:24:34 +01:00
bergquist
84fea7c148
provisioning: dont return error unless you want to cancel all operations
2018-02-09 15:43:58 +01:00
bergquist
5a76624003
provisioning: createWalkFn doesnt have to be attached to the filereader anymore
2018-02-09 15:33:54 +01:00
bergquist
59cd2d5102
provisioning: avoid caching and use updated field from db
2018-02-09 15:23:38 +01:00
Torkel Ödegaard
e949eb3f58
Merge branch 'master' into dashboard-search-permissions-filter
2018-02-09 15:16:34 +01:00
bergquist
31f3fdcba3
provisioning: delete dashboards before insert/update
2018-02-09 12:17:58 +01:00
Marcus Efraimsson
a86f2fa34b
user picker should only include users from current org ( #10845 )
2018-02-09 10:42:37 +01:00
Marcus Efraimsson
8921b0b517
db test: allow use of env variable for database engine to run tests for
2018-02-08 19:16:45 +01:00
Torkel Ödegaard
8e8f3c4332
dashboard and folder search with permissions
2018-02-08 17:11:01 +01:00
Leonard Gram
e0abd862e0
provisioning: fixed bug in saving dashboards.
2018-02-08 16:36:53 +01:00
Leonard Gram
5a85fb6d32
Merge branch 'master' into provisioning
2018-02-08 13:43:19 +01:00
Marcus Efraimsson
0e8377a9f4
Update logic for create/update dashboard, validation and plugin dashboard links ( #10809 )
...
* enables overwrite if dashboard allready exist in folder
* dashboard: Don't allow creating a folder named General
* dashboards: update logic for save/update dashboard
No id and uid creates a new dashboard/folder.
No id and uid, with an existing title in folder allows overwrite
of dashboard.
Id without uid, allows update of existing dashboard/folder without
overwrite.
Uid without id allows update of existing dashboard/folder without
overwrite.
Id without uid, with an existing title in folder allows overwrite
of dashboard/folder and updated will have the uid of overwritten.
Uid without id, with an existing title in folder allows overwrite
of dashboard/folder and new will have the same uid as provided.
Trying to change an existing folder to a dashboard yields error.
Trying to change an existing dashboard to a folder yields error.
* dashboards: include folder id when confirmed to save with overwrite
* dashboards: fixes due to new url structure
Return importedUrl property in response to importing dashboards and
getting plugin dashboards and use this for redirects/links in the
frontend.
2018-02-08 12:48:38 +01:00
Leonard Gram
b549d29319
Merge branch 'master' into provisioning
2018-02-08 11:01:09 +01:00
Torkel Ödegaard
b84fd3a7ae
fix: initial fix for #10822
2018-02-07 17:54:21 +01:00
Daniel Lee
db1423eebc
dashfolders: fixes #10820
2018-02-07 15:13:34 +01:00
bergquist
76dc7932a4
docs: describe uid for dashboard provisioning
2018-02-07 11:04:48 +01:00
Torkel Ödegaard
cf7be5da0b
fix: changed dashboard title length to match slug length, will fix mysql index size issue, fixes #10779
2018-02-06 11:03:37 +01:00
Daniel Lee
2d1bd270fb
Stale permissions ( #10768 )
...
* dashfolders: hide permissions in settings if folder has changed
and the dashboard has not been saved yet. Otherwise the use will
see stale permissions from the original folder.
* dashfolders: return folder url for inherited permissions
2018-02-05 14:28:24 +01:00
Carl Bergquist
04a94ce396
adds unique index for org_id+folder_id+title on dashboards ( #10766 )
2018-02-05 14:11:19 +01:00
Marcus Efraimsson
a879dd8c0c
dashboards: render correct link for folder when searching for dashboards ( #10763 )
...
Fixes #10761
2018-02-05 13:23:24 +01:00
Carl Bergquist
cc0cc8dd73
changes to new urlformat for home dashboard ( #10738 )
2018-02-05 10:24:48 +01:00
Marcus Efraimsson
b07ac3c054
Merge branch '7883_new_url_structure' into 10630_folder_api
2018-02-01 18:29:00 +01:00
Marcus Efraimsson
cd61d2b237
Merge branch 'master' into 7883_new_url_structure
2018-02-01 17:32:43 +01:00
Marcus Efraimsson
744f402a96
db: fix failing integration tests for mysql and postgresql
2018-02-01 17:27:29 +01:00
bergquist
90207bcb7d
register handler for get dashboards by slug
2018-02-01 14:17:14 +01:00
bergquist
992fd37010
alert: use new url format
2018-02-01 14:08:51 +01:00
Marcus Efraimsson
ef90b3e49c
Merge branch '7883_new_url_structure' into 7883_frontend_step2
2018-02-01 11:08:39 +01:00
Marcus Efraimsson
b135df9a6c
Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure
2018-02-01 10:48:06 +01:00
Carl Bergquist
eff687bece
Merge pull request #10694 from grafana/7883_backend
...
backend for new url structure.
2018-02-01 09:35:00 +01:00
Marcus Efraimsson
90933b0621
dashboard: refactor logic for retrieving url for folder/dashboard
2018-01-31 23:14:48 +01:00
Marcus Efraimsson
035b724725
dashboards: remove slug property in dashboard search responses
...
Removes slug property in dashboard search responses since this property isn't needed
anymore and it haven't been released to any stable release.
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
92a0171a9b
folders: change the front end route for browsing folders
...
Change the front end route for folders to /dashboards/f/<uid>/<slug of folder title>.
Use new route for deleting dashboard/folder by uid.
Retrieve dashboard/folder by uid when moving or deleting dashboards/folders.
2018-01-31 18:40:54 +01:00
Marcus Efraimsson
b23560ed5a
dashboards: add validation to delete dashboard by slug
...
Validates that there are only one folder/dashboard having that slug,
otherwise returns 412 Precondition Failed
2018-01-31 18:40:54 +01:00
bergquist
58cfb23625
retry uid generation
2018-01-31 17:29:17 +01:00
Daniel Lee
a9e2273064
Merge remote-tracking branch 'upstream/master' into dashboard_permissions
2018-01-31 16:45:32 +01:00
Daniel Lee
7e2e57c306
dashfolders: fixes #10671 . Allow Editors default access to Root.
...
Editors should be able to create dashboards in root and should be
able to create folders. They cannot administrate permissions though
and these dashboards and folders will get the default permissions.
2018-01-31 16:43:21 +01:00
bergquist
16a1642831
gofmt...
2018-01-31 15:15:15 +01:00
bergquist
3da2ab61e0
Verifies requirement of id in dashboards.
2018-01-31 14:36:14 +01:00
bergquist
7e96052594
ensure dashboard title is unique in folder
2018-01-31 14:18:54 +01:00
bergquist
bb3183f6cd
removes uniqnes check on slug when saving dashboards
2018-01-31 10:29:52 +01:00
