opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-29 17:12:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Alerting: Remove alertingConversionAPI feature flag (#103380)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-data/src/types/featureToggles.gen.ts
View File

@ -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;

8
pkg/services/featuremgmt/registry.go
View File

@ -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",

1
pkg/services/featuremgmt/toggles_gen.csv
View File

@ -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

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

4
pkg/services/featuremgmt/toggles_gen.go
View File

@ -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"

3
pkg/services/featuremgmt/toggles_gen.json
View File

@ -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",

22
pkg/services/ngalert/api/api.go
View File

@ -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)
}

14
pkg/tests/api/alerting/api_convert_prometheus_test.go
View File

@ -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,
})