1b795c0ced
Fix #10823 ( #10851 )
...
* Fix of #10823
* Typo fix
* Revert Gopkg.lock
2018-02-12 09:24:01 +01:00
f01890c3ff
provisioning: better variable naming
2018-02-12 08:22:34 +01:00
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
4d5a24a6c4
permissions: might have a solution for search
2018-02-09 17:24:34 +01:00
84fea7c148
provisioning: dont return error unless you want to cancel all operations
2018-02-09 15:43:58 +01:00
5a76624003
provisioning: createWalkFn doesnt have to be attached to the filereader anymore
2018-02-09 15:33:54 +01:00
59cd2d5102
provisioning: avoid caching and use updated field from db
2018-02-09 15:23:38 +01:00
e949eb3f58
Merge branch 'master' into dashboard-search-permissions-filter
2018-02-09 15:16:34 +01:00
31f3fdcba3
provisioning: delete dashboards before insert/update
2018-02-09 12:17:58 +01:00
a86f2fa34b
user picker should only include users from current org ( #10845 )
2018-02-09 10:42:37 +01:00
8921b0b517
db test: allow use of env variable for database engine to run tests for
2018-02-08 19:16:45 +01:00
8e8f3c4332
dashboard and folder search with permissions
2018-02-08 17:11:01 +01:00
e0abd862e0
provisioning: fixed bug in saving dashboards.
2018-02-08 16:36:53 +01:00
5a85fb6d32
Merge branch 'master' into provisioning
2018-02-08 13:43:19 +01:00
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
b549d29319
Merge branch 'master' into provisioning
2018-02-08 11:01:09 +01:00
b84fd3a7ae
fix: initial fix for #10822
2018-02-07 17:54:21 +01:00
db1423eebc
dashfolders: fixes #10820
2018-02-07 15:13:34 +01:00
76dc7932a4
docs: describe uid for dashboard provisioning
2018-02-07 11:04:48 +01:00
0e61a670bb
fix: error handling now displays page correctly, fixes #10777
2018-02-06 12:28:17 +01:00
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
f97be541af
redirect "permission denied" requests to "/" ( #10773 )
2018-02-05 18:17:47 +01:00
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
04a94ce396
adds unique index for org_id+folder_id+title on dashboards ( #10766 )
2018-02-05 14:11:19 +01:00
a879dd8c0c
dashboards: render correct link for folder when searching for dashboards ( #10763 )
...
Fixes #10761
2018-02-05 13:23:24 +01:00
55100d5ff9
Merge pull request #10760 from grafana/10749_link_to_folder
...
Fix link to folder from permissions list
2018-02-05 11:34:59 +01:00
7d3b990e91
permissions: fix link to folder from permissions list
...
Also, closing Add Permissions CTA when DashboardPermissions and
FolderPermissions unmounts.
Fixes #10749 "
2018-02-05 11:10:37 +01:00
cc0cc8dd73
changes to new urlformat for home dashboard ( #10738 )
2018-02-05 10:24:48 +01:00
07fa2f1722
fix: alert list links did not work, changed dashboardUri to Url, this is breaking api change in alert api ( #10756 )
2018-02-05 09:42:41 +01:00
32054ad9a6
dashboard: fix redirect of legacy dashboard url's
...
Redirect of /dashboard/db/:slug to /d/:uid/:slug and
/dashboard-solo/db/:slug to /d-solo/:uid/:slug now includes querystring parameters.
Fixes #10752
2018-02-04 17:29:16 +01:00
3a906ea335
Merge branch 'master' into 10630_folder_api
2018-02-02 14:34:10 +01:00
130a2b6499
handle new error message
2018-02-02 11:06:32 +01:00
512f6992f1
dashfolders: rename Root folder to General. Closes #10692
2018-02-02 10:39:26 +01:00
04a9a650e7
folders: changes and updated tests after merging permissions and new url structure
2018-02-01 22:07:27 +01:00
5912cf4dc2
folders: rename api files
2018-02-01 18:41:50 +01:00
4e0542d740
dashboards: revert logic of returning 404 in dashboard api if it's a folder for now
2018-02-01 18:41:04 +01:00
b07ac3c054
Merge branch '7883_new_url_structure' into 10630_folder_api
2018-02-01 18:29:00 +01:00
cd61d2b237
Merge branch 'master' into 7883_new_url_structure
2018-02-01 17:32:43 +01:00
744f402a96
db: fix failing integration tests for mysql and postgresql
2018-02-01 17:27:29 +01:00
90207bcb7d
register handler for get dashboards by slug
2018-02-01 14:17:14 +01:00
fcd86fb24f
make it easier for dashboards to generate ur;
2018-02-01 14:08:51 +01:00
74ca6f6dbf
changes dashboard url in alertlist
2018-02-01 14:08:51 +01:00
992fd37010
alert: use new url format
2018-02-01 14:08:51 +01:00
c0f100f1b5
Improve logging in the phantomjs renderer ( #10697 )
...
* Add add adapter between io.Writer and log.Logger
* Add phantomjs output to grafana log
* Unexport LogWriterImpl
* Add test for LogWriter
* Make it possible to get phantomjs debug output
* Make it possible to get the configured log level
2018-02-01 14:04:52 +01:00
ef90b3e49c
Merge branch '7883_new_url_structure' into 7883_frontend_step2
2018-02-01 11:08:39 +01:00
b135df9a6c
Merge remote-tracking branch 'upstream/master' into 7883_new_url_structure
2018-02-01 10:48:06 +01:00
eff687bece
Merge pull request #10694 from grafana/7883_backend
...
backend for new url structure.
2018-02-01 09:35:00 +01:00
90933b0621
dashboard: refactor logic for retrieving url for folder/dashboard
2018-01-31 23:14:48 +01:00
c0c3f17d84
dashboards: when restoring a dashboard to an older version, set current uid
2018-01-31 18:40:54 +01:00
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
Andrey Inishev
bergquist
Marcus Efraimsson
Torkel Ödegaard
Leonard Gram
Daniel Lee
Alexander Zobnin
Carl Bergquist
Mikael Olenfalk