diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index c8ed12cb035..3767b20b941 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -955,10 +955,6 @@ export interface FeatureToggles { */ fetchRulesUsingPost?: boolean; /** - * Enable the alerting conversion API - */ - alertingConversionAPI?: boolean; - /** * Enables the new logs panel in Explore */ newLogsPanel?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 4fdc1b03375..dd1fcec4ccf 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1622,14 +1622,6 @@ var ( HideFromAdminPage: true, HideFromDocs: true, }, - { - Name: "alertingConversionAPI", - Description: "Enable the alerting conversion API", - Stage: FeatureStageExperimental, - Owner: grafanaAlertingSquad, - HideFromAdminPage: true, - HideFromDocs: true, - }, { Name: "newLogsPanel", Description: "Enables the new logs panel in Explore", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index e8aea83b443..a4647e9592e 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -214,7 +214,6 @@ elasticsearchImprovedParsing,experimental,@grafana/aws-datasources,false,false,f exploreMetricsUseExternalAppPlugin,preview,@grafana/observability-metrics,false,true,false datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,false,true fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false -alertingConversionAPI,experimental,@grafana/alerting-squad,false,false,false newLogsPanel,experimental,@grafana/observability-logs,false,false,true grafanaconThemes,experimental,@grafana/grafana-frontend-platform,false,true,false pluginsCDNSyncLoader,experimental,@grafana/plugins-platform-backend,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index eff10e8f7fb..f29a8f5ee22 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -867,10 +867,6 @@ const ( // Use a POST request to list rules by passing down the namespaces user has access to FlagFetchRulesUsingPost = "fetchRulesUsingPost" - // FlagAlertingConversionAPI - // Enable the alerting conversion API - FlagAlertingConversionAPI = "alertingConversionAPI" - // FlagNewLogsPanel // Enables the new logs panel in Explore FlagNewLogsPanel = "newLogsPanel" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index a3dc7f749f8..68d80761b25 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -150,7 +150,8 @@ "metadata": { "name": "alertingConversionAPI", "resourceVersion": "1743693517832", - "creationTimestamp": "2025-04-03T15:18:37Z" + "creationTimestamp": "2025-04-03T15:18:37Z", + "deletionTimestamp": "2025-04-04T13:25:42Z" }, "spec": { "description": "Enable the alerting conversion API", diff --git a/pkg/services/ngalert/api/api.go b/pkg/services/ngalert/api/api.go index 13a4e5d0158..916bb62b8de 100644 --- a/pkg/services/ngalert/api/api.go +++ b/pkg/services/ngalert/api/api.go @@ -181,16 +181,14 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) { hist: api.Historian, }), m) - if api.FeatureManager.IsEnabledGlobally(featuremgmt.FlagAlertingConversionAPI) { - api.RegisterConvertPrometheusApiEndpoints(NewConvertPrometheusApi( - NewConvertPrometheusSrv( - &api.Cfg.UnifiedAlerting, - logger, - api.RuleStore, - api.DatasourceCache, - api.AlertRules, - api.FeatureManager, - ), - ), m) - } + api.RegisterConvertPrometheusApiEndpoints(NewConvertPrometheusApi( + NewConvertPrometheusSrv( + &api.Cfg.UnifiedAlerting, + logger, + api.RuleStore, + api.DatasourceCache, + api.AlertRules, + api.FeatureManager, + ), + ), m) } diff --git a/pkg/tests/api/alerting/api_convert_prometheus_test.go b/pkg/tests/api/alerting/api_convert_prometheus_test.go index df25c2ac8f5..ee84d7aefa4 100644 --- a/pkg/tests/api/alerting/api_convert_prometheus_test.go +++ b/pkg/tests/api/alerting/api_convert_prometheus_test.go @@ -109,7 +109,7 @@ func TestIntegrationConvertPrometheusEndpoints(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, }) @@ -268,7 +268,7 @@ func TestIntegrationConvertPrometheusEndpoints_UpdateRule(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, }) @@ -355,7 +355,7 @@ func TestIntegrationConvertPrometheusEndpoints_Conflict(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, }) @@ -443,7 +443,7 @@ func TestIntegrationConvertPrometheusEndpoints_CreatePausedRules(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, }) @@ -559,7 +559,7 @@ func TestIntegrationConvertPrometheusEndpoints_FolderUIDHeader(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, }) @@ -661,7 +661,7 @@ func TestIntegrationConvertPrometheusEndpoints_Provenance(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, }) @@ -777,7 +777,7 @@ func TestIntegrationConvertPrometheusEndpoints_Delete(t *testing.T) { EnableUnifiedAlerting: true, DisableAnonymous: true, AppModeProduction: true, - EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, + EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableRecordingRules: true, })