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 2830d8a16cf..5ea31fc4c2d 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -97,6 +97,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `pdfTables` | Enables generating table data as PDF in reporting | | `canvasPanelPanZoom` | Allow pan and zoom in canvas panel | | `regressionTransformation` | Enables regression analysis transformation | +| `onPremToCloudMigrations` | Enable the Grafana Migration Assistant, which helps you easily migrate on-prem dashboards, folders, and data source configurations to your Grafana Cloud stack. | | `newPDFRendering` | New implementation for the dashboard-to-PDF rendering | | `ssoSettingsSAML` | Use the new SSO Settings API to configure the SAML connector | | `openSearchBackendFlowEnabled` | Enables the backend query flow for Open Search datasource plugin | @@ -168,7 +169,6 @@ Experimental features might be changed or removed without prior notice. | `tableSharedCrosshair` | Enables shared crosshair in table panel | | `kubernetesFeatureToggles` | Use the kubernetes API for feature toggle management in the frontend | | `newFolderPicker` | Enables the nested folder picker without having nested folders enabled | -| `onPremToCloudMigrations` | In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud. | | `promQLScope` | In-development feature that will allow injection of labels into prometheus queries. | | `sqlExpressions` | Enables using SQL and DuckDB functions as Expressions. | | `nodeGraphDotLayout` | Changed the layout algorithm for the node graph | diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 361b444ffc7..b3a77622720 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1021,9 +1021,10 @@ var ( }, { Name: "onPremToCloudMigrations", - Description: "In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud.", - Stage: FeatureStageExperimental, + Description: "Enable the Grafana Migration Assistant, which helps you easily migrate on-prem dashboards, folders, and data source configurations to your Grafana Cloud stack.", + Stage: FeatureStagePublicPreview, Owner: grafanaOperatorExperienceSquad, + Expression: "false", }, { Name: "alertingSaveStatePeriodic", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index bcfb14cd47e..07f3365a780 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -134,7 +134,7 @@ cloudRBACRoles,experimental,@grafana/identity-access-team,false,true,false alertingQueryOptimization,GA,@grafana/alerting-squad,false,false,false newFolderPicker,experimental,@grafana/grafana-frontend-platform,false,false,true jitterAlertRulesWithinGroups,preview,@grafana/alerting-squad,false,true,false -onPremToCloudMigrations,experimental,@grafana/grafana-operator-experience-squad,false,false,false +onPremToCloudMigrations,preview,@grafana/grafana-operator-experience-squad,false,false,false alertingSaveStatePeriodic,privatePreview,@grafana/alerting-squad,false,false,false promQLScope,experimental,@grafana/observability-metrics,false,false,false sqlExpressions,experimental,@grafana/grafana-app-platform-squad,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index e7f97792145..a2e3276fbd0 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -548,7 +548,7 @@ const ( FlagJitterAlertRulesWithinGroups = "jitterAlertRulesWithinGroups" // FlagOnPremToCloudMigrations - // In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud. + // Enable the Grafana Migration Assistant, which helps you easily migrate on-prem dashboards, folders, and data source configurations to your Grafana Cloud stack. FlagOnPremToCloudMigrations = "onPremToCloudMigrations" // FlagAlertingSaveStatePeriodic diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 3a012643d6f..5f20a6f2c94 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -1812,13 +1812,17 @@ { "metadata": { "name": "onPremToCloudMigrations", - "resourceVersion": "1718727528075", - "creationTimestamp": "2024-01-22T16:09:08Z" + "resourceVersion": "1721693547668", + "creationTimestamp": "2024-01-22T16:09:08Z", + "annotations": { + "grafana.app/updatedTimestamp": "2024-07-23 00:12:27.668899 +0000 UTC" + } }, "spec": { - "description": "In-development feature that will allow users to easily migrate their on-prem Grafana instances to Grafana Cloud.", - "stage": "experimental", - "codeowner": "@grafana/grafana-operator-experience-squad" + "description": "Enable the Grafana Migration Assistant, which helps you easily migrate on-prem dashboards, folders, and data source configurations to your Grafana Cloud stack.", + "stage": "preview", + "codeowner": "@grafana/grafana-operator-experience-squad", + "expression": "false" } }, {