0053be9882
login: uses epochs for login throtting.
...
Closes #10937
2018-02-16 17:25:46 +01:00
1f3442020b
alerts: refactoring tests
2018-02-16 14:37:10 +01:00
c5226a945b
alerting: pausing alerts modifies updated.
...
When pausing an alert the updated field is
modified to the current time.
Closes #10191
2018-02-16 14:24:52 +01:00
8af2c9f1f8
test: added integration test for #10941
2018-02-16 14:17:41 +01:00
5323971c21
refactoring: alert rule query refactoring ( #10941 )
2018-02-16 13:56:04 +01:00
529fc022d5
db: reduce name column size in dashboard_provisoning
...
ref #10931
2018-02-16 11:49:17 +01:00
b9d572bdec
teams: adds some validation to the API
2018-02-16 11:46:20 +01:00
56907eef69
tests: makes sure we all migrations are working
2018-02-14 15:30:29 +01:00
fa1b92a12b
provisioning: uses unix epoch timestamps. ( #10907 )
...
* provisioning: uses unix epoch timestamps.
2018-02-14 15:28:30 +01:00
fcaa8227a6
Dashboard acl query fixes ( #10909 )
...
* initial fixes for dashboard permission acl list query, fixes #10864
* permissions: refactoring of acl api and query
2018-02-14 15:04:26 +01:00
73eaba076e
wip: dashboard acl ux2, #10747
2018-02-14 15:03:22 +01:00
ec6f0f94b8
permissions: refactoring of acl api and query
2018-02-14 14:31:20 +01:00
1a041a2250
bug: return correct err message
...
if the sql query failed has is false and the method will return
m.ErrDataSourceNotFound which is incorrect. We now return the
correct error message from the query
ref #10843
2018-02-14 13:32:52 +01:00
db89ac4134
initial fixes for dashboard permission acl list query, fixes #10864
2018-02-14 11:50:58 +01:00
8dd4d505ee
Merge branch 'dashboard-search-permissions-filter'
2018-02-14 10:48:55 +01:00
b60b6690ba
sql: removes locale from test to mirror prod.
2018-02-14 10:31:36 +01:00
fc371af47f
adds tests that validate that updated is correct
2018-02-14 10:31:36 +01:00
162439a8d6
fix: removed logging
2018-02-13 17:03:20 +01:00
e3c3f3ce4c
fix: sql search permissions filter fix
2018-02-13 16:49:00 +01:00
cb8c82f7f6
Merge branch 'master' into 10630_folder_api
2018-02-12 15:14:41 +01:00
9a7eb5c327
Merge branch 'master' into provisioning
2018-02-12 14:19:20 +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
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
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
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
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
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
cc0cc8dd73
changes to new urlformat for home dashboard ( #10738 )
2018-02-05 10:24:48 +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
992fd37010
alert: use new url format
2018-02-01 14:08:51 +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
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
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
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
Leonard Gram
Torkel Ödegaard
bergquist
Daniel Lee
Marcus Efraimsson
Carl Bergquist