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 53f64407f5a..fbb7d1c19bf 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -120,8 +120,6 @@ Experimental features might be changed or removed without prior notice. | `disableSecretsCompatibility` | Disable duplicated secret storage in legacy tables | | `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown | | `unifiedStorage` | SQL-based k8s storage | -| `dualWritePlaylistsMode2` | Enables dual writing of playlists to both legacy and k8s storage in mode 2 | -| `dualWritePlaylistsMode3` | Enables dual writing of playlists to both legacy and k8s storage in mode 3 | | `showDashboardValidationWarnings` | Show warnings when dashboards do not validate against the schema | | `mysqlAnsiQuotes` | Use double quotes to escape keyword in a MySQL query | | `alertingBacktesting` | Rule backtesting API for alerting | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 64358336673..f70fffb4a2a 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -46,8 +46,6 @@ export interface FeatureToggles { topnav?: boolean; grpcServer?: boolean; unifiedStorage?: boolean; - dualWritePlaylistsMode2?: boolean; - dualWritePlaylistsMode3?: boolean; cloudWatchCrossAccountQuerying?: boolean; showDashboardValidationWarnings?: boolean; mysqlAnsiQuotes?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 98e15870aa7..3c047ba8f05 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -221,18 +221,6 @@ var ( RequiresRestart: true, // new SQL tables created Owner: grafanaAppPlatformSquad, }, - { - Name: "dualWritePlaylistsMode2", - Description: "Enables dual writing of playlists to both legacy and k8s storage in mode 2", - Stage: FeatureStageExperimental, - Owner: grafanaSearchAndStorageSquad, - }, - { - Name: "dualWritePlaylistsMode3", - Description: "Enables dual writing of playlists to both legacy and k8s storage in mode 3", - Stage: FeatureStageExperimental, - Owner: grafanaSearchAndStorageSquad, - }, { Name: "cloudWatchCrossAccountQuerying", Description: "Enables cross-account querying in CloudWatch datasources", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 0491224120a..0a34e89e287 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -27,8 +27,6 @@ logRequestsInstrumentedAsUnknown,experimental,@grafana/hosted-grafana-team,false topnav,deprecated,@grafana/grafana-frontend-platform,false,false,false grpcServer,preview,@grafana/grafana-app-platform-squad,false,false,false unifiedStorage,experimental,@grafana/grafana-app-platform-squad,false,true,false -dualWritePlaylistsMode2,experimental,@grafana/search-and-storage,false,false,false -dualWritePlaylistsMode3,experimental,@grafana/search-and-storage,false,false,false cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false mysqlAnsiQuotes,experimental,@grafana/search-and-storage,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 0308bd85a23..dfd4866c09c 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -119,14 +119,6 @@ const ( // SQL-based k8s storage FlagUnifiedStorage = "unifiedStorage" - // FlagDualWritePlaylistsMode2 - // Enables dual writing of playlists to both legacy and k8s storage in mode 2 - FlagDualWritePlaylistsMode2 = "dualWritePlaylistsMode2" - - // FlagDualWritePlaylistsMode3 - // Enables dual writing of playlists to both legacy and k8s storage in mode 3 - FlagDualWritePlaylistsMode3 = "dualWritePlaylistsMode3" - // FlagCloudWatchCrossAccountQuerying // Enables cross-account querying in CloudWatch datasources FlagCloudWatchCrossAccountQuerying = "cloudWatchCrossAccountQuerying" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 320c419a25a..dc492bca36f 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1954,7 +1954,8 @@ "metadata": { "name": "dualWritePlaylistsMode2", "resourceVersion": "1716448665531", - "creationTimestamp": "2024-05-23T07:17:45Z" + "creationTimestamp": "2024-05-23T07:17:45Z", + "deletionTimestamp": "2024-05-31T16:59:31Z" }, "spec": { "description": "Enables dual writing of playlists to both legacy and k8s storage in mode 2", @@ -2196,7 +2197,8 @@ "metadata": { "name": "dualWritePlaylistsMode3", "resourceVersion": "1716448665531", - "creationTimestamp": "2024-05-23T07:17:45Z" + "creationTimestamp": "2024-05-23T07:17:45Z", + "deletionTimestamp": "2024-05-31T16:59:31Z" }, "spec": { "description": "Enables dual writing of playlists to both legacy and k8s storage in mode 3",