Alerting: Remove alertingConversionAPI feature flag (#103380)

This commit is contained in:
Alexander Akhmetov
2025-04-05 09:27:02 +01:00
committed by GitHub
parent ac7ad27867
commit bdbe94abc8
7 changed files with 19 additions and 37 deletions

View File

@ -955,10 +955,6 @@ export interface FeatureToggles {
*/ */
fetchRulesUsingPost?: boolean; fetchRulesUsingPost?: boolean;
/** /**
* Enable the alerting conversion API
*/
alertingConversionAPI?: boolean;
/**
* Enables the new logs panel in Explore * Enables the new logs panel in Explore
*/ */
newLogsPanel?: boolean; newLogsPanel?: boolean;

View File

@ -1622,14 +1622,6 @@ var (
HideFromAdminPage: true, HideFromAdminPage: true,
HideFromDocs: true, HideFromDocs: true,
}, },
{
Name: "alertingConversionAPI",
Description: "Enable the alerting conversion API",
Stage: FeatureStageExperimental,
Owner: grafanaAlertingSquad,
HideFromAdminPage: true,
HideFromDocs: true,
},
{ {
Name: "newLogsPanel", Name: "newLogsPanel",
Description: "Enables the new logs panel in Explore", Description: "Enables the new logs panel in Explore",

View File

@ -214,7 +214,6 @@ elasticsearchImprovedParsing,experimental,@grafana/aws-datasources,false,false,f
exploreMetricsUseExternalAppPlugin,preview,@grafana/observability-metrics,false,true,false exploreMetricsUseExternalAppPlugin,preview,@grafana/observability-metrics,false,true,false
datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,false,true datasourceConnectionsTab,privatePreview,@grafana/plugins-platform-backend,false,false,true
fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false fetchRulesUsingPost,experimental,@grafana/alerting-squad,false,false,false
alertingConversionAPI,experimental,@grafana/alerting-squad,false,false,false
newLogsPanel,experimental,@grafana/observability-logs,false,false,true newLogsPanel,experimental,@grafana/observability-logs,false,false,true
grafanaconThemes,experimental,@grafana/grafana-frontend-platform,false,true,false grafanaconThemes,experimental,@grafana/grafana-frontend-platform,false,true,false
pluginsCDNSyncLoader,experimental,@grafana/plugins-platform-backend,false,false,false pluginsCDNSyncLoader,experimental,@grafana/plugins-platform-backend,false,false,false

1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
214 exploreMetricsUseExternalAppPlugin preview @grafana/observability-metrics false true false
215 datasourceConnectionsTab privatePreview @grafana/plugins-platform-backend false false true
216 fetchRulesUsingPost experimental @grafana/alerting-squad false false false
alertingConversionAPI experimental @grafana/alerting-squad false false false
217 newLogsPanel experimental @grafana/observability-logs false false true
218 grafanaconThemes experimental @grafana/grafana-frontend-platform false true false
219 pluginsCDNSyncLoader experimental @grafana/plugins-platform-backend false false false

View File

@ -867,10 +867,6 @@ const (
// Use a POST request to list rules by passing down the namespaces user has access to // Use a POST request to list rules by passing down the namespaces user has access to
FlagFetchRulesUsingPost = "fetchRulesUsingPost" FlagFetchRulesUsingPost = "fetchRulesUsingPost"
// FlagAlertingConversionAPI
// Enable the alerting conversion API
FlagAlertingConversionAPI = "alertingConversionAPI"
// FlagNewLogsPanel // FlagNewLogsPanel
// Enables the new logs panel in Explore // Enables the new logs panel in Explore
FlagNewLogsPanel = "newLogsPanel" FlagNewLogsPanel = "newLogsPanel"

View File

@ -150,7 +150,8 @@
"metadata": { "metadata": {
"name": "alertingConversionAPI", "name": "alertingConversionAPI",
"resourceVersion": "1743693517832", "resourceVersion": "1743693517832",
"creationTimestamp": "2025-04-03T15:18:37Z" "creationTimestamp": "2025-04-03T15:18:37Z",
"deletionTimestamp": "2025-04-04T13:25:42Z"
}, },
"spec": { "spec": {
"description": "Enable the alerting conversion API", "description": "Enable the alerting conversion API",

View File

@ -181,16 +181,14 @@ func (api *API) RegisterAPIEndpoints(m *metrics.API) {
hist: api.Historian, hist: api.Historian,
}), m) }), m)
if api.FeatureManager.IsEnabledGlobally(featuremgmt.FlagAlertingConversionAPI) { api.RegisterConvertPrometheusApiEndpoints(NewConvertPrometheusApi(
api.RegisterConvertPrometheusApiEndpoints(NewConvertPrometheusApi( NewConvertPrometheusSrv(
NewConvertPrometheusSrv( &api.Cfg.UnifiedAlerting,
&api.Cfg.UnifiedAlerting, logger,
logger, api.RuleStore,
api.RuleStore, api.DatasourceCache,
api.DatasourceCache, api.AlertRules,
api.AlertRules, api.FeatureManager,
api.FeatureManager, ),
), ), m)
), m)
}
} }

View File

@ -109,7 +109,7 @@ func TestIntegrationConvertPrometheusEndpoints(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })
@ -268,7 +268,7 @@ func TestIntegrationConvertPrometheusEndpoints_UpdateRule(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })
@ -355,7 +355,7 @@ func TestIntegrationConvertPrometheusEndpoints_Conflict(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })
@ -443,7 +443,7 @@ func TestIntegrationConvertPrometheusEndpoints_CreatePausedRules(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })
@ -559,7 +559,7 @@ func TestIntegrationConvertPrometheusEndpoints_FolderUIDHeader(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })
@ -661,7 +661,7 @@ func TestIntegrationConvertPrometheusEndpoints_Provenance(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })
@ -777,7 +777,7 @@ func TestIntegrationConvertPrometheusEndpoints_Delete(t *testing.T) {
EnableUnifiedAlerting: true, EnableUnifiedAlerting: true,
DisableAnonymous: true, DisableAnonymous: true,
AppModeProduction: true, AppModeProduction: true,
EnableFeatureToggles: []string{"alertingConversionAPI", "grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"}, EnableFeatureToggles: []string{"grafanaManagedRecordingRulesDatasources", "grafanaManagedRecordingRules"},
EnableRecordingRules: true, EnableRecordingRules: true,
}) })