dashboards as cfg: revert minor changes

pkg/api/dashboard.go

@@ -3,6 +3,7 @@ package api
 import (
 import (
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
+	//"github.com/grafana/grafana/pkg/services/dashboards"
 	"os"
 	"os"
 	"path"
 	"path"
 	"strings"
 	"strings"
@@ -124,6 +125,12 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
 
 
 	dash := cmd.GetDashboardModel()
 	dash := cmd.GetDashboardModel()
 
 
+	// dashItem := &dashboards.SaveDashboardItem{
+	// 	Dashboard: dash,
+	// 	Message:   cmd.Message,
+	// }
+	// err := dashboards.SaveDashboard(dashItem)
+
 	// Check if Title is empty
 	// Check if Title is empty
 	if dash.Title == "" {
 	if dash.Title == "" {
 		return ApiError(400, m.ErrDashboardTitleEmpty.Error(), nil)
 		return ApiError(400, m.ErrDashboardTitleEmpty.Error(), nil)

pkg/services/provisioning/dashboard/config_reader.go → pkg/services/provisioning/dashboards/config_reader.go

-package dashboard
+package dashboards
 
 
 import (
 import (
 	"io/ioutil"
 	"io/ioutil"

pkg/services/provisioning/dashboard/dashboard.go → pkg/services/provisioning/dashboards/dashboard.go

-package dashboard
+package dashboards
 
 
 import (
 import (
 	"context"
 	"context"

pkg/services/provisioning/dashboard/dashboard_test.go → pkg/services/provisioning/dashboards/dashboard_test.go

-package dashboard
+package dashboards
 
 
 import (
 import (
 	"testing"
 	"testing"

pkg/services/provisioning/dashboard/file_reader.go → pkg/services/provisioning/dashboards/file_reader.go

-package dashboard
+package dashboards
 
 
 import (
 import (
 	"context"
 	"context"

pkg/services/provisioning/dashboard/file_reader_test.go → pkg/services/provisioning/dashboards/file_reader_test.go

-package dashboard
+package dashboards
 
 
 import (
 import (
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/bus"

pkg/services/provisioning/dashboard/types.go → pkg/services/provisioning/dashboards/types.go

-package dashboard
+package dashboards
 
 
 import (
 import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/components/simplejson"

pkg/services/provisioning/datasource/datasources.go → pkg/services/provisioning/datasources/datasources.go

-package datasource
+package datasources
 
 
 import (
 import (
 	"errors"
 	"errors"

pkg/services/provisioning/datasource/datasources_test.go → pkg/services/provisioning/datasources/datasources_test.go

-package datasource
+package datasources
 
 
 import (
 import (
 	"testing"
 	"testing"

pkg/services/provisioning/datasource/types.go → pkg/services/provisioning/datasources/types.go

-package datasource
+package datasources
 
 
 import "github.com/grafana/grafana/pkg/models"
 import "github.com/grafana/grafana/pkg/models"
 import "github.com/grafana/grafana/pkg/components/simplejson"
 import "github.com/grafana/grafana/pkg/components/simplejson"

pkg/services/provisioning/provisioning.go

@@ -4,19 +4,19 @@ import (
 	"context"
 	"context"
 	"path/filepath"
 	"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"
 	ini "gopkg.in/ini.v1"
 )
 )
 
 
 func Init(ctx context.Context, homePath string, cfg *ini.File) error {
 func Init(ctx context.Context, homePath string, cfg *ini.File) error {
 	datasourcePath := makeAbsolute(cfg.Section("paths").Key("datasources").String(), homePath)
 	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
 		return err
 	}
 	}
 
 
 	dashboardPath := makeAbsolute(cfg.Section("paths").Key("dashboards").String(), homePath)
 	dashboardPath := makeAbsolute(cfg.Section("paths").Key("dashboards").String(), homePath)
-	_, err := dashboard.Provision(ctx, dashboardPath)
+	_, err := dashboards.Provision(ctx, dashboardPath)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}