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: logs error when trying to import dashboard with id

Browse Source 
dashboard json cannot contain fixed id when importing from
disk. We used to override this but it didnt caught all problems
so now we block dashboards from beeing imported instead.

closes #10504
This commit is contained in:
bergquist
2018-01-15 12:21:14 +01:00
parent 3951df136c
commit 1a6c2ea8d8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,13 +156,15 @@ func createWalkFn(fr *fileReader, folderId int64) filepath.WalkFunc {
return nil return nil
} }
// id = 0 indicates ID validation should be avoided before writing to the db. if dash.Dashboard.Id != 0 {
dash.Dashboard.Id = 0 fr.log.Error("Cannot provision dashboard. Please remove the id property from the json file")
return nil
}
cmd := &models.GetDashboardQuery{Slug: dash.Dashboard.Slug} cmd := &models.GetDashboardQuery{Slug: dash.Dashboard.Slug}
err = bus.Dispatch(cmd) err = bus.Dispatch(cmd)
// if we dont have the dashboard in the db, save it! // if we don't have the dashboard in the db, save it!
if err == models.ErrDashboardNotFound { if err == models.ErrDashboardNotFound {
fr.log.Debug("saving new dashboard", "file", path) fr.log.Debug("saving new dashboard", "file", path)
_, err = fr.dashboardRepo.SaveDashboard(dash) _, err = fr.dashboardRepo.SaveDashboard(dash)
@@ -181,6 +183,7 @@ func createWalkFn(fr *fileReader, folderId int64) filepath.WalkFunc {
fr.log.Debug("loading dashboard from disk into database.", "file", path) fr.log.Debug("loading dashboard from disk into database.", "file", path)
_, err = fr.dashboardRepo.SaveDashboard(dash) _, err = fr.dashboardRepo.SaveDashboard(dash)
return err return err
} }
} }

1
pkg/services/provisioning/dashboards/types.go
View File

@@ -24,6 +24,7 @@ func createDashboardJson(data *simplejson.Json, lastModified time.Time, cfg *Das
dash.UpdatedAt = lastModified dash.UpdatedAt = lastModified
dash.Overwrite = true dash.Overwrite = true
dash.OrgId = cfg.OrgId dash.OrgId = cfg.OrgId
dash.Dashboard.OrgId = cfg.OrgId
dash.Dashboard.FolderId = folderId dash.Dashboard.FolderId = folderId
if !cfg.Editable { if !cfg.Editable {
dash.Dashboard.Data.Set("editable", cfg.Editable) dash.Dashboard.Data.Set("editable", cfg.Editable)