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 5ce3a34a4e6..0ae6ead7728 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -220,7 +220,6 @@ Experimental features might be changed or removed without prior notice. | `timeRangeProvider` | Enables time pickers sync | | `prometheusUsesCombobox` | Use new combobox component for Prometheus query editor | | `userStorageAPI` | Enables the user storage API | -| `dashboardSchemaV2` | Enables the new dashboard schema version 2, implementing changes necessary for dynamic dashboards and dashboards as code. | | `playlistsWatcher` | Enables experimental watcher for playlists | | `prometheusSpecialCharsInLabelValues` | Adds support for quotes and special characters in label values for Prometheus queries | | `enableExtensionsAdminPage` | Enables the extension admin page regardless of development mode | diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 7783296f507..22f9048e07d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -228,7 +228,6 @@ export interface FeatureToggles { userStorageAPI?: boolean; azureMonitorDisableLogLimit?: boolean; preinstallAutoUpdate?: boolean; - dashboardSchemaV2?: boolean; playlistsWatcher?: boolean; passwordlessMagicLinkAuthentication?: boolean; exploreMetricsRelatedLogs?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index ddde412a65e..47d55e87f6a 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1577,13 +1577,6 @@ var ( Owner: grafanaPluginsPlatformSquad, Expression: "true", // enabled by default }, - { - Name: "dashboardSchemaV2", - Description: "Enables the new dashboard schema version 2, implementing changes necessary for dynamic dashboards and dashboards as code.", - Stage: FeatureStageExperimental, - Owner: grafanaDashboardsSquad, - FrontendOnly: true, - }, { Name: "playlistsWatcher", Description: "Enables experimental watcher for playlists", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 92c6b16ce16..3322a206784 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -209,7 +209,6 @@ prometheusUsesCombobox,experimental,@grafana/observability-metrics,false,false,f userStorageAPI,experimental,@grafana/plugins-platform-backend,false,false,false azureMonitorDisableLogLimit,GA,@grafana/partner-datasources,false,false,false preinstallAutoUpdate,GA,@grafana/plugins-platform-backend,false,false,false -dashboardSchemaV2,experimental,@grafana/dashboards-squad,false,false,true playlistsWatcher,experimental,@grafana/grafana-app-platform-squad,false,true,false passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 72fb3c04379..5ee1eec83f6 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -847,10 +847,6 @@ const ( // Enables automatic updates for pre-installed plugins FlagPreinstallAutoUpdate = "preinstallAutoUpdate" - // FlagDashboardSchemaV2 - // Enables the new dashboard schema version 2, implementing changes necessary for dynamic dashboards and dashboards as code. - FlagDashboardSchemaV2 = "dashboardSchemaV2" - // FlagPlaylistsWatcher // Enables experimental watcher for playlists FlagPlaylistsWatcher = "playlistsWatcher" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 6827fab8a5f..ade8dd1367c 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1026,7 +1026,8 @@ "metadata": { "name": "dashboardSchemaV2", "resourceVersion": "1730192092473", - "creationTimestamp": "2024-10-29T08:54:52Z" + "creationTimestamp": "2024-10-29T08:54:52Z", + "deletionTimestamp": "2024-12-19T12:03:44Z" }, "spec": { "description": "Enables the new dashboard schema version 2, implementing changes necessary for dynamic dashboards and dashboards as code.",