From 34b2cb5e02f66ea0a0d32903db483255fb93e730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ida=20=C5=A0tambuk?= Date: Mon, 3 Feb 2025 14:24:49 +0100 Subject: [PATCH] Features: Remove openSearchBackendFlowEnabled feature toggle (#99068) --- .../configure-grafana/feature-toggles/index.md | 1 - packages/grafana-data/src/types/featureToggles.gen.ts | 1 - pkg/services/featuremgmt/registry.go | 7 ------- pkg/services/featuremgmt/toggles_gen.csv | 1 - pkg/services/featuremgmt/toggles_gen.go | 4 ---- pkg/services/featuremgmt/toggles_gen.json | 1 + 6 files changed, 1 insertion(+), 14 deletions(-) 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 8dae19485ea..a9395c559ae 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -72,7 +72,6 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `newDashboardSharingComponent` | Enables the new sharing drawer design | Yes | | `pluginProxyPreserveTrailingSlash` | Preserve plugin proxy trailing slash. | | | `pinNavItems` | Enables pinning of nav items | Yes | -| `openSearchBackendFlowEnabled` | Enables the backend query flow for Open Search datasource plugin | Yes | | `alertingApiServer` | Register Alerting APIs with the K8s API server | Yes | | `cloudWatchRoundUpEndTime` | Round up end time for metric queries to the next minute to avoid missing data | Yes | | `newFiltersUI` | Enables new combobox style UI for the Ad hoc filters variable in scenes architecture | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 2792ff8a74a..a5708006967 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -189,7 +189,6 @@ export interface FeatureToggles { azureMonitorPrometheusExemplars?: boolean; pinNavItems?: boolean; authZGRPCServer?: boolean; - openSearchBackendFlowEnabled?: boolean; ssoSettingsLDAP?: boolean; failWrongDSUID?: boolean; zanzana?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index f1cd1fe8cf8..a99c4ab251e 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1297,13 +1297,6 @@ var ( HideFromAdminPage: true, HideFromDocs: true, }, - { - Name: "openSearchBackendFlowEnabled", - Description: "Enables the backend query flow for Open Search datasource plugin", - Stage: FeatureStageGeneralAvailability, - Owner: awsDatasourcesSquad, - Expression: "true", - }, { Name: "ssoSettingsLDAP", Description: "Use the new SSO Settings API to configure LDAP", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 4d9fae9c95c..25f5855541b 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -170,7 +170,6 @@ sqlQuerybuilderFunctionParameters,experimental,@grafana/oss-big-tent,false,false azureMonitorPrometheusExemplars,preview,@grafana/partner-datasources,false,false,false pinNavItems,GA,@grafana/grafana-frontend-platform,false,false,false authZGRPCServer,experimental,@grafana/identity-access-team,false,false,false -openSearchBackendFlowEnabled,GA,@grafana/aws-datasources,false,false,false ssoSettingsLDAP,preview,@grafana/identity-access-team,false,true,false failWrongDSUID,experimental,@grafana/plugins-platform-backend,false,false,false zanzana,experimental,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index e149127edf7..e75d59f0257 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -691,10 +691,6 @@ const ( // Enables the gRPC server for authorization FlagAuthZGRPCServer = "authZGRPCServer" - // FlagOpenSearchBackendFlowEnabled - // Enables the backend query flow for Open Search datasource plugin - FlagOpenSearchBackendFlowEnabled = "openSearchBackendFlowEnabled" - // FlagSsoSettingsLDAP // Use the new SSO Settings API to configure LDAP FlagSsoSettingsLDAP = "ssoSettingsLDAP" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 580121c5120..934a3078871 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2794,6 +2794,7 @@ "name": "openSearchBackendFlowEnabled", "resourceVersion": "1724141158995", "creationTimestamp": "2024-06-17T09:41:50Z", + "deletionTimestamp": "2025-01-16T11:09:59Z", "annotations": { "grafana.app/updatedTimestamp": "2024-08-20 08:05:58.995762 +0000 UTC" }