Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cortex: Make ruler object storage support generic #415

Merged
merged 2 commits into from
Nov 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
* `_config` > `queryFrontend` > `query_split_factor`
* [CHANGE] Split `cortex_api` recording rule group into three groups. This is a workaround for large clusters where this group can become slow to evaluate. #401
* [CHANGE] Increased `CortexIngesterReachingSeriesLimit` warning threshold from 70% to 80% and critical threshold from 85% to 90%. #404
* [CHANGE] Rename ruler_s3_bucket_name and ruler_gcs_bucket_name to ruler_storage_bucket_name: #415
* [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
Expand Down
8 changes: 4 additions & 4 deletions cortex/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -244,21 +244,21 @@

ruler_enabled: false,
ruler_client_type: error 'you must specify a storage backend type for the ruler (azure, gcs, s3, local)',
ruler_s3_bucket_name: error 'you must specify the ruler S3 bucket name',
ruler_gcs_bucket_name: error 'must specify a GCS bucket name',
ruler_storage_bucket_name: error 'must specify the ruler storage bucket name',

rulerClientConfig:
{
'ruler-storage.backend': $._config.ruler_client_type,
} +
{
gcs: {
'ruler-storage.gcs.bucket-name': $._config.ruler_gcs_bucket_name,
'ruler-storage.gcs.bucket-name': $._config.ruler_storage_bucket_name,
},
s3: {
'ruler-storage.s3.region': $._config.aws_region,
'ruler-storage.s3.bucket-name': $._config.ruler_s3_bucket_name,
'ruler-storage.s3.bucket-name': $._config.ruler_storage_bucket_name,
},
azure: {},
'local': {
'ruler-storage.local.directory': $._config.ruler_local_directory,
},
Expand Down