From 183507964c3c5b375f7738f5b33a1cd2a1f280a8 Mon Sep 17 00:00:00 2001 From: Leonard Gram Date: Tue, 16 Jan 2018 17:35:28 +0100 Subject: [PATCH] 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. --- pkg/services/provisioning/dashboards/config_reader_test.go | 4 ++-- .../test-configs/dashboards-from-disk/dev-dashboards.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/services/provisioning/dashboards/config_reader_test.go b/pkg/services/provisioning/dashboards/config_reader_test.go index 56c5a5fcf3d..faca34438d8 100644 --- a/pkg/services/provisioning/dashboards/config_reader_test.go +++ b/pkg/services/provisioning/dashboards/config_reader_test.go @@ -33,7 +33,7 @@ func TestDashboardsAsConfig(t *testing.T) { So(ds.Editable, ShouldBeTrue) 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] @@ -44,7 +44,7 @@ func TestDashboardsAsConfig(t *testing.T) { So(ds2.Editable, ShouldBeFalse) 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() { diff --git a/pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/dev-dashboards.yaml b/pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/dev-dashboards.yaml index a7c4a812092..df0e6ff3044 100644 --- a/pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/dev-dashboards.yaml +++ b/pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/dev-dashboards.yaml @@ -4,9 +4,9 @@ editable: true type: file options: - folder: /var/lib/grafana/dashboards + path: /var/lib/grafana/dashboards - name: 'default' type: file options: - folder: /var/lib/grafana/dashboards + path: /var/lib/grafana/dashboards