 Torkel Ödegaard
|
313735bd75
|
search: worked on search results
|
2017-12-13 15:51:59 +01:00 |
|
|
Torkel Ödegaard
|
2465fcbd6b
|
fix: FolderId and IsFolder when saving dashboard
|
2017-12-13 10:00:54 +01:00 |
|
|
Torkel Ödegaard
|
67f1435dc7
|
minor fix for #10136
|
2017-12-12 17:18:25 +01:00 |
|
|
Torkel Ödegaard
|
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 |
|
|
Torkel Ödegaard
|
cafed8ce8f
|
Merge branch 'master' into develop
|
2017-12-12 13:19:07 +01:00 |
|
 Alexander Zobnin
|
26281dd9d8
|
refactor: format files by gofmt
|
2017-12-11 19:46:05 +03:00 |
|
|
Alexander Zobnin
|
5d3bfee2f1
|
refactor: user groups to teams, rename backend files
|
2017-12-08 18:51:59 +03:00 |
|
|
Alexander Zobnin
|
d8612380e9
|
refactor: rename User Groups to Teams
|
2017-12-08 18:25:45 +03:00 |
|
 bergquist
|
0c5ef1453d
|
fixes broken test
|
2017-12-08 11:33:15 +01:00 |
|
|
bergquist
|
5f5cdad97a
|
improve error handling for datasources as cfg
|
2017-12-08 10:50:11 +01:00 |
|
|
bergquist
|
5aab6b5c20
|
removes last pieces of dashboard.json
|
2017-12-07 16:26:07 +01:00 |
|
|
bergquist
|
2e610cb256
|
dashboards as cfg: move dash/ds config files to /provisioning/*
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
1dfa529941
|
dashboards as cfg: avoid walking fs in parallel
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
b28ea0b407
|
dashboards as cfg: type
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
099178466d
|
dashboards as cfg: wire up dashboard repo
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
288cc35529
|
dashboards as cfg: use gocache for caching
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
f5eac2e91d
|
dashboards as cfg: expose dashboard service as interface
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
16f072b320
|
dashboards as cfg: move saving logic for dashboards into its own service
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
9cebb23e01
|
dashboards as cfg: revert minor changes
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
74e12c260f
|
dashboards as cfg: move dashboard saving into its own service
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
09cb0f378b
|
dashboards as cfg: minor tweaks
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
93e1d8a19c
|
dashboards as cfg: make dashboard none editable by default
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
7f3a7ea128
|
dashboards as cfg: more tests
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
dc0fb8be06
|
dashboards as cfg: code cleanup
|
2017-12-07 15:27:01 +01:00 |
|
|
bergquist
|
d69b63cbc0
|
dashboards as cfg: read first cfg version
|
2017-12-07 15:27:01 +01:00 |
|
|
Torkel Ödegaard
|
beb9f8ee74
|
Merge remote-tracking branch 'origin/master' into develop
|
2017-12-07 14:14:50 +01:00 |
|
|
bergquist
|
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 |
|
 Marcus Efraimsson
|
1e10fcad83
|
test: fix failing postgres test
Should use case insensitive matching when searching for users
|
2017-11-29 15:17:31 +01:00 |
|
 Daniel Lee
|
554c7ba96f
|
notifier: Fixes path for uploaded image for Slack notifier
Fixes #10012
|
2017-11-29 11:16:45 +01:00 |
|
|
Daniel Lee
|
4356e980f0
|
dashfolders: create app folder on dashboard import
|
2017-11-27 17:08:39 +01:00 |
|
|
Torkel Ödegaard
|
bc81298d4c
|
worked on search
|
2017-11-24 16:18:56 +01:00 |
|
|
Torkel Ödegaard
|
b7a8db4937
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-11-22 14:51:53 +01:00 |
|
|
Daniel Lee
|
3dc2e06a33
|
dashboard: fix test for folderIds
|
2017-11-21 16:41:08 +01:00 |
|
|
Torkel Ödegaard
|
9fc22e5a66
|
Merge branch 'master' of github.com:grafana/grafana into develop
|
2017-11-21 16:05:18 +01:00 |
|
|
Torkel Ödegaard
|
ccbdb29f07
|
fixed unit tests
|
2017-11-21 11:53:56 +01:00 |
|
|
Torkel Ödegaard
|
0d12b37dfd
|
fix: alert list panel now works correctly after adding manual annotation on dashboard, fixes #9951
|
2017-11-21 11:28:17 +01:00 |
|
|
Torkel Ödegaard
|
fc1d8416a7
|
working on dashboard search
|
2017-11-20 12:47:03 +01:00 |
|
 Tom Wilkie
|
0015183a7b
|
Don't import JSON dashboards from hidden directories.
|
2017-11-17 17:21:49 +00:00 |
|
|
Torkel Ödegaard
|
7b17d134fc
|
Merge branch 'develop' of github.com:grafana/grafana into develop
|
2017-11-17 15:49:47 +01:00 |
|
|
Torkel Ödegaard
|
0e44fe082b
|
Merge branch 'master' into develop
|
2017-11-17 15:49:17 +01:00 |
|
|
Daniel Lee
|
7c74111187
|
search: add expanded folders
|
2017-11-17 15:30:21 +01:00 |
|
|
Torkel Ödegaard
|
98b4074c16
|
refactoring: minor refactor of clean up dashboard history PR #9882
|
2017-11-17 14:41:44 +01:00 |
|
|
Torkel Ödegaard
|
aaa465a100
|
Merge branch 'feat-9671' of https://github.com/alexanderzobnin/grafana into alexanderzobnin-feat-9671
|
2017-11-17 14:16:49 +01:00 |
|
|
Alexander Zobnin
|
a55be07ea5
|
dashboard history clean up: avoid potential SQL injections
|
2017-11-17 10:51:50 +03:00 |
|
|
Daniel Lee
|
f47673ab5c
|
search: refactor search sql into a builder class
|
2017-11-17 00:16:33 +01:00 |
|
|
Marcus Efraimsson
|
540d540ea9
|
fix: return id from api when creating new annotation/graphite annotation, fixes #9798
When creating a region annotation the response will include both
id (region start id) and endId (region end id), if not only id.
|
2017-11-16 16:19:01 +01:00 |
|
|
bergquist
|
87983021e2
|
datasources as cfg: convert yaml map into json for jsonData
|
2017-11-16 13:23:42 +01:00 |
|
|
bergquist
|
ebbfc529e0
|
datasource as cfg: support globbing
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
0f136a940c
|
datasource as cfg: enable editable ds's
|
2017-11-15 14:30:32 +01:00 |
|
|
bergquist
|
36676e23c1
|
datasource as cfg: adds readonly datasources
|
2017-11-15 14:30:32 +01:00 |
|