From d8dd2facdd4e49ba87b02f5bb404d450f99a4402 Mon Sep 17 00:00:00 2001 From: Alexander Akhmetov Date: Thu, 15 May 2025 08:44:13 +0200 Subject: [PATCH] Alerting: Enable alertingMigrationUI feature flag by default (#105419) --- .../configure-grafana/feature-toggles/index.md | 1 + .../grafana-data/src/types/featureToggles.gen.ts | 3 ++- pkg/services/featuremgmt/registry.go | 13 ++++++------- pkg/services/featuremgmt/toggles_gen.csv | 2 +- pkg/services/featuremgmt/toggles_gen.go | 2 +- pkg/services/featuremgmt/toggles_gen.json | 14 ++++++++------ 6 files changed, 19 insertions(+), 16 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 db084a83d69..49a04894201 100644 --- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -80,6 +80,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general- | `alertingNotificationsStepMode` | Enables simplified step mode in the notifications section | Yes | | `lokiLabelNamesQueryApi` | Defaults to using the Loki `/labels` API instead of `/series` | Yes | | `grafanaManagedRecordingRulesDatasources` | Enables writing to data sources for Grafana-managed recording rules. | | +| `alertingMigrationUI` | Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules | Yes | | `unifiedNavbars` | Enables unified navbars | | ## Public preview feature toggles diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index ac014165077..7f5f09f291d 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -931,7 +931,8 @@ export interface FeatureToggles { */ inviteUserExperimental?: boolean; /** - * Enables the alerting migration UI, to migrate datasource-managed rules to Grafana-managed rules + * Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules + * @default true */ alertingMigrationUI?: boolean; /** diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 4ad464910e2..44b647592e0 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1595,13 +1595,12 @@ var ( FrontendOnly: true, }, { - Name: "alertingMigrationUI", - Description: "Enables the alerting migration UI, to migrate datasource-managed rules to Grafana-managed rules", - FrontendOnly: true, - Stage: FeatureStageExperimental, - Owner: grafanaAlertingSquad, - HideFromAdminPage: true, - HideFromDocs: true, + Name: "alertingMigrationUI", + Description: "Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules", + FrontendOnly: true, + Stage: FeatureStageGeneralAvailability, + Owner: grafanaAlertingSquad, + Expression: "true", }, { Name: "unifiedStorageHistoryPruner", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 0864f1f6e1e..5f997138bbe 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -209,7 +209,7 @@ alertRuleRestore,preview,@grafana/alerting-squad,false,false,false grafanaManagedRecordingRulesDatasources,GA,@grafana/alerting-squad,false,false,false infinityRunQueriesInParallel,privatePreview,@grafana/oss-big-tent,false,false,false inviteUserExperimental,experimental,@grafana/sharing-squad,false,false,true -alertingMigrationUI,experimental,@grafana/alerting-squad,false,false,true +alertingMigrationUI,GA,@grafana/alerting-squad,false,false,true unifiedStorageHistoryPruner,GA,@grafana/search-and-storage,false,false,false azureMonitorLogsBuilderEditor,preview,@grafana/partner-datasources,false,false,false localeFormatPreference,experimental,@grafana/grafana-frontend-platform,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index a9e0149f5a2..c528219c193 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -848,7 +848,7 @@ const ( FlagInviteUserExperimental = "inviteUserExperimental" // FlagAlertingMigrationUI - // Enables the alerting migration UI, to migrate datasource-managed rules to Grafana-managed rules + // Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules FlagAlertingMigrationUI = "alertingMigrationUI" // FlagUnifiedStorageHistoryPruner diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 658ddb02e8e..43db84470b4 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -214,16 +214,18 @@ { "metadata": { "name": "alertingMigrationUI", - "resourceVersion": "1743693517832", - "creationTimestamp": "2025-03-14T16:40:05Z" + "resourceVersion": "1747241866044", + "creationTimestamp": "2025-03-14T16:40:05Z", + "annotations": { + "grafana.app/updatedTimestamp": "2025-05-14 16:57:46.044198 +0000 UTC" + } }, "spec": { - "description": "Enables the alerting migration UI, to migrate datasource-managed rules to Grafana-managed rules", - "stage": "experimental", + "description": "Enables the alerting migration UI, to migrate data source-managed rules to Grafana-managed rules", + "stage": "GA", "codeowner": "@grafana/alerting-squad", "frontend": true, - "hideFromAdminPage": true, - "hideFromDocs": true + "expression": "true" } }, {