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

Chore: Move search model from models package to search service (#62215)

Browse Source 
* Chore: Move search model from models package to search service

* Remove unused imports

* Cleanup after merge
This commit is contained in:
idafurjes
2023-01-30 15:17:53 +01:00
committed by GitHub
parent 780f43a33d
commit 3bda112c5f
13 changed files with 127 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/alerting.go
+3 -3
View File
@@ -9,7 +9,6 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/alerting"
alertmodels "github.com/grafana/grafana/pkg/services/alerting/models"
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
@@ -19,6 +18,7 @@ import (
"github.com/grafana/grafana/pkg/services/ngalert/notifier/channels_config"
"github.com/grafana/grafana/pkg/services/notifications"
"github.com/grafana/grafana/pkg/services/search"
"github.com/grafana/grafana/pkg/services/search/model"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/web"
@@ -109,7 +109,7 @@ func (hs *HTTPServer) GetAlerts(c *contextmodel.ReqContext) response.Response {
Limit: 1000,
OrgId: c.OrgID,
DashboardIds: dashboardIDs,
Type: string(models.DashHitDB),
Type: string(model.DashHitDB),
FolderIds: folderIDs,
Permission: dashboards.PERMISSION_VIEW,
}
@@ -120,7 +120,7 @@ func (hs *HTTPServer) GetAlerts(c *contextmodel.ReqContext) response.Response {
}
for _, d := range searchQuery.Result {
if d.Type == models.DashHitDB && d.ID > 0 {
if d.Type == model.DashHitDB && d.ID > 0 {
dashboardIDs = append(dashboardIDs, d.ID)
}
}