IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

dashboards as cfg: type

Browse Source
This commit is contained in:
bergquist
2017-12-05 13:57:39 +01:00
parent 2a18345eb2
commit b28ea0b407
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/provisioning/dashboards/dashboard.go
View File

@@ -33,7 +33,7 @@ func (provider *DashboardProvisioner) Provision(ctx context.Context) error {
for _, cfg := range cfgs { for _, cfg := range cfgs {
switch cfg.Type { switch cfg.Type {
case "file": case "file":
fileReader, err := NewDashboardFilereader(cfg, provider.log.New("type", cfg.Type, "name", cfg.Name)) fileReader, err := NewDashboardFileReader(cfg, provider.log.New("type", cfg.Type, "name", cfg.Name))
if err != nil { if err != nil {
return err return err
} }

2
pkg/services/provisioning/dashboards/file_reader.go
View File

@@ -26,7 +26,7 @@ type fileReader struct {
cache *gocache.Cache cache *gocache.Cache
} }
func NewDashboardFilereader(cfg *DashboardsAsConfig, log log.Logger) (*fileReader, error) { func NewDashboardFileReader(cfg *DashboardsAsConfig, log log.Logger) (*fileReader, error) {
path, ok := cfg.Options["folder"].(string) path, ok := cfg.Options["folder"].(string)
if !ok { if !ok {
return nil, fmt.Errorf("Failed to load dashboards. folder param is not a string") return nil, fmt.Errorf("Failed to load dashboards. folder param is not a string")

10
pkg/services/provisioning/dashboards/file_reader_test.go
View File

@@ -41,7 +41,7 @@ func TestDashboardFileReader(t *testing.T) {
Convey("Can read default dashboard", func() { Convey("Can read default dashboard", func() {
cfg.Options["folder"] = defaultDashboards cfg.Options["folder"] = defaultDashboards
reader, err := NewDashboardFilereader(cfg, logger) reader, err := NewDashboardFileReader(cfg, logger)
So(err, ShouldBeNil) So(err, ShouldBeNil)
err = reader.walkFolder() err = reader.walkFolder()
@@ -58,7 +58,7 @@ func TestDashboardFileReader(t *testing.T) {
Slug: "grafana", Slug: "grafana",
}) })
reader, err := NewDashboardFilereader(cfg, logger) reader, err := NewDashboardFileReader(cfg, logger)
So(err, ShouldBeNil) So(err, ShouldBeNil)
err = reader.walkFolder() err = reader.walkFolder()
@@ -77,7 +77,7 @@ func TestDashboardFileReader(t *testing.T) {
Slug: "grafana", Slug: "grafana",
}) })
reader, err := NewDashboardFilereader(cfg, logger) reader, err := NewDashboardFileReader(cfg, logger)
So(err, ShouldBeNil) So(err, ShouldBeNil)
err = reader.walkFolder() err = reader.walkFolder()
@@ -94,7 +94,7 @@ func TestDashboardFileReader(t *testing.T) {
Folder: "", Folder: "",
} }
_, err := NewDashboardFilereader(cfg, logger) _, err := NewDashboardFileReader(cfg, logger)
So(err, ShouldNotBeNil) So(err, ShouldNotBeNil)
}) })
@@ -109,7 +109,7 @@ func TestDashboardFileReader(t *testing.T) {
}, },
} }
_, err := NewDashboardFilereader(cfg, logger) _, err := NewDashboardFileReader(cfg, logger)
So(err, ShouldBeNil) So(err, ShouldBeNil)
}) })
}) })