From 18eac9df9e81bc86b490c1714f64538f29cb16b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ida=20=C5=A0tambuk?= Date: Wed, 20 Mar 2024 14:14:21 +0000 Subject: [PATCH] Feature toggles: Remove redshiftAsyncQueryDataSupport and athenaAsyncQueryDataSupport toggles (#84653) --- .../configure-grafana/feature-toggles/index.md | 2 -- .../src/types/featureToggles.gen.ts | 2 -- pkg/services/featuremgmt/registry.go | 17 ----------------- pkg/services/featuremgmt/toggles_gen.csv | 2 -- pkg/services/featuremgmt/toggles_gen.go | 8 -------- pkg/services/featuremgmt/toggles_gen.json | 6 ++++-- 6 files changed, 4 insertions(+), 33 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 8a18b8ada9a..cc5a5cf99ab 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -27,8 +27,6 @@ Some features are enabled by default. You can disable these feature by setting t | `correlations` | Correlations page | | | `exploreContentOutline` | Content outline sidebar | Yes | | `cloudWatchCrossAccountQuerying` | Enables cross-account querying in CloudWatch datasources | Yes | -| `redshiftAsyncQueryDataSupport` | Enable async query data support for Redshift | Yes | -| `athenaAsyncQueryDataSupport` | Enable async query data support for Athena | Yes | | `nestedFolderPicker` | Enables the new folder picker to work with nested folders. Requires the nestedFolders feature toggle | Yes | | `logsContextDatasourceUi` | Allow datasource to provide custom UI for context view | Yes | | `lokiQuerySplitting` | Split large interval queries into subqueries with smaller time intervals | Yes | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 7fb36ef7153..7839b7f1fcd 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -48,8 +48,6 @@ export interface FeatureToggles { grpcServer?: boolean; unifiedStorage?: boolean; cloudWatchCrossAccountQuerying?: boolean; - redshiftAsyncQueryDataSupport?: boolean; - athenaAsyncQueryDataSupport?: boolean; showDashboardValidationWarnings?: boolean; mysqlAnsiQuotes?: boolean; accessControlOnCall?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 5997a8fe8e7..ff11f1f2737 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -233,23 +233,6 @@ var ( Owner: awsDatasourcesSquad, AllowSelfServe: true, }, - { - Name: "redshiftAsyncQueryDataSupport", - Description: "Enable async query data support for Redshift", - Stage: FeatureStageGeneralAvailability, - Expression: "true", // enabled by default - Owner: awsDatasourcesSquad, - AllowSelfServe: false, - }, - { - Name: "athenaAsyncQueryDataSupport", - Description: "Enable async query data support for Athena", - Stage: FeatureStageGeneralAvailability, - Expression: "true", // enabled by default - FrontendOnly: true, - Owner: awsDatasourcesSquad, - AllowSelfServe: false, - }, { Name: "showDashboardValidationWarnings", Description: "Show warnings when dashboards do not validate against the schema", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 150a796449a..93fed0c267b 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -29,8 +29,6 @@ returnToPrevious,preview,@grafana/grafana-frontend-platform,false,false,true grpcServer,preview,@grafana/grafana-app-platform-squad,false,false,false unifiedStorage,experimental,@grafana/grafana-app-platform-squad,true,true,false cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false -redshiftAsyncQueryDataSupport,GA,@grafana/aws-datasources,false,false,false -athenaAsyncQueryDataSupport,GA,@grafana/aws-datasources,false,false,true showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false mysqlAnsiQuotes,experimental,@grafana/backend-platform,false,false,false accessControlOnCall,preview,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 40581da464b..3b3e78ab6d6 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -127,14 +127,6 @@ const ( // Enables cross-account querying in CloudWatch datasources FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying" - // FlagRedshiftAsyncQueryDataSupport - // Enable async query data support for Redshift - FlagRedshiftAsyncQueryDataSupport = "redshiftAsyncQueryDataSupport" - - // FlagAthenaAsyncQueryDataSupport - // Enable async query data support for Athena - FlagAthenaAsyncQueryDataSupport = "athenaAsyncQueryDataSupport" - // FlagShowDashboardValidationWarnings // Show warnings when dashboards do not validate against the schema FlagShowDashboardValidationWarnings = "showDashboardValidationWarnings" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 7307bd33bcd..d7cde8c530c 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -506,7 +506,8 @@ "metadata": { "name": "redshiftAsyncQueryDataSupport", "resourceVersion": "1709648236447", - "creationTimestamp": "2024-03-05T14:17:16Z" + "creationTimestamp": "2024-03-05T14:17:16Z", + "deletionTimestamp": "2024-03-18T12:15:18Z" }, "spec": { "description": "Enable async query data support for Redshift", @@ -1055,7 +1056,8 @@ "metadata": { "name": "athenaAsyncQueryDataSupport", "resourceVersion": "1709648236447", - "creationTimestamp": "2024-03-05T14:17:16Z" + "creationTimestamp": "2024-03-05T14:17:16Z", + "deletionTimestamp": "2024-03-18T12:15:18Z" }, "spec": { "description": "Enable async query data support for Athena",