chore: move enable search to US configuration (#114070)

pkg/storage/unified/README.md

@@ -253,16 +253,18 @@ go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
 - to compile all protobuf files in the repository run `make protobuf` at its top level
 
 ## Setting up search
-To enable it, add the following to your `custom.ini` under the `[feature_toggles]` section:
+To enable it, add the following to your `custom.ini` under the `[feature_toggles]` and `[unified_storage]` sections:
 ```ini
 [feature_toggles]
 ; Used by the Grafana instance
 unifiedStorageSearchUI = true
 
-; Used by unified storage
-unifiedStorageSearch = true
 ; (optional) Allows you to sort dashboards by usage insights fields when using enterprise
 ; unifiedStorageSearchSprinkles = true
+
+[unified_storage]
+; Used by unified storage server
+enable_search = true
 ```
 
 The dashboard search page has been set up to search unified storage. Additionally, all legacy search calls (e.g. `/api/search`) will go to
@@ -371,10 +373,10 @@ mode = "on-prem"
 
 [feature_toggles]
 unifiedStorage = true
-unifiedStorageSearch = true
 
 [unified_storage]
 enable_sharding = true
+enable_search = true
 instance_id = node-0
 memberlist_bind_addr = "127.0.0.2"
 memberlist_advertise_addr = "127.0.0.2"
@@ -873,20 +875,22 @@ Unified Search requires several feature flags to be enabled depending on the des
 
 | Feature Flag | Purpose | Stage | Required For |
 |--------------|---------|-------|--------------|
-| `unifiedStorageSearch` | Core search functionality | Experimental | Search API servers, indexing |
 | `unifiedStorageSearchUI` | Frontend search interface | Experimental | Grafana UI search |
 | `unifiedStorageSearchSprinkles` | Usage insights integration | Experimental | Dashboard usage sorting (Enterprise) |
 | `unifiedStorageSearchDualReaderEnabled` | Shadow traffic to unified search | Experimental | Shadow traffic during migration |
 
+#### Unified Search Specific Configuration
+
+| Configuration   | Purpose | Stage | Required For |
+|-----------------|---------|-------|--------------|
+| `enable_search` | Core search functionality | Experimental | Search API servers, indexing |
+
 #### Basic Configuration
 ```ini
 [feature_toggles]
 ; Prerequisites for unified storage (required)
 grafanaAPIServerWithExperimentalAPIs = true
 
-; Core search functionality (required)
-unifiedStorageSearch = true
-
 ; Enable search UI (required for frontend)
 unifiedStorageSearchUI = true
 
@@ -895,6 +899,10 @@ unifiedStorageSearchDualReaderEnabled = true
 
 ; Enable usage insights sorting (Enterprise only)
 unifiedStorageSearchSprinkles = true
+
+[unified_storage]
+; Enable core search functionality (required)
+enable_search = true
 ```
 
 ### Request Flow Diagrams

pkg/storage/unified/search/options.go

@@ -21,7 +21,7 @@ func NewSearchOptions(
 	ownsIndexFn func(key resource.NamespacedResource) (bool, error),
 ) (resource.SearchOptions, error) {
 	//nolint:staticcheck // not yet migrated to OpenFeature
-	if features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearch) || features.IsEnabledGlobally(featuremgmt.FlagProvisioning) {
+	if cfg.EnableSearch || features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageSearch) || features.IsEnabledGlobally(featuremgmt.FlagProvisioning) {
 		root := cfg.IndexPath
 		if root == "" {
 			root = filepath.Join(cfg.DataPath, "unified-search", "bleve")