Skip to content

Commit 47b83ce

Browse files
committed
Remove unused cardinality limit flag
Signed-off-by: Andrew Bloomgarden <[email protected]>
1 parent 435c4cd commit 47b83ce

File tree

2 files changed

+0
-12
lines changed

2 files changed

+0
-12
lines changed

docs/configuration/config-file-reference.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2688,11 +2688,6 @@ The `limits_config` configures default and per-tenant limits imposed by Cortex s
26882688
# CLI flag: -querier.max-query-parallelism
26892689
[max_query_parallelism: <int> | default = 14]
26902690
2691-
# Cardinality limit for index queries. This limit is ignored when running the
2692-
# Cortex blocks storage. 0 to disable.
2693-
# CLI flag: -store.cardinality-limit
2694-
[cardinality_limit: <int> | default = 100000]
2695-
26962691
# Most recent allowed cacheable result per-tenant, to prevent caching very
26972692
# recent results that might still be in flux.
26982693
# CLI flag: -frontend.max-cache-freshness

pkg/util/validation/limits.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ type Limits struct {
7575
MaxQueryLookback model.Duration `yaml:"max_query_lookback" json:"max_query_lookback"`
7676
MaxQueryLength model.Duration `yaml:"max_query_length" json:"max_query_length"`
7777
MaxQueryParallelism int `yaml:"max_query_parallelism" json:"max_query_parallelism"`
78-
CardinalityLimit int `yaml:"cardinality_limit" json:"cardinality_limit"`
7978
MaxCacheFreshness model.Duration `yaml:"max_cache_freshness" json:"max_cache_freshness"`
8079
MaxQueriersPerTenant int `yaml:"max_queriers_per_tenant" json:"max_queriers_per_tenant"`
8180

@@ -152,7 +151,6 @@ func (l *Limits) RegisterFlags(f *flag.FlagSet) {
152151
f.Var(&l.MaxQueryLength, "store.max-query-length", "Limit the query time range (end - start time). This limit is enforced in the query-frontend (on the received query) and in the querier (on the query possibly split by the query-frontend). 0 to disable.")
153152
f.Var(&l.MaxQueryLookback, "querier.max-query-lookback", "Limit how long back data (series and metadata) can be queried, up until <lookback> duration ago. This limit is enforced in the query-frontend, querier and ruler. If the requested time range is outside the allowed range, the request will not fail but will be manipulated to only query data within the allowed time range. 0 to disable.")
154153
f.IntVar(&l.MaxQueryParallelism, "querier.max-query-parallelism", 14, "Maximum number of split queries will be scheduled in parallel by the frontend.")
155-
f.IntVar(&l.CardinalityLimit, "store.cardinality-limit", 1e5, "Cardinality limit for index queries. This limit is ignored when running the Cortex blocks storage. 0 to disable.")
156154
_ = l.MaxCacheFreshness.Set("1m")
157155
f.Var(&l.MaxCacheFreshness, "frontend.max-cache-freshness", "Most recent allowed cacheable result per-tenant, to prevent caching very recent results that might still be in flux.")
158156
f.IntVar(&l.MaxQueriersPerTenant, "frontend.max-queriers-per-tenant", 0, "Maximum number of queriers that can handle requests for a single tenant. If set to 0 or value higher than number of available queriers, *all* queriers will handle requests for the tenant. Each frontend (or query-scheduler, if used) will select the same set of queriers for the same tenant (given that all queriers are connected to all frontends / query-schedulers). This option only works with queriers connecting to the query-frontend / query-scheduler, not when using downstream URL.")
@@ -436,11 +434,6 @@ func (o *Overrides) EnforceMetadataMetricName(userID string) bool {
436434
return o.getOverridesForUser(userID).EnforceMetadataMetricName
437435
}
438436

439-
// CardinalityLimit returns the maximum number of timeseries allowed in a query.
440-
func (o *Overrides) CardinalityLimit(userID string) int {
441-
return o.getOverridesForUser(userID).CardinalityLimit
442-
}
443-
444437
// MaxLocalMetricsWithMetadataPerUser returns the maximum number of metrics with metadata a user is allowed to store in a single ingester.
445438
func (o *Overrides) MaxLocalMetricsWithMetadataPerUser(userID string) int {
446439
return o.getOverridesForUser(userID).MaxLocalMetricsWithMetadataPerUser

0 commit comments

Comments
 (0)