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

UnifiedSearch: Use ResourceIndex from dashboards apiserver (v0alpha1 only) (#96939)

Browse Source
This commit is contained in:
Ryan McKinley
2024-11-27 08:57:53 +03:00
committed by GitHub
parent 104f795156
commit f6ccf976e5
46 changed files with 1611 additions and 3447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/tsdb/grafanads/grafana.go
View File

@@ -7,18 +7,17 @@ import (
"fmt"
"path/filepath"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/data"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/services/datasources"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/searchV2"
"github.com/grafana/grafana/pkg/services/store"
"github.com/grafana/grafana/pkg/services/unifiedSearch"
testdatasource "github.com/grafana/grafana/pkg/tsdb/grafana-testdata-datasource"
)
@@ -53,17 +52,16 @@ var (
)
)
func ProvideService(search searchV2.SearchService, searchNext unifiedSearch.SearchService, store store.StorageService, features featuremgmt.FeatureToggles) *Service {
return newService(search, searchNext, store, features)
func ProvideService(search searchV2.SearchService, store store.StorageService, features featuremgmt.FeatureToggles) *Service {
return newService(search, store, features)
}
func newService(search searchV2.SearchService, searchNext unifiedSearch.SearchService, store store.StorageService, features featuremgmt.FeatureToggles) *Service {
func newService(search searchV2.SearchService, store store.StorageService, features featuremgmt.FeatureToggles) *Service {
s := &Service{
search: search,
searchNext: searchNext,
store: store,
log: log.New("grafanads"),
features: features,
search: search,
store: store,
log: log.New("grafanads"),
features: features,
}
return s
@@ -71,11 +69,10 @@ func newService(search searchV2.SearchService, searchNext unifiedSearch.SearchSe
// Service exists regardless of user settings
type Service struct {
search searchV2.SearchService
searchNext unifiedSearch.SearchService
store store.StorageService
log log.Logger
features featuremgmt.FeatureToggles
search searchV2.SearchService
store store.StorageService
log log.Logger
features featuremgmt.FeatureToggles
}
func DataSourceModel(orgId int64) *datasources.DataSource {
@@ -191,10 +188,6 @@ func (s *Service) doSearchQuery(ctx context.Context, req *backend.QueryDataReque
}
}
if s.features.IsEnabled(ctx, featuremgmt.FlagUnifiedStorageSearch) {
return *s.searchNext.DoQuery(ctx, req.PluginContext.User, req.PluginContext.OrgID, m.SearchNext)
}
searchReadinessCheckResp := s.search.IsReady(ctx, req.PluginContext.OrgID)
if !searchReadinessCheckResp.IsReady {
dashboardSearchNotServedRequestsCounter.With(prometheus.Labels{
@@ -214,7 +207,6 @@ func (s *Service) doSearchQuery(ctx context.Context, req *backend.QueryDataReque
}
type requestModel struct {
QueryType string `json:"queryType"`
Search searchV2.DashboardQuery `json:"search,omitempty"`
SearchNext unifiedSearch.Query `json:"searchNext,omitempty"`
QueryType string `json:"queryType"`
Search searchV2.DashboardQuery `json:"search,omitempty"`
}