Commit 18350796 by Leonard Gram

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.
parent 307b419f
...@@ -33,7 +33,7 @@ func TestDashboardsAsConfig(t *testing.T) { ...@@ -33,7 +33,7 @@ func TestDashboardsAsConfig(t *testing.T) {
So(ds.Editable, ShouldBeTrue) So(ds.Editable, ShouldBeTrue)
So(len(ds.Options), ShouldEqual, 1) So(len(ds.Options), ShouldEqual, 1)
So(ds.Options["folder"], ShouldEqual, "/var/lib/grafana/dashboards") So(ds.Options["path"], ShouldEqual, "/var/lib/grafana/dashboards")
ds2 := cfg[1] ds2 := cfg[1]
...@@ -44,7 +44,7 @@ func TestDashboardsAsConfig(t *testing.T) { ...@@ -44,7 +44,7 @@ func TestDashboardsAsConfig(t *testing.T) {
So(ds2.Editable, ShouldBeFalse) So(ds2.Editable, ShouldBeFalse)
So(len(ds2.Options), ShouldEqual, 1) So(len(ds2.Options), ShouldEqual, 1)
So(ds2.Options["folder"], ShouldEqual, "/var/lib/grafana/dashboards") So(ds2.Options["path"], ShouldEqual, "/var/lib/grafana/dashboards")
}) })
Convey("Should skip broken config files", func() { Convey("Should skip broken config files", func() {
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
editable: true editable: true
type: file type: file
options: options:
folder: /var/lib/grafana/dashboards path: /var/lib/grafana/dashboards
- name: 'default' - name: 'default'
type: file type: file
options: options:
folder: /var/lib/grafana/dashboards path: /var/lib/grafana/dashboards
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment