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 8425568706e..f387da5857b 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -103,7 +103,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `regressionTransformation` | Enables regression analysis transformation | | `alertingSaveStateCompressed` | Enables the compressed protobuf-based alert state storage | | `sqlExpressions` | Enables SQL Expressions, which can execute SQL queries against data source results. | -| `savedQueries` | Enables Saved Queries feature | +| `queryLibrary` | Enables Saved queries (query library) feature | | `enableSCIM` | Enables SCIM support for user and group management | | `alertRuleRestore` | Enables the alert rule restore feature | | `azureMonitorLogsBuilderEditor` | Enables the logs builder mode for the Azure Monitor data source | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 3d92d782abe..58cf53cfb2d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -549,14 +549,10 @@ export interface FeatureToggles { */ grafanaManagedRecordingRules?: boolean; /** - * Renamed feature toggle, enables Saved queries feature + * Enables Saved queries (query library) 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 dc710222b16..15bf3d45d39 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -942,15 +942,7 @@ var ( }, { Name: "queryLibrary", - Description: "Renamed feature toggle, enables Saved queries feature", - Stage: FeatureStagePrivatePreview, - Owner: grafanaSharingSquad, - FrontendOnly: false, - AllowSelfServe: false, - }, - { - Name: "savedQueries", - Description: "Enables Saved Queries feature", + Description: "Enables Saved queries (query library) feature", Stage: FeatureStagePublicPreview, Owner: grafanaSharingSquad, FrontendOnly: false, diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index c2642ddffbe..a1f04785edc 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -122,8 +122,7 @@ newDashboardWithFiltersAndGroupBy,experimental,@grafana/dashboards-squad,false,f 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,preview,@grafana/sharing-squad,false,false,false +queryLibrary,preview,@grafana/sharing-squad,false,false,false logsExploreTableDefaultVisualization,experimental,@grafana/observability-logs,false,false,true alertingListViewV2,privatePreview,@grafana/alerting-squad,false,false,true alertingDisableSendAlertsExternal,experimental,@grafana/alerting-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 1d418977c77..4cddb8fe39a 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -500,13 +500,9 @@ const ( FlagGrafanaManagedRecordingRules = "grafanaManagedRecordingRules" // FlagQueryLibrary - // Renamed feature toggle, enables Saved queries feature + // Enables Saved queries (query library) 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 66a6fa28684..cbc007c0902 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2976,16 +2976,16 @@ { "metadata": { "name": "queryLibrary", - "resourceVersion": "1755721444487", + "resourceVersion": "1758208636622", "creationTimestamp": "2022-10-07T18:31:45Z", "deletionTimestamp": "2023-03-20T16:00:14Z", "annotations": { - "grafana.app/updatedTimestamp": "2025-08-20 20:24:04.487598 +0000 UTC" + "grafana.app/updatedTimestamp": "2025-09-18 15:17:16.622111 +0000 UTC" } }, "spec": { - "description": "Renamed feature toggle, enables Saved queries feature", - "stage": "privatePreview", + "description": "Enables Saved queries (query library) feature", + "stage": "preview", "codeowner": "@grafana/sharing-squad" } }, @@ -3186,6 +3186,7 @@ "name": "savedQueries", "resourceVersion": "1756920131554", "creationTimestamp": "2025-08-25T21:22:09Z", + "deletionTimestamp": "2025-09-18T12:07:31Z", "annotations": { "grafana.app/updatedTimestamp": "2025-09-03 17:22:11.554759 +0000 UTC" }