Skip to content
This repository was archived by the owner on Apr 28, 2025. It is now read-only.

Add overrides to compactor #386

Merged
merged 1 commit into from
Sep 2, 2021
Merged

Add overrides to compactor #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* [CHANGE] Decreased `-server.grpc-max-concurrent-streams` from 100k to 10k. #369
* [CHANGE] Decreased blocks storage ingesters graceful termination period from 80m to 20m. #369
* [CHANGE] Changed default `job_names` for query-frontend, query-scheduler and querier to match custom deployments too. #376
* [ENHANCEMENT] Add overrides config to compactor. This allows setting retention configs per user. #386
* [ENHANCEMENT] cortex-mixin: Make `cluster_namespace_deployment:kube_pod_container_resource_requests_{cpu_cores,memory_bytes}:sum` backwards compatible with `kube-state-metrics` v2.0.0. #317
* [ENHANCEMENT] Cortex-mixin: Include `cortex-gw-internal` naming variation in default `gateway` job names. #328
* [ENHANCEMENT] Ruler dashboard: added object storage metrics. #354
Expand Down
3 changes: 3 additions & 0 deletions cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,9 @@
// 300 rules
ruler_max_rules_per_rule_group: 15,
ruler_max_rule_groups_per_tenant: 20,

// No retention for now.
compactor_blocks_retention_period: 0,
},

medium_small_user:: {
Expand Down
7 changes: 6 additions & 1 deletion cortex/tsdb.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@
'compactor.ring.store': 'consul',
'compactor.ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,
'compactor.ring.prefix': '',

// Limits config.
'runtime-config.file': '/etc/cortex/overrides.yaml',
'compactor.blocks-retention-period': $._config.limits.compactor_blocks_retention_period,
},

compactor_ports:: $.util.defaultPorts,
Expand Down Expand Up @@ -187,7 +191,8 @@
// one by one. This does NOT affect rolling updates: they will continue to be
// rolled out one by one (the next pod will be rolled out once the previous is
// ready).
statefulSet.mixin.spec.withPodManagementPolicy('Parallel'),
statefulSet.mixin.spec.withPodManagementPolicy('Parallel') +
$.util.configVolumeMount($._config.overrides_configmap, '/etc/cortex'),

compactor_statefulset:
$.newCompactorStatefulSet('compactor', $.compactor_container),
Expand Down