From 649e9aa8ca9e8f7f16e9198b3858aaf12714a6a8 Mon Sep 17 00:00:00 2001
From: Ezequiel Victorero <ezequiel.victorero@grafana.com>
Date: Mon, 25 Aug 2025 18:22:09 -0300
Subject: [PATCH] SavedQueries: Create feature flag (#109944)

---
 .../src/types/featureToggles.gen.ts           |  6 +++++-
 pkg/services/featuremgmt/registry.go          | 10 ++++++++-
 pkg/services/featuremgmt/toggles_gen.csv      |  1 +
 pkg/services/featuremgmt/toggles_gen.go       |  6 +++++-
 pkg/services/featuremgmt/toggles_gen.json     | 21 ++++++++++++++++---
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index 4cd790e7148..9ab694d9d58 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -527,10 +527,14 @@ export interface FeatureToggles {
   */
   grafanaManagedRecordingRules?: boolean;
   /**
-  * Enables Query Library feature in Explore
+  * Renamed feature toggle, enables Saved queries feature
   */
   queryLibrary?: boolean;
   /**
+  * Enables Saved Queries feature
+  */
+  savedQueries?: boolean;
+  /**
   * Sets the logs table as default visualisation in logs explore
   */
   logsExploreTableDefaultVisualization?: boolean;
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 5b94492d18c..7807eaee089 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -905,7 +905,15 @@ var (
 		},
 		{
 			Name:           "queryLibrary",
-			Description:    "Enables Query Library feature in Explore",
+			Description:    "Renamed feature toggle, enables Saved queries feature",
+			Stage:          FeatureStagePrivatePreview,
+			Owner:          grafanaSharingSquad,
+			FrontendOnly:   false,
+			AllowSelfServe: false,
+		},
+		{
+			Name:           "savedQueries",
+			Description:    "Enables Saved Queries feature",
 			Stage:          FeatureStagePrivatePreview,
 			Owner:          grafanaSharingSquad,
 			FrontendOnly:   false,
diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv
index 46303a7f960..a59feb73671 100644
--- a/pkg/services/featuremgmt/toggles_gen.csv
+++ b/pkg/services/featuremgmt/toggles_gen.csv
@@ -118,6 +118,7 @@ cloudWatchNewLabelParsing,GA,@grafana/aws-datasources,false,false,false
 disableNumericMetricsSortingInExpressions,experimental,@grafana/oss-big-tent,false,true,false
 grafanaManagedRecordingRules,experimental,@grafana/alerting-squad,false,false,false
 queryLibrary,privatePreview,@grafana/sharing-squad,false,false,false
+savedQueries,privatePreview,@grafana/sharing-squad,false,false,false
 logsExploreTableDefaultVisualization,experimental,@grafana/observability-logs,false,false,true
 newDashboardSharingComponent,GA,@grafana/sharing-squad,false,false,true
 alertingListViewV2,privatePreview,@grafana/alerting-squad,false,false,true
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index ee14a3e8f6c..da56b91fa61 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -480,9 +480,13 @@ const (
 	FlagGrafanaManagedRecordingRules = "grafanaManagedRecordingRules"
 
 	// FlagQueryLibrary
-	// Enables Query Library feature in Explore
+	// Renamed feature toggle, enables Saved queries feature
 	FlagQueryLibrary = "queryLibrary"
 
+	// FlagSavedQueries
+	// Enables Saved Queries feature
+	FlagSavedQueries = "savedQueries"
+
 	// FlagLogsExploreTableDefaultVisualization
 	// Sets the logs table as default visualisation in logs explore
 	FlagLogsExploreTableDefaultVisualization = "logsExploreTableDefaultVisualization"
diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json
index 21d57f33c52..367fcdf165a 100644
--- a/pkg/services/featuremgmt/toggles_gen.json
+++ b/pkg/services/featuremgmt/toggles_gen.json
@@ -2667,12 +2667,15 @@
     {
       "metadata": {
         "name": "queryLibrary",
-        "resourceVersion": "1753448760331",
+        "resourceVersion": "1755721444487",
         "creationTimestamp": "2022-10-07T18:31:45Z",
-        "deletionTimestamp": "2023-03-20T16:00:14Z"
+        "deletionTimestamp": "2023-03-20T16:00:14Z",
+        "annotations": {
+          "grafana.app/updatedTimestamp": "2025-08-20 20:24:04.487598 +0000 UTC"
+        }
       },
       "spec": {
-        "description": "Enables Query Library feature in Explore",
+        "description": "Renamed feature toggle, enables Saved queries feature",
         "stage": "privatePreview",
         "codeowner": "@grafana/sharing-squad"
       }
@@ -2849,6 +2852,18 @@
         "codeowner": "@grafana/identity-access-team"
       }
     },
+    {
+      "metadata": {
+        "name": "savedQueries",
+        "resourceVersion": "1755721444487",
+        "creationTimestamp": "2025-08-20T20:24:04Z"
+      },
+      "spec": {
+        "description": "Enables Saved Queries feature",
+        "stage": "privatePreview",
+        "codeowner": "@grafana/sharing-squad"
+      }
+    },
     {
       "metadata": {
         "name": "scanRowInvalidDashboardParseFallbackEnabled",