From 2cf6a6388ba36246ed425664783682a0be4f37f8 Mon Sep 17 00:00:00 2001
From: Josh Hunt <joshhunt@users.noreply.github.com>
Date: Wed, 23 Oct 2024 12:18:33 +0100
Subject: [PATCH] Combobox: Add prometheusUsesCombobox feature toggle (#95238)

Add prometheusUsesCombobox feature toggle
---
 .../configure-grafana/feature-toggles/index.md    |  1 +
 .../grafana-data/src/types/featureToggles.gen.ts  |  1 +
 pkg/services/featuremgmt/registry.go              |  6 ++++++
 pkg/services/featuremgmt/toggles_gen.csv          |  1 +
 pkg/services/featuremgmt/toggles_gen.go           |  4 ++++
 pkg/services/featuremgmt/toggles_gen.json         | 15 +++++++++++++++
 6 files changed, 28 insertions(+)

diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
index f42107f4a77..972439653ac 100644
--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -212,6 +212,7 @@ Experimental features might be changed or removed without prior notice.
 | `pluginsSriChecks`                            | Enables SRI checks for plugin assets                                                                                                                                                                                                                                              |
 | `unifiedStorageBigObjectsSupport`             | Enables to save big objects in blob storage                                                                                                                                                                                                                                       |
 | `timeRangeProvider`                           | Enables time pickers sync                                                                                                                                                                                                                                                         |
+| `prometheusUsesCombobox`                      | Use new combobox component for Prometheus query editor                                                                                                                                                                                                                            |
 
 ## Development feature toggles
 
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 8d353c72133..ac423666cd9 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -223,4 +223,5 @@ export interface FeatureToggles {
   pluginsSriChecks?: boolean;
   unifiedStorageBigObjectsSupport?: boolean;
   timeRangeProvider?: boolean;
+  prometheusUsesCombobox?: boolean;
 }
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 2b675fde98e..d3ff4aa7755 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -1535,6 +1535,12 @@ var (
 			Stage:       FeatureStageExperimental,
 			Owner:       grafanaFrontendPlatformSquad,
 		},
+		{
+			Name:        "prometheusUsesCombobox",
+			Description: "Use new combobox component for Prometheus query editor",
+			Stage:       FeatureStageExperimental,
+			Owner:       grafanaObservabilityMetricsSquad,
+		},
 	}
 )
 
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 35f2c3d088f..4718a0d7ffa 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -204,3 +204,4 @@ unifiedStorageSearch,experimental,@grafana/search-and-storage,false,false,false
 pluginsSriChecks,experimental,@grafana/plugins-platform-backend,false,false,false
 unifiedStorageBigObjectsSupport,experimental,@grafana/search-and-storage,false,false,false
 timeRangeProvider,experimental,@grafana/grafana-frontend-platform,false,false,false
+prometheusUsesCombobox,experimental,@grafana/observability-metrics,false,false,false
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index 9dd410ac488..921f061f555 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -826,4 +826,8 @@ const (
 	// FlagTimeRangeProvider
 	// Enables time pickers sync
 	FlagTimeRangeProvider = "timeRangeProvider"
+
+	// FlagPrometheusUsesCombobox
+	// Use new combobox component for Prometheus query editor
+	FlagPrometheusUsesCombobox = "prometheusUsesCombobox"
 )
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 6cd1326ee79..2e08fb55bf1 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2587,6 +2587,21 @@
         "codeowner": "@grafana/observability-metrics"
       }
     },
+    {
+      "metadata": {
+        "name": "prometheusUsesCombobox",
+        "resourceVersion": "1726140033271",
+        "creationTimestamp": "2024-09-12T11:19:18Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2024-09-12 11:20:33.271822988 +0000 UTC"
+        }
+      },
+      "spec": {
+        "description": "Use new combobox component for Prometheus query editor",
+        "stage": "experimental",
+        "codeowner": "@grafana/observability-metrics"
+      }
+    },
     {
       "metadata": {
         "name": "publicDashboards",