chore: remove US history pruner feature toggle (#114014)
This commit is contained in:
@@ -1542,15 +1542,6 @@ var (
|
||||
Owner: grafanaAlertingSquad,
|
||||
Expression: "true",
|
||||
},
|
||||
{
|
||||
Name: "unifiedStorageHistoryPruner",
|
||||
Description: "Enables the unified storage history pruner",
|
||||
Stage: FeatureStageGeneralAvailability,
|
||||
Owner: grafanaSearchAndStorageSquad,
|
||||
HideFromAdminPage: true,
|
||||
HideFromDocs: true,
|
||||
Expression: "true", // will be removed soon
|
||||
},
|
||||
{
|
||||
Name: "azureMonitorLogsBuilderEditor",
|
||||
Description: "Enables the logs builder mode for the Azure Monitor data source",
|
||||
|
||||
Generated
-1
@@ -200,7 +200,6 @@ alertRuleRestore,preview,@grafana/alerting-squad,false,false,false
|
||||
infinityRunQueriesInParallel,privatePreview,@grafana/oss-big-tent,false,false,false
|
||||
alertingMigrationUI,GA,@grafana/alerting-squad,false,false,true
|
||||
alertingImportYAMLUI,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,preview,@grafana/grafana-frontend-platform,false,false,false
|
||||
unifiedStorageGrpcConnectionPool,experimental,@grafana/search-and-storage,false,false,false
|
||||
|
||||
|
Generated
-4
@@ -810,10 +810,6 @@ const (
|
||||
// Enables a UI feature for importing rules from a Prometheus file to Grafana-managed rules
|
||||
FlagAlertingImportYAMLUI = "alertingImportYAMLUI"
|
||||
|
||||
// FlagUnifiedStorageHistoryPruner
|
||||
// Enables the unified storage history pruner
|
||||
FlagUnifiedStorageHistoryPruner = "unifiedStorageHistoryPruner"
|
||||
|
||||
// FlagAzureMonitorLogsBuilderEditor
|
||||
// Enables the logs builder mode for the Azure Monitor data source
|
||||
FlagAzureMonitorLogsBuilderEditor = "azureMonitorLogsBuilderEditor"
|
||||
|
||||
+2
-1
@@ -4214,7 +4214,8 @@
|
||||
"metadata": {
|
||||
"name": "unifiedStorageHistoryPruner",
|
||||
"resourceVersion": "1753448760331",
|
||||
"creationTimestamp": "2025-03-17T10:36:38Z"
|
||||
"creationTimestamp": "2025-03-17T10:36:38Z",
|
||||
"deletionTimestamp": "2025-11-17T12:35:33Z"
|
||||
},
|
||||
"spec": {
|
||||
"description": "Enables the unified storage history pruner",
|
||||
|
||||
@@ -62,10 +62,6 @@ type BackendOptions struct {
|
||||
IsHA bool
|
||||
storageMetrics *resource.StorageMetrics
|
||||
|
||||
// If true, the backend will prune history on write events.
|
||||
// Will be removed once fully rolled out.
|
||||
withPruner bool
|
||||
|
||||
// testing
|
||||
SimulatedNetworkLatency time.Duration // slows down the create transactions by a fixed amount
|
||||
|
||||
@@ -101,7 +97,6 @@ func NewBackend(opts BackendOptions) (Backend, error) {
|
||||
storageMetrics: opts.storageMetrics,
|
||||
bulkLock: &bulkLock{running: make(map[string]bool)},
|
||||
simulatedNetworkLatency: opts.SimulatedNetworkLatency,
|
||||
withPruner: opts.withPruner,
|
||||
lastImportTimeMaxAge: opts.LastImportTimeMaxAge,
|
||||
}, nil
|
||||
}
|
||||
@@ -141,7 +136,6 @@ type backend struct {
|
||||
simulatedNetworkLatency time.Duration
|
||||
|
||||
historyPruner resource.Pruner
|
||||
withPruner bool
|
||||
|
||||
lastImportTimeMaxAge time.Duration
|
||||
lastImportTimeDeletionTime atomic.Time
|
||||
@@ -198,11 +192,6 @@ func (b *backend) initLocked(ctx context.Context) error {
|
||||
}
|
||||
|
||||
func (b *backend) initPruner(ctx context.Context) error {
|
||||
if !b.withPruner {
|
||||
b.log.Debug("using noop history pruner")
|
||||
b.historyPruner = &resource.NoopPruner{}
|
||||
return nil
|
||||
}
|
||||
b.log.Debug("using debounced history pruner")
|
||||
// Initialize history pruner.
|
||||
pruner, err := debouncer.NewGroup(debouncer.DebouncerOpts[resource.PruningKey]{
|
||||
|
||||
@@ -98,15 +98,12 @@ func NewResourceServer(opts ServerOptions) (resource.ResourceServer, error) {
|
||||
|
||||
isHA := isHighAvailabilityEnabled(opts.Cfg.SectionWithEnvOverrides("database"),
|
||||
opts.Cfg.SectionWithEnvOverrides("resource_api"))
|
||||
//nolint:staticcheck // not yet migrated to OpenFeature
|
||||
withPruner := opts.Features.IsEnabledGlobally(featuremgmt.FlagUnifiedStorageHistoryPruner)
|
||||
|
||||
backend, err := NewBackend(BackendOptions{
|
||||
DBProvider: eDB,
|
||||
Tracer: opts.Tracer,
|
||||
Reg: opts.Reg,
|
||||
IsHA: isHA,
|
||||
withPruner: withPruner,
|
||||
storageMetrics: opts.StorageMetrics,
|
||||
LastImportTimeMaxAge: opts.SearchOptions.MaxIndexAge, // No need to keep last_import_times older than max index age.
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user