diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index e8b2524d556..40dc24a523d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -814,6 +814,7 @@ export interface FeatureToggles { unifiedStorageSearchSprinkles?: boolean; /** * Enable permission filtering on unified storage search + * @default true */ unifiedStorageSearchPermissionFiltering?: boolean; /** diff --git a/pkg/registry/apis/dashboard/search.go b/pkg/registry/apis/dashboard/search.go index 236652d8dd5..86967a9f5d3 100644 --- a/pkg/registry/apis/dashboard/search.go +++ b/pkg/registry/apis/dashboard/search.go @@ -407,6 +407,7 @@ func asResourceKey(ns string, k string) (*resource.ResourceKey, error) { func (s *SearchHandler) getDashboardsUIDsSharedWithUser(ctx context.Context, user identity.Requester) ([]string, error) { if !s.features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearchPermissionFiltering) { + s.log.Warn("Tried to search for 'sharedwithme' dashboards with ", featuremgmt.FlagUnifiedStorageSearchPermissionFiltering, " disabled") return []string{}, nil } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 0b2003074b9..320342ff7e2 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1399,8 +1399,9 @@ var ( { Name: "unifiedStorageSearchPermissionFiltering", Description: "Enable permission filtering on unified storage search", - Stage: FeatureStageExperimental, + Stage: FeatureStageGeneralAvailability, Owner: grafanaSearchAndStorageSquad, + Expression: "true", HideFromDocs: true, HideFromAdminPage: true, }, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index e1b5bfda43a..b86059bd2be 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -183,7 +183,7 @@ useSessionStorageForRedirection,GA,@grafana/identity-access-team,false,false,fal rolePickerDrawer,experimental,@grafana/identity-access-team,false,false,false unifiedStorageSearch,experimental,@grafana/search-and-storage,false,false,false unifiedStorageSearchSprinkles,experimental,@grafana/search-and-storage,false,false,false -unifiedStorageSearchPermissionFiltering,experimental,@grafana/search-and-storage,false,false,false +unifiedStorageSearchPermissionFiltering,GA,@grafana/search-and-storage,false,false,false managedDualWriter,experimental,@grafana/search-and-storage,false,false,false pluginsSriChecks,GA,@grafana/plugins-platform-backend,false,false,false unifiedStorageBigObjectsSupport,experimental,@grafana/search-and-storage,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 6de694f18da..3f65b33ffc0 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -4263,15 +4263,19 @@ { "metadata": { "name": "unifiedStorageSearchPermissionFiltering", - "resourceVersion": "1737489629408", - "creationTimestamp": "2025-01-22T11:38:37Z" + "resourceVersion": "1742564039800", + "creationTimestamp": "2025-01-22T11:38:37Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-03-21 13:33:59.800619 +0000 UTC" + } }, "spec": { "description": "Enable permission filtering on unified storage search", - "stage": "experimental", + "stage": "GA", "codeowner": "@grafana/search-and-storage", "hideFromAdminPage": true, - "hideFromDocs": true + "hideFromDocs": true, + "expression": "true" } }, {