public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: remove dashboardsFromStorage (#65058)

Browse Source
This commit is contained in:
Ryan McKinley
2023-03-20 18:36:49 +02:00
committed by GitHub
parent fbb0dcb0ca
commit 91a4b8b529
16 changed files with 12 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/annotations.go
+1 -6
View File
@@ -13,7 +13,6 @@ import (
"github.com/grafana/grafana/pkg/services/annotations"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/services/org"
"github.com/grafana/grafana/pkg/services/user"
@@ -53,11 +52,7 @@ func (hs *HTTPServer) GetAnnotations(c *contextmodel.ReqContext) response.Respon
dq := dashboards.GetDashboardQuery{UID: query.DashboardUID, OrgID: c.OrgID}
dqResult, err := hs.DashboardService.GetDashboard(c.Req.Context(), &dq)
if err != nil {
if hs.Features.IsEnabled(featuremgmt.FlagDashboardsFromStorage) {
// OK... the storage UIDs do not (yet?) exist in the DashboardService
} else {
return response.Error(http.StatusBadRequest, "Invalid dashboard UID in annotation request", err)
}
return response.Error(http.StatusBadRequest, "Invalid dashboard UID in annotation request", err)
} else {
query.DashboardID = dqResult.ID
}