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: expose dashboard service as interface

Browse Source
This commit is contained in:
bergquist 2017-12-01 14:20:52 +01:00
parent 16f072b320
commit f5eac2e91d
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dashboard.go
View File

@ -142,7 +142,7 @@ func PostDashboard(c *middleware.Context, cmd m.SaveDashboardCommand) Response {
UserId: c.UserId,
}
dashboard, err := dashboards.SaveDashboard(dashItem)
dashboard, err := dashboards.GetRepository().SaveDashboard(dashItem)
if err == m.ErrDashboardTitleEmpty {
return ApiError(400, m.ErrDashboardTitleEmpty.Error(), nil)

19
pkg/services/dashboards/dashboards.go
View File

@ -1,14 +1,25 @@
package dashboards
import (
"time"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
"time"
)
type Repository interface {
SaveDashboard(*SaveDashboardItem) error
SaveDashboard(*SaveDashboardItem) (*models.Dashboard, error)
}
var repositoryInstance Repository
func GetRepository() Repository {
return repositoryInstance
}
func SetRepository(rep Repository) {
repositoryInstance = rep
}
type SaveDashboardItem struct {
@ -22,7 +33,9 @@ type SaveDashboardItem struct {
Dashboard *models.Dashboard
}
func SaveDashboard(json *SaveDashboardItem) (*models.Dashboard, error) {
type dashboardRepository struct{}
func (dr *dashboardRepository) SaveDashboard(json *SaveDashboardItem) (*models.Dashboard, error) {
dashboard := json.Dashboard
if dashboard.Title == "" {

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

@ -3,12 +3,13 @@ package dashboards
import (
"context"
"fmt"
"github.com/grafana/grafana/pkg/services/dashboards"
"os"
"path/filepath"
"strings"
"time"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
@ -21,6 +22,7 @@ type fileReader struct {
Path string
log log.Logger
dashboardCache *dashboardCache
dashboardRepo dashboards.Repository
}
func NewDashboardFilereader(cfg *DashboardsAsConfig, log log.Logger) (*fileReader, error) {
@ -37,6 +39,7 @@ func NewDashboardFilereader(cfg *DashboardsAsConfig, log log.Logger) (*fileReade
Cfg: cfg,
Path: path,
log: log,
dashboardRepo: dashboards.GetRepository(),
dashboardCache: newDashboardCache(),
}, nil
}
@ -96,7 +99,7 @@ func (fr *fileReader) walkFolder() error {
if err == models.ErrDashboardNotFound {
fr.log.Debug("saving new dashboard", "file", path)
_, err = dashboards.SaveDashboard(dash)
_, err = fr.dashboardRepo.SaveDashboard(dash)
return err
}
@ -110,7 +113,7 @@ func (fr *fileReader) walkFolder() error {
}
fr.log.Debug("no dashboard in cache. loading dashboard from disk into database.", "file", path)
_, err = dashboards.SaveDashboard(dash)
_, err = fr.dashboardRepo.SaveDashboard(dash)
return err
})
}