From bc3a3ba74eb18afce60d27d1d4bcbfefe7049fa0 Mon Sep 17 00:00:00 2001
From: Alex Spencer <52186778+alexjonspencer1@users.noreply.github.com>
Date: Wed, 26 Nov 2025 13:09:45 -0800
Subject: [PATCH] remake toggles post merge conflict

---
 .../grafana-data/src/types/featureToggles.gen.ts   |  5 +++++
 pkg/services/featuremgmt/toggles_gen.csv           |  1 +
 pkg/services/featuremgmt/toggles_gen.json          | 14 ++++++++++++++
 3 files changed, 20 insertions(+)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 40f2abe4d73..00943674300 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -1189,4 +1189,9 @@ export interface FeatureToggles {
   * @default false
   */
   rudderstackUpgrade?: boolean;
+  /**
+  * Enables the new correlations editor in Explore
+  * @default false
+  */
+  correlationsExploreEditor?: boolean;
 }
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index f161087ecb1..c2aaf057d8e 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -266,3 +266,4 @@ transformationsEmptyPlaceholder,preview,@grafana/datapro,false,false,true
 ttlPluginInstanceManager,experimental,@grafana/plugins-platform-backend,false,false,true
 lokiQueryLimitsContext,experimental,@grafana/observability-logs,false,false,true
 rudderstackUpgrade,experimental,@grafana/grafana-frontend-platform,false,false,true
+correlationsExploreEditor,experimental,@grafana/datapro,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 8dee7f8206b..98b076cc221 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -923,6 +923,20 @@
         "hideFromDocs": true
       }
     },
+    {
+      "metadata": {
+        "name": "correlationsExploreEditor",
+        "resourceVersion": "1764191352059",
+        "creationTimestamp": "2025-11-26T21:09:12Z"
+      },
+      "spec": {
+        "description": "Enables the new correlations editor in Explore",
+        "stage": "experimental",
+        "codeowner": "@grafana/datapro",
+        "frontend": true,
+        "expression": "false"
+      }
+    },
     {
       "metadata": {
         "name": "crashDetection",