Skip to content

Commit aad1fee

Browse files
bogdan-stbogdan-st
committed
rename overrides to overridesConfig
Signed-off-by: Bogdan Stancu <[email protected]>
1 parent 52b9672 commit aad1fee

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎pkg/cortex/cortex.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ type Cortex struct {
313313
Server *server.Server
314314
Ring *ring.Ring
315315
TenantLimits validation.TenantLimits
316-
Overrides *validation.Overrides
316+
OverridesConfig *validation.Overrides
317317
Distributor *distributor.Distributor
318318
Ingester *ingester.Ingester
319319
Flusher *flusher.Flusher

‎pkg/cortex/modules.go‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const (
6767
API string = "api"
6868
Ring string = "ring"
6969
RuntimeConfig string = "runtime-config"
70-
Overrides string = "overrides"
70+
OverridesConfig string = "overrides-config"
7171
OverridesExporter string = "overrides-exporter"
7272
Server string = "server"
7373
Distributor string = "distributor"
@@ -200,8 +200,8 @@ func (t *Cortex) initRuntimeConfig() (services.Service, error) {
200200
return serv, err
201201
}
202202

203-
func (t *Cortex) initOverrides() (services.Service, error) {
204-
t.Overrides = validation.NewOverrides(t.Cfg.LimitsConfig, t.TenantLimits)
203+
func (t *Cortex) initOverridesConfig() (services.Service, error) {
204+
t.OverridesConfig = validation.NewOverrides(t.Cfg.LimitsConfig, t.TenantLimits)
205205
// overrides don't have operational state, nor do they need to do anything more in starting/stopping phase,
206206
// so there is no need to return any service.
207207
return nil, nil
@@ -233,7 +233,7 @@ func (t *Cortex) initDistributorService() (serv services.Service, err error) {
233233
// ruler's dependency)
234234
canJoinDistributorsRing := t.Cfg.isModuleEnabled(Distributor) || t.Cfg.isModuleEnabled(All)
235235

236-
t.Distributor, err = distributor.New(t.Cfg.Distributor, t.Cfg.IngesterClient, t.Overrides, t.Ring, canJoinDistributorsRing, prometheus.DefaultRegisterer, util_log.Logger)
236+
t.Distributor, err = distributor.New(t.Cfg.Distributor, t.Cfg.IngesterClient, t.OverridesConfig, t.Ring, canJoinDistributorsRing, prometheus.DefaultRegisterer, util_log.Logger)
237237
if err != nil {
238238
return
239239
}
@@ -255,7 +255,7 @@ func (t *Cortex) initGrpcClientServices() (serv services.Service, err error) {
255255
}
256256

257257
func (t *Cortex) initDistributor() (serv services.Service, err error) {
258-
t.API.RegisterDistributor(t.Distributor, t.Cfg.Distributor, t.Overrides)
258+
t.API.RegisterDistributor(t.Distributor, t.Cfg.Distributor, t.OverridesConfig)
259259

260260
return nil, nil
261261
}
@@ -266,7 +266,7 @@ func (t *Cortex) initQueryable() (serv services.Service, err error) {
266266
querierRegisterer := prometheus.WrapRegistererWith(prometheus.Labels{"engine": "querier"}, prometheus.DefaultRegisterer)
267267

268268
// Create a querier queryable and PromQL engine
269-
t.QuerierQueryable, t.ExemplarQueryable, t.QuerierEngine = querier.New(t.Cfg.Querier, t.Overrides, t.Distributor, t.StoreQueryables, querierRegisterer, util_log.Logger, t.Overrides.QueryPartialData)
269+
t.QuerierQueryable, t.ExemplarQueryable, t.QuerierEngine = querier.New(t.Cfg.Querier, t.OverridesConfig, t.Distributor, t.StoreQueryables, querierRegisterer, util_log.Logger, t.OverridesConfig.QueryPartialData)
270270

271271
// Use distributor as default MetadataQuerier
272272
t.MetadataQuerier = t.Distributor
@@ -422,12 +422,12 @@ func (t *Cortex) initStoreQueryables() (services.Service, error) {
422422

423423
//nolint:revive // I prefer this form over removing 'else', because it allows q to have smaller scope.
424424
var queriable prom_storage.Queryable
425-
if q, err := initBlockStoreQueryable(t.Cfg, t.Overrides, prometheus.DefaultRegisterer); err != nil {
425+
if q, err := initBlockStoreQueryable(t.Cfg, t.OverridesConfig, prometheus.DefaultRegisterer); err != nil {
426426
return nil, fmt.Errorf("failed to initialize querier: %v", err)
427427
} else {
428428
queriable = q
429429
if t.Cfg.Querier.EnableParquetQueryable {
430-
pq, err := querier.NewParquetQueryable(t.Cfg.Querier, t.Cfg.BlocksStorage, t.Overrides, q, util_log.Logger, prometheus.DefaultRegisterer)
430+
pq, err := querier.NewParquetQueryable(t.Cfg.Querier, t.Cfg.BlocksStorage, t.OverridesConfig, q, util_log.Logger, prometheus.DefaultRegisterer)
431431
if err != nil {
432432
return nil, fmt.Errorf("failed to initialize parquet querier: %v", err)
433433
}
@@ -477,7 +477,7 @@ func (t *Cortex) initIngesterService() (serv services.Service, err error) {
477477
t.Cfg.Ingester.QueryIngestersWithin = t.Cfg.Querier.QueryIngestersWithin
478478
t.tsdbIngesterConfig()
479479

480-
t.Ingester, err = ingester.New(t.Cfg.Ingester, t.Overrides, prometheus.DefaultRegisterer, util_log.Logger, t.ResourceMonitor)
480+
t.Ingester, err = ingester.New(t.Cfg.Ingester, t.OverridesConfig, prometheus.DefaultRegisterer, util_log.Logger, t.ResourceMonitor)
481481
if err != nil {
482482
return
483483
}
@@ -497,7 +497,7 @@ func (t *Cortex) initFlusher() (serv services.Service, err error) {
497497
t.Flusher, err = flusher.New(
498498
t.Cfg.Flusher,
499499
t.Cfg.Ingester,
500-
t.Overrides,
500+
t.OverridesConfig,
501501
prometheus.DefaultRegisterer,
502502
util_log.Logger,
503503
)
@@ -532,7 +532,7 @@ func (t *Cortex) initQueryFrontendTripperware() (serv services.Service, err erro
532532
queryRangeMiddlewares, cache, err := queryrange.Middlewares(
533533
t.Cfg.QueryRange,
534534
util_log.Logger,
535-
t.Overrides,
535+
t.OverridesConfig,
536536
queryrange.PrometheusResponseExtractor{},
537537
prometheus.DefaultRegisterer,
538538
queryAnalyzer,
@@ -548,7 +548,7 @@ func (t *Cortex) initQueryFrontendTripperware() (serv services.Service, err erro
548548

549549
instantQueryMiddlewares, err := instantquery.Middlewares(
550550
util_log.Logger,
551-
t.Overrides,
551+
t.OverridesConfig,
552552
instantQueryCodec,
553553
queryAnalyzer,
554554
t.Cfg.Querier.LookbackDelta,
@@ -565,7 +565,7 @@ func (t *Cortex) initQueryFrontendTripperware() (serv services.Service, err erro
565565
instantQueryMiddlewares,
566566
prometheusCodec,
567567
instantQueryCodec,
568-
t.Overrides,
568+
t.OverridesConfig,
569569
queryAnalyzer,
570570
t.Cfg.Querier.DefaultEvaluationInterval,
571571
t.Cfg.Querier.MaxSubQuerySteps,
@@ -583,7 +583,7 @@ func (t *Cortex) initQueryFrontendTripperware() (serv services.Service, err erro
583583

584584
func (t *Cortex) initQueryFrontend() (serv services.Service, err error) {
585585
retry := transport.NewRetry(t.Cfg.QueryRange.MaxRetries, prometheus.DefaultRegisterer)
586-
roundTripper, frontendV1, frontendV2, err := frontend.InitFrontend(t.Cfg.Frontend, t.Overrides, t.Cfg.Server.GRPCListenPort, util_log.Logger, prometheus.DefaultRegisterer, retry)
586+
roundTripper, frontendV1, frontendV2, err := frontend.InitFrontend(t.Cfg.Frontend, t.OverridesConfig, t.Cfg.Server.GRPCListenPort, util_log.Logger, prometheus.DefaultRegisterer, retry)
587587
if err != nil {
588588
return nil, err
589589
}
@@ -618,7 +618,7 @@ func (t *Cortex) initRulerStorage() (serv services.Service, err error) {
618618
return
619619
}
620620

621-
t.RulerStorage, err = ruler.NewRuleStore(context.Background(), t.Cfg.RulerStorage, t.Overrides, rules.FileLoader{}, util_log.Logger, prometheus.DefaultRegisterer)
621+
t.RulerStorage, err = ruler.NewRuleStore(context.Background(), t.Cfg.RulerStorage, t.OverridesConfig, rules.FileLoader{}, util_log.Logger, prometheus.DefaultRegisterer)
622622
return
623623
}
624624

@@ -664,15 +664,15 @@ func (t *Cortex) initRuler() (serv services.Service, err error) {
664664
}
665665
queryEngine := engine.New(opts, t.Cfg.Ruler.ThanosEngine, rulerRegisterer)
666666

667-
managerFactory := ruler.DefaultTenantManagerFactory(t.Cfg.Ruler, t.Cfg.ExternalPusher, t.Cfg.ExternalQueryable, queryEngine, t.Overrides, metrics, prometheus.DefaultRegisterer)
668-
manager, err = ruler.NewDefaultMultiTenantManager(t.Cfg.Ruler, t.Overrides, managerFactory, metrics, prometheus.DefaultRegisterer, util_log.Logger)
667+
managerFactory := ruler.DefaultTenantManagerFactory(t.Cfg.Ruler, t.Cfg.ExternalPusher, t.Cfg.ExternalQueryable, queryEngine, t.OverridesConfig, metrics, prometheus.DefaultRegisterer)
668+
manager, err = ruler.NewDefaultMultiTenantManager(t.Cfg.Ruler, t.OverridesConfig, managerFactory, metrics, prometheus.DefaultRegisterer, util_log.Logger)
669669
} else {
670670
rulerRegisterer := prometheus.WrapRegistererWith(prometheus.Labels{"engine": "ruler"}, prometheus.DefaultRegisterer)
671671
// TODO: Consider wrapping logger to differentiate from querier module logger
672-
queryable, _, engine := querier.New(t.Cfg.Querier, t.Overrides, t.Distributor, t.StoreQueryables, rulerRegisterer, util_log.Logger, t.Overrides.RulesPartialData)
672+
queryable, _, engine := querier.New(t.Cfg.Querier, t.OverridesConfig, t.Distributor, t.StoreQueryables, rulerRegisterer, util_log.Logger, t.OverridesConfig.RulesPartialData)
673673

674-
managerFactory := ruler.DefaultTenantManagerFactory(t.Cfg.Ruler, t.Distributor, queryable, engine, t.Overrides, metrics, prometheus.DefaultRegisterer)
675-
manager, err = ruler.NewDefaultMultiTenantManager(t.Cfg.Ruler, t.Overrides, managerFactory, metrics, prometheus.DefaultRegisterer, util_log.Logger)
674+
managerFactory := ruler.DefaultTenantManagerFactory(t.Cfg.Ruler, t.Distributor, queryable, engine, t.OverridesConfig, metrics, prometheus.DefaultRegisterer)
675+
manager, err = ruler.NewDefaultMultiTenantManager(t.Cfg.Ruler, t.OverridesConfig, managerFactory, metrics, prometheus.DefaultRegisterer, util_log.Logger)
676676
}
677677

678678
if err != nil {
@@ -685,7 +685,7 @@ func (t *Cortex) initRuler() (serv services.Service, err error) {
685685
prometheus.DefaultRegisterer,
686686
util_log.Logger,
687687
t.RulerStorage,
688-
t.Overrides,
688+
t.OverridesConfig,
689689
)
690690
if err != nil {
691691
return
@@ -720,12 +720,12 @@ func (t *Cortex) initAlertManager() (serv services.Service, err error) {
720720
t.Cfg.Alertmanager.ShardingRing.ListenPort = t.Cfg.Server.GRPCListenPort
721721

722722
// Initialise the store.
723-
store, err := alertstore.NewAlertStore(context.Background(), t.Cfg.AlertmanagerStorage, t.Overrides, util_log.Logger, prometheus.DefaultRegisterer)
723+
store, err := alertstore.NewAlertStore(context.Background(), t.Cfg.AlertmanagerStorage, t.OverridesConfig, util_log.Logger, prometheus.DefaultRegisterer)
724724
if err != nil {
725725
return
726726
}
727727

728-
t.Alertmanager, err = alertmanager.NewMultitenantAlertmanager(&t.Cfg.Alertmanager, store, t.Overrides, util_log.Logger, prometheus.DefaultRegisterer)
728+
t.Alertmanager, err = alertmanager.NewMultitenantAlertmanager(&t.Cfg.Alertmanager, store, t.OverridesConfig, util_log.Logger, prometheus.DefaultRegisterer)
729729
if err != nil {
730730
return
731731
}
@@ -736,14 +736,14 @@ func (t *Cortex) initAlertManager() (serv services.Service, err error) {
736736

737737
func (t *Cortex) initParquetConverter() (serv services.Service, err error) {
738738
t.Cfg.ParquetConverter.Ring.ListenPort = t.Cfg.Server.GRPCListenPort
739-
return parquetconverter.NewConverter(t.Cfg.ParquetConverter, t.Cfg.BlocksStorage, t.Cfg.Compactor.BlockRanges.ToMilliseconds(), util_log.Logger, prometheus.DefaultRegisterer, t.Overrides)
739+
return parquetconverter.NewConverter(t.Cfg.ParquetConverter, t.Cfg.BlocksStorage, t.Cfg.Compactor.BlockRanges.ToMilliseconds(), util_log.Logger, prometheus.DefaultRegisterer, t.OverridesConfig)
740740
}
741741

742742
func (t *Cortex) initCompactor() (serv services.Service, err error) {
743743
t.Cfg.Compactor.ShardingRing.ListenPort = t.Cfg.Server.GRPCListenPort
744744
ingestionReplicationFactor := t.Cfg.Ingester.LifecyclerConfig.RingConfig.ReplicationFactor
745745

746-
t.Compactor, err = compactor.NewCompactor(t.Cfg.Compactor, t.Cfg.BlocksStorage, util_log.Logger, prometheus.DefaultRegisterer, t.Overrides, ingestionReplicationFactor)
746+
t.Compactor, err = compactor.NewCompactor(t.Cfg.Compactor, t.Cfg.BlocksStorage, util_log.Logger, prometheus.DefaultRegisterer, t.OverridesConfig, ingestionReplicationFactor)
747747
if err != nil {
748748
return
749749
}
@@ -756,7 +756,7 @@ func (t *Cortex) initCompactor() (serv services.Service, err error) {
756756
func (t *Cortex) initStoreGateway() (serv services.Service, err error) {
757757
t.Cfg.StoreGateway.ShardingRing.ListenPort = t.Cfg.Server.GRPCListenPort
758758

759-
t.StoreGateway, err = storegateway.NewStoreGateway(t.Cfg.StoreGateway, t.Cfg.BlocksStorage, t.Overrides, t.Cfg.Server.LogLevel, util_log.Logger, prometheus.DefaultRegisterer, t.ResourceMonitor)
759+
t.StoreGateway, err = storegateway.NewStoreGateway(t.Cfg.StoreGateway, t.Cfg.BlocksStorage, t.OverridesConfig, t.Cfg.Server.LogLevel, util_log.Logger, prometheus.DefaultRegisterer, t.ResourceMonitor)
760760
if err != nil {
761761
return nil, err
762762
}
@@ -798,7 +798,7 @@ func (t *Cortex) initMemberlistKV() (services.Service, error) {
798798

799799
func (t *Cortex) initTenantDeletionAPI() (services.Service, error) {
800800
// t.RulerStorage can be nil when running in single-binary mode, and rule storage is not configured.
801-
tenantDeletionAPI, err := purger.NewTenantDeletionAPI(t.Cfg.BlocksStorage, t.Overrides, util_log.Logger, prometheus.DefaultRegisterer)
801+
tenantDeletionAPI, err := purger.NewTenantDeletionAPI(t.Cfg.BlocksStorage, t.OverridesConfig, util_log.Logger, prometheus.DefaultRegisterer)
802802
if err != nil {
803803
return nil, err
804804
}
@@ -813,7 +813,7 @@ func (t *Cortex) initQueryScheduler() (services.Service, error) {
813813
tenant.WithDefaultResolver(tenantfederation.NewRegexValidator())
814814
}
815815

816-
s, err := scheduler.NewScheduler(t.Cfg.QueryScheduler, t.Overrides, util_log.Logger, prometheus.DefaultRegisterer)
816+
s, err := scheduler.NewScheduler(t.Cfg.QueryScheduler, t.OverridesConfig, util_log.Logger, prometheus.DefaultRegisterer)
817817
if err != nil {
818818
return nil, errors.Wrap(err, "query-scheduler init")
819819
}
@@ -857,7 +857,7 @@ func (t *Cortex) setupModuleManager() error {
857857
mm.RegisterModule(RuntimeConfig, t.initRuntimeConfig, modules.UserInvisibleModule)
858858
mm.RegisterModule(MemberlistKV, t.initMemberlistKV, modules.UserInvisibleModule)
859859
mm.RegisterModule(Ring, t.initRing, modules.UserInvisibleModule)
860-
mm.RegisterModule(Overrides, t.initOverrides, modules.UserInvisibleModule)
860+
mm.RegisterModule(OverridesConfig, t.initOverridesConfig, modules.UserInvisibleModule)
861861
mm.RegisterModule(OverridesExporter, t.initOverridesExporter)
862862
mm.RegisterModule(Distributor, t.initDistributor)
863863
mm.RegisterModule(DistributorService, t.initDistributorService, modules.UserInvisibleModule)
@@ -889,33 +889,33 @@ func (t *Cortex) setupModuleManager() error {
889889
MemberlistKV: {API},
890890
RuntimeConfig: {API},
891891
Ring: {API, RuntimeConfig, MemberlistKV},
892-
Overrides: {RuntimeConfig},
892+
OverridesConfig: {RuntimeConfig},
893893
OverridesExporter: {RuntimeConfig},
894894
Distributor: {DistributorService, API, GrpcClientService},
895-
DistributorService: {Ring, Overrides},
896-
Ingester: {IngesterService, Overrides, API},
897-
IngesterService: {Overrides, RuntimeConfig, MemberlistKV, ResourceMonitor},
898-
Flusher: {Overrides, API},
899-
Queryable: {Overrides, DistributorService, Overrides, Ring, API, StoreQueryable, MemberlistKV},
895+
DistributorService: {Ring, OverridesConfig},
896+
Ingester: {IngesterService, OverridesConfig, API},
897+
IngesterService: {OverridesConfig, RuntimeConfig, MemberlistKV, ResourceMonitor},
898+
Flusher: {OverridesConfig, API},
899+
Queryable: {OverridesConfig, DistributorService, OverridesConfig, Ring, API, StoreQueryable, MemberlistKV},
900900
Querier: {TenantFederation},
901-
StoreQueryable: {Overrides, Overrides, MemberlistKV, GrpcClientService},
902-
QueryFrontendTripperware: {API, Overrides},
901+
StoreQueryable: {OverridesConfig, OverridesConfig, MemberlistKV, GrpcClientService},
902+
QueryFrontendTripperware: {API, OverridesConfig},
903903
QueryFrontend: {QueryFrontendTripperware},
904-
QueryScheduler: {API, Overrides},
905-
Ruler: {DistributorService, Overrides, StoreQueryable, RulerStorage},
906-
RulerStorage: {Overrides},
904+
QueryScheduler: {API, OverridesConfig},
905+
Ruler: {DistributorService, OverridesConfig, StoreQueryable, RulerStorage},
906+
RulerStorage: {OverridesConfig},
907907
Configs: {API},
908-
AlertManager: {API, MemberlistKV, Overrides},
909-
Compactor: {API, MemberlistKV, Overrides},
910-
ParquetConverter: {API, MemberlistKV, Overrides},
911-
StoreGateway: {API, Overrides, MemberlistKV, ResourceMonitor},
912-
TenantDeletion: {API, Overrides},
908+
AlertManager: {API, MemberlistKV, OverridesConfig},
909+
Compactor: {API, MemberlistKV, OverridesConfig},
910+
ParquetConverter: {API, MemberlistKV, OverridesConfig},
911+
StoreGateway: {API, OverridesConfig, MemberlistKV, ResourceMonitor},
912+
TenantDeletion: {API, OverridesConfig},
913913
Purger: {TenantDeletion},
914914
TenantFederation: {Queryable},
915915
All: {QueryFrontend, Querier, Ingester, Distributor, Purger, StoreGateway, Ruler, Compactor, AlertManager},
916916
}
917917
if t.Cfg.ExternalPusher != nil && t.Cfg.ExternalQueryable != nil {
918-
deps[Ruler] = []string{Overrides, RulerStorage}
918+
deps[Ruler] = []string{OverridesConfig, RulerStorage}
919919
}
920920
for mod, targets := range deps {
921921
if err := mm.AddDependency(mod, targets...); err != nil {

0 commit comments

Comments
 (0)