diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index df0cbbd745c..900524a8823 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -3,6 +3,7 @@ package api import ( "encoding/json" "fmt" + //"github.com/grafana/grafana/pkg/services/dashboards" "os" "path" "strings" @@ -124,6 +125,12 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response { dash := cmd.GetDashboardModel() + // dashItem := &dashboards.SaveDashboardItem{ + // Dashboard: dash, + // Message: cmd.Message, + // } + // err := dashboards.SaveDashboard(dashItem) + // Check if Title is empty if dash.Title == "" { return ApiError(400, m.ErrDashboardTitleEmpty.Error(), nil) diff --git a/pkg/services/provisioning/dashboard/config_reader.go b/pkg/services/provisioning/dashboards/config_reader.go similarity index 97% rename from pkg/services/provisioning/dashboard/config_reader.go rename to pkg/services/provisioning/dashboards/config_reader.go index d7ee92a592c..a602ca71df3 100644 --- a/pkg/services/provisioning/dashboard/config_reader.go +++ b/pkg/services/provisioning/dashboards/config_reader.go @@ -1,4 +1,4 @@ -package dashboard +package dashboards import ( "io/ioutil" diff --git a/pkg/services/provisioning/dashboard/dashboard.go b/pkg/services/provisioning/dashboards/dashboard.go similarity index 98% rename from pkg/services/provisioning/dashboard/dashboard.go rename to pkg/services/provisioning/dashboards/dashboard.go index 820eaf3c0f5..e2c802a0024 100644 --- a/pkg/services/provisioning/dashboard/dashboard.go +++ b/pkg/services/provisioning/dashboards/dashboard.go @@ -1,4 +1,4 @@ -package dashboard +package dashboards import ( "context" diff --git a/pkg/services/provisioning/dashboard/dashboard_test.go b/pkg/services/provisioning/dashboards/dashboard_test.go similarity index 98% rename from pkg/services/provisioning/dashboard/dashboard_test.go rename to pkg/services/provisioning/dashboards/dashboard_test.go index 450d0e62ff5..e9ab352a122 100644 --- a/pkg/services/provisioning/dashboard/dashboard_test.go +++ b/pkg/services/provisioning/dashboards/dashboard_test.go @@ -1,4 +1,4 @@ -package dashboard +package dashboards import ( "testing" diff --git a/pkg/services/provisioning/dashboard/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go similarity index 99% rename from pkg/services/provisioning/dashboard/file_reader.go rename to pkg/services/provisioning/dashboards/file_reader.go index 08dbca81373..c15fd7cb521 100644 --- a/pkg/services/provisioning/dashboard/file_reader.go +++ b/pkg/services/provisioning/dashboards/file_reader.go @@ -1,4 +1,4 @@ -package dashboard +package dashboards import ( "context" diff --git a/pkg/services/provisioning/dashboard/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go similarity index 99% rename from pkg/services/provisioning/dashboard/file_reader_test.go rename to pkg/services/provisioning/dashboards/file_reader_test.go index e335ee08aa2..55c26e47dec 100644 --- a/pkg/services/provisioning/dashboard/file_reader_test.go +++ b/pkg/services/provisioning/dashboards/file_reader_test.go @@ -1,4 +1,4 @@ -package dashboard +package dashboards import ( "github.com/grafana/grafana/pkg/bus" diff --git a/pkg/services/provisioning/dashboard/test-configs/dashboards-from-disk/dev-dashboards.yaml b/pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/dev-dashboards.yaml similarity index 100% rename from pkg/services/provisioning/dashboard/test-configs/dashboards-from-disk/dev-dashboards.yaml rename to pkg/services/provisioning/dashboards/test-configs/dashboards-from-disk/dev-dashboards.yaml diff --git a/pkg/services/provisioning/dashboard/test-dashboards/broken-dashboards/empty-json.json b/pkg/services/provisioning/dashboards/test-dashboards/broken-dashboards/empty-json.json similarity index 100% rename from pkg/services/provisioning/dashboard/test-dashboards/broken-dashboards/empty-json.json rename to pkg/services/provisioning/dashboards/test-dashboards/broken-dashboards/empty-json.json diff --git a/pkg/services/provisioning/dashboard/test-dashboards/broken-dashboards/invalid.json b/pkg/services/provisioning/dashboards/test-dashboards/broken-dashboards/invalid.json similarity index 100% rename from pkg/services/provisioning/dashboard/test-dashboards/broken-dashboards/invalid.json rename to pkg/services/provisioning/dashboards/test-dashboards/broken-dashboards/invalid.json diff --git a/pkg/services/provisioning/dashboard/test-dashboards/folder-one/dashboard1.json b/pkg/services/provisioning/dashboards/test-dashboards/folder-one/dashboard1.json similarity index 100% rename from pkg/services/provisioning/dashboard/test-dashboards/folder-one/dashboard1.json rename to pkg/services/provisioning/dashboards/test-dashboards/folder-one/dashboard1.json diff --git a/pkg/services/provisioning/dashboard/test-dashboards/folder-one/dashboard2.json b/pkg/services/provisioning/dashboards/test-dashboards/folder-one/dashboard2.json similarity index 100% rename from pkg/services/provisioning/dashboard/test-dashboards/folder-one/dashboard2.json rename to pkg/services/provisioning/dashboards/test-dashboards/folder-one/dashboard2.json diff --git a/pkg/services/provisioning/dashboard/test-dashboards/one-dashboard/dashboard1.json b/pkg/services/provisioning/dashboards/test-dashboards/one-dashboard/dashboard1.json similarity index 100% rename from pkg/services/provisioning/dashboard/test-dashboards/one-dashboard/dashboard1.json rename to pkg/services/provisioning/dashboards/test-dashboards/one-dashboard/dashboard1.json diff --git a/pkg/services/provisioning/dashboard/types.go b/pkg/services/provisioning/dashboards/types.go similarity index 98% rename from pkg/services/provisioning/dashboard/types.go rename to pkg/services/provisioning/dashboards/types.go index 9480092f262..5b73b6d10e3 100644 --- a/pkg/services/provisioning/dashboard/types.go +++ b/pkg/services/provisioning/dashboards/types.go @@ -1,4 +1,4 @@ -package dashboard +package dashboards import ( "github.com/grafana/grafana/pkg/components/simplejson" diff --git a/pkg/services/provisioning/datasource/datasources.go b/pkg/services/provisioning/datasources/datasources.go similarity index 99% rename from pkg/services/provisioning/datasource/datasources.go rename to pkg/services/provisioning/datasources/datasources.go index be854bfe2bc..325dbbbd757 100644 --- a/pkg/services/provisioning/datasource/datasources.go +++ b/pkg/services/provisioning/datasources/datasources.go @@ -1,4 +1,4 @@ -package datasource +package datasources import ( "errors" diff --git a/pkg/services/provisioning/datasource/datasources_test.go b/pkg/services/provisioning/datasources/datasources_test.go similarity index 99% rename from pkg/services/provisioning/datasource/datasources_test.go rename to pkg/services/provisioning/datasources/datasources_test.go index d746e794d92..f3252c28d9d 100644 --- a/pkg/services/provisioning/datasource/datasources_test.go +++ b/pkg/services/provisioning/datasources/datasources_test.go @@ -1,4 +1,4 @@ -package datasource +package datasources import ( "testing" diff --git a/pkg/services/provisioning/datasource/test-configs/all-properties/all-properties.yaml b/pkg/services/provisioning/datasources/test-configs/all-properties/all-properties.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/all-properties/all-properties.yaml rename to pkg/services/provisioning/datasources/test-configs/all-properties/all-properties.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/all-properties/not.yaml.txt b/pkg/services/provisioning/datasources/test-configs/all-properties/not.yaml.txt similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/all-properties/not.yaml.txt rename to pkg/services/provisioning/datasources/test-configs/all-properties/not.yaml.txt diff --git a/pkg/services/provisioning/datasource/test-configs/all-properties/second.yaml b/pkg/services/provisioning/datasources/test-configs/all-properties/second.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/all-properties/second.yaml rename to pkg/services/provisioning/datasources/test-configs/all-properties/second.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/broken-yaml/broken.yaml b/pkg/services/provisioning/datasources/test-configs/broken-yaml/broken.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/broken-yaml/broken.yaml rename to pkg/services/provisioning/datasources/test-configs/broken-yaml/broken.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/double-default/default-1.yaml b/pkg/services/provisioning/datasources/test-configs/double-default/default-1.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/double-default/default-1.yaml rename to pkg/services/provisioning/datasources/test-configs/double-default/default-1.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/double-default/default-2.yaml b/pkg/services/provisioning/datasources/test-configs/double-default/default-2.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/double-default/default-2.yaml rename to pkg/services/provisioning/datasources/test-configs/double-default/default-2.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/insert-two-delete-two/one-datasources.yaml b/pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/one-datasources.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/insert-two-delete-two/one-datasources.yaml rename to pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/one-datasources.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/insert-two-delete-two/two-datasources.yml b/pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/two-datasources.yml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/insert-two-delete-two/two-datasources.yml rename to pkg/services/provisioning/datasources/test-configs/insert-two-delete-two/two-datasources.yml diff --git a/pkg/services/provisioning/datasource/test-configs/two-datasources/two-datasources.yaml b/pkg/services/provisioning/datasources/test-configs/two-datasources/two-datasources.yaml similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/two-datasources/two-datasources.yaml rename to pkg/services/provisioning/datasources/test-configs/two-datasources/two-datasources.yaml diff --git a/pkg/services/provisioning/datasource/test-configs/zero-datasources/placeholder-for-git b/pkg/services/provisioning/datasources/test-configs/zero-datasources/placeholder-for-git similarity index 100% rename from pkg/services/provisioning/datasource/test-configs/zero-datasources/placeholder-for-git rename to pkg/services/provisioning/datasources/test-configs/zero-datasources/placeholder-for-git diff --git a/pkg/services/provisioning/datasource/types.go b/pkg/services/provisioning/datasources/types.go similarity index 99% rename from pkg/services/provisioning/datasource/types.go rename to pkg/services/provisioning/datasources/types.go index 6434074d5d4..ee2175d6a90 100644 --- a/pkg/services/provisioning/datasource/types.go +++ b/pkg/services/provisioning/datasources/types.go @@ -1,4 +1,4 @@ -package datasource +package datasources import "github.com/grafana/grafana/pkg/models" import "github.com/grafana/grafana/pkg/components/simplejson" diff --git a/pkg/services/provisioning/provisioning.go b/pkg/services/provisioning/provisioning.go index c72ba6dc4f5..aa3610b596f 100644 --- a/pkg/services/provisioning/provisioning.go +++ b/pkg/services/provisioning/provisioning.go @@ -4,19 +4,19 @@ import ( "context" "path/filepath" - "github.com/grafana/grafana/pkg/services/provisioning/dashboard" - "github.com/grafana/grafana/pkg/services/provisioning/datasource" + "github.com/grafana/grafana/pkg/services/provisioning/dashboards" + "github.com/grafana/grafana/pkg/services/provisioning/datasources" ini "gopkg.in/ini.v1" ) func Init(ctx context.Context, homePath string, cfg *ini.File) error { datasourcePath := makeAbsolute(cfg.Section("paths").Key("datasources").String(), homePath) - if err := datasource.Provision(datasourcePath); err != nil { + if err := datasources.Provision(datasourcePath); err != nil { return err } dashboardPath := makeAbsolute(cfg.Section("paths").Key("dashboards").String(), homePath) - _, err := dashboard.Provision(ctx, dashboardPath) + _, err := dashboards.Provision(ctx, dashboardPath) if err != nil { return err }