a7645b710d
Merge remote-tracking branch 'origin/master' into develop
2017-12-13 19:18:10 +01:00
35106537f2
Replace Read Only Editor role with ViewersCanEdit setting ( #10166 )
...
* removes readonly editor role
* adds viewersCanEdit setting
This enable you to allow viewers to edit/inspect
dashboards in grafana in their own browser without
allowing them to save dashboards
* remove read only editor option from all dropdowns
* migrates all read only viewers to viewers
* docs: replace readOnlyEditor with viewersCanEdit
2017-12-13 18:53:42 +01:00
313735bd75
search: worked on search results
2017-12-13 15:51:59 +01:00
bf999a4f82
fixes broken alert eval when first condition is using OR
...
closes #9318
2017-12-13 13:37:10 +01:00
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
0b6169b3f5
removes verbose logging
2017-12-13 10:21:11 +01:00
2465fcbd6b
fix: FolderId and IsFolder when saving dashboard
2017-12-13 10:00:54 +01:00
fd633a1d5d
Add a per-notifier ShouldNotify()
...
This way we are able to edit notification behavior per notifier.
This would be usefull to let some notifiers send notifications,
even when the state doesn't change, or with custom condition.
Signed-off-by: Thibault Chataigner <t.chataigner@criteo.com >
2017-12-12 17:35:54 +01:00
67f1435dc7
minor fix for #10136
2017-12-12 17:18:25 +01:00
05cc1f85c3
Merge branch 'refactor-user-group-to-team' of https://github.com/alexanderzobnin/grafana into user-group-to-team
2017-12-12 17:07:00 +01:00
cafed8ce8f
Merge branch 'master' into develop
2017-12-12 13:19:07 +01:00
26281dd9d8
refactor: format files by gofmt
2017-12-11 19:46:05 +03:00
5d3bfee2f1
refactor: user groups to teams, rename backend files
2017-12-08 18:51:59 +03:00
d8612380e9
refactor: rename User Groups to Teams
2017-12-08 18:25:45 +03:00
0c5ef1453d
fixes broken test
2017-12-08 11:33:15 +01:00
5f5cdad97a
improve error handling for datasources as cfg
2017-12-08 10:50:11 +01:00
5aab6b5c20
removes last pieces of dashboard.json
2017-12-07 16:26:07 +01:00
2e610cb256
dashboards as cfg: move dash/ds config files to /provisioning/*
2017-12-07 15:27:01 +01:00
1dfa529941
dashboards as cfg: avoid walking fs in parallel
2017-12-07 15:27:01 +01:00
b28ea0b407
dashboards as cfg: type
2017-12-07 15:27:01 +01:00
099178466d
dashboards as cfg: wire up dashboard repo
2017-12-07 15:27:01 +01:00
288cc35529
dashboards as cfg: use gocache for caching
2017-12-07 15:27:01 +01:00
f5eac2e91d
dashboards as cfg: expose dashboard service as interface
2017-12-07 15:27:01 +01:00
16f072b320
dashboards as cfg: move saving logic for dashboards into its own service
2017-12-07 15:27:01 +01:00
9cebb23e01
dashboards as cfg: revert minor changes
2017-12-07 15:27:01 +01:00
74e12c260f
dashboards as cfg: move dashboard saving into its own service
2017-12-07 15:27:01 +01:00
09cb0f378b
dashboards as cfg: minor tweaks
2017-12-07 15:27:01 +01:00
93e1d8a19c
dashboards as cfg: make dashboard none editable by default
2017-12-07 15:27:01 +01:00
7f3a7ea128
dashboards as cfg: more tests
2017-12-07 15:27:01 +01:00
dc0fb8be06
dashboards as cfg: code cleanup
2017-12-07 15:27:01 +01:00
d69b63cbc0
dashboards as cfg: read first cfg version
2017-12-07 15:27:01 +01:00
beb9f8ee74
Merge remote-tracking branch 'origin/master' into develop
2017-12-07 14:14:50 +01:00
35232a77e6
removes unused properties
...
the dsType property caused some confusion about what datasource is
beeing used. I just removed it since it not beeing used.
closes #10072
2017-12-05 08:26:43 +01:00
1e10fcad83
test: fix failing postgres test
...
Should use case insensitive matching when searching for users
2017-11-29 15:17:31 +01:00
554c7ba96f
notifier: Fixes path for uploaded image for Slack notifier
...
Fixes #10012
2017-11-29 11:16:45 +01:00
4356e980f0
dashfolders: create app folder on dashboard import
2017-11-27 17:08:39 +01:00
bc81298d4c
worked on search
2017-11-24 16:18:56 +01:00
b7a8db4937
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-22 14:51:53 +01:00
3dc2e06a33
dashboard: fix test for folderIds
2017-11-21 16:41:08 +01:00
9fc22e5a66
Merge branch 'master' of github.com:grafana/grafana into develop
2017-11-21 16:05:18 +01:00
ccbdb29f07
fixed unit tests
2017-11-21 11:53:56 +01:00
0d12b37dfd
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
2017-11-21 11:28:17 +01:00
fc1d8416a7
working on dashboard search
2017-11-20 12:47:03 +01:00
0015183a7b
Don't import JSON dashboards from hidden directories.
2017-11-17 17:21:49 +00:00
7b17d134fc
Merge branch 'develop' of github.com:grafana/grafana into develop
2017-11-17 15:49:47 +01:00
0e44fe082b
Merge branch 'master' into develop
2017-11-17 15:49:17 +01:00
7c74111187
search: add expanded folders
2017-11-17 15:30:21 +01:00
98b4074c16
refactoring: minor refactor of clean up dashboard history PR #9882
2017-11-17 14:41:44 +01:00
aaa465a100
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
2017-11-17 14:16:49 +01:00
a55be07ea5
dashboard history clean up: avoid potential SQL injections
2017-11-17 10:51:50 +03:00
Torkel Ödegaard
Carl Bergquist
bergquist
Thibault Chataigner
Alexander Zobnin
Marcus Efraimsson
Daniel Lee
Tom Wilkie