Carl Bergquist
d6667c4fa0
Merge pull request #10548 from StevenTobin/follow_symlinks
...
Make file_reader follow symlinks
2018-01-18 11:29:34 +01:00
stobin
f1813ae3a3
Make file_reader follow symlinks
2018-01-17 14:51:17 +00:00
bergquist
34d7f8a44f
dashboards as cfg: property path replaces folder
2018-01-17 15:48:24 +01:00
Leonard Gram
183507964c
Clearer naming for dashboard provisioning config.
...
Renames folder (in options) to path to make it
different from the grafana folder wherein the
dashboard will be created.
2018-01-16 17:40:14 +01:00
bergquist
1a6c2ea8d8
dashboards as cfg: logs error when trying to import dashboard with id
...
dashboard json cannot contain fixed id when importing from
disk. We used to override this but it didnt caught all problems
so now we block dashboards from beeing imported instead.
closes #10504
2018-01-15 12:26:43 +01:00
bergquist
f5e00e133b
dashboards as cfg: moves dashcash into its own file
2017-12-28 13:37:02 +01:00
bergquist
237d469ed4
dashboards as cfg: create dashboard folders if missing
...
closes #10259
2017-12-28 13:33:11 +01:00
bergquist
f4078e1935
tests: for skipping with hidden folders
2017-12-27 15:04:49 +01:00
Torkel Ödegaard
c395237710
Merge branch Grafana v5 'develop' branch
2017-12-15 12:06:09 +01:00
Simon Aquino
5dbbf1826c
Avoid ID validation before provisioning dashboards
...
Attempting to provision grafana using a previously exported
JSON dashboard with the ID field already set, might result in an error.
In fact, Grafana might believe that a dashboard with that
given ID already exists in the database, throwing an error if it doesn't.
(see pkg/services/sqlstore/dashboard.go#L32)
The dashboard provisioner should set the dashboard id to zero in order to
avoid this behaviour inducing the dashboard to be written to the DB
without ID validation.
2017-12-14 02:07:50 +01:00
bergquist
dd3dd407ad
removes unused property
2017-12-13 13:12:50 +01:00
Torkel Ödegaard
2465fcbd6b
fix: FolderId and IsFolder when saving dashboard
2017-12-13 10:00:54 +01: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
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
