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

Search fallback: prevent for now (#99725)

Browse Source
This commit is contained in:
Stephanie Hingtgen 2025-01-28 19:57:34 -07:00 committed by GitHub
parent 745a25ad0a
commit 6908f91428
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/registry/apis/dashboard/search_test.go
View File

@ -7,15 +7,14 @@ import (
"testing" "testing"
"github.com/grafana/grafana/pkg/apimachinery/identity" "github.com/grafana/grafana/pkg/apimachinery/identity"
"github.com/grafana/grafana/pkg/apiserver/rest"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/infra/tracing" "github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/services/user" "github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/storage/unified/resource" "github.com/grafana/grafana/pkg/storage/unified/resource"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
/* Temporarily disabled search fallback while we add functionality
func TestSearchFallback(t *testing.T) { func TestSearchFallback(t *testing.T) {
t.Run("should hit legacy search handler on mode 0", func(t *testing.T) { t.Run("should hit legacy search handler on mode 0", func(t *testing.T) {
mockClient := &MockClient{} mockClient := &MockClient{}
@ -172,7 +171,7 @@ func TestSearchFallback(t *testing.T) {
t.Fatalf("expected Search NOT to be called, but it was") t.Fatalf("expected Search NOT to be called, but it was")
} }
}) })
} }*/
func TestSearchHandlerFields(t *testing.T) { func TestSearchHandlerFields(t *testing.T) {
// Create a mock client // Create a mock client

2
pkg/storage/unified/resource/go.mod
View File

@ -17,7 +17,6 @@ require (
github.com/grafana/grafana v11.4.0-00010101000000-000000000000+incompatible github.com/grafana/grafana v11.4.0-00010101000000-000000000000+incompatible
github.com/grafana/grafana-plugin-sdk-go v0.263.0 github.com/grafana/grafana-plugin-sdk-go v0.263.0
github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250121113133-e747350fee2d github.com/grafana/grafana/pkg/apimachinery v0.0.0-20250121113133-e747350fee2d
github.com/grafana/grafana/pkg/apiserver v0.0.0-20250121113133-e747350fee2d
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/hashicorp/golang-lru/v2 v2.0.7
github.com/prometheus/client_golang v1.20.5 github.com/prometheus/client_golang v1.20.5
@ -121,6 +120,7 @@ require (
github.com/grafana/grafana-app-sdk/logging v0.29.0 // indirect github.com/grafana/grafana-app-sdk/logging v0.29.0 // indirect
github.com/grafana/grafana-aws-sdk v0.31.5 // indirect github.com/grafana/grafana-aws-sdk v0.31.5 // indirect
github.com/grafana/grafana-azure-sdk-go/v2 v2.1.6 // indirect github.com/grafana/grafana-azure-sdk-go/v2 v2.1.6 // indirect
github.com/grafana/grafana/pkg/apiserver v0.0.0-20250121113133-e747350fee2d // indirect
github.com/grafana/otel-profiling-go v0.5.1 // indirect github.com/grafana/otel-profiling-go v0.5.1 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect
github.com/grafana/sqlds/v4 v4.1.3 // indirect github.com/grafana/sqlds/v4 v4.1.3 // indirect

6
pkg/storage/unified/resource/search_client.go
View File

@ -1,12 +1,11 @@
package resource package resource
import ( import (
"github.com/grafana/grafana/pkg/apiserver/rest"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )
func NewSearchClient(cfg *setting.Cfg, unifiedStorageConfigKey string, unifiedClient ResourceIndexClient, legacyClient ResourceIndexClient) ResourceIndexClient { func NewSearchClient(cfg *setting.Cfg, unifiedStorageConfigKey string, unifiedClient ResourceIndexClient, legacyClient ResourceIndexClient) ResourceIndexClient {
config, ok := cfg.UnifiedStorage[unifiedStorageConfigKey] /*config, ok := cfg.UnifiedStorage[unifiedStorageConfigKey]
if !ok { if !ok {
return legacyClient return legacyClient
} }
@ -16,5 +15,6 @@ func NewSearchClient(cfg *setting.Cfg, unifiedStorageConfigKey string, unifiedCl
return legacyClient return legacyClient
default: default:
return unifiedClient return unifiedClient
} }*/
return unifiedClient
} }