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

cortex: Make ruler object storage support generic #415

Merged
merged 2 commits into from
Nov 9, 2021
Merged

cortex: Make ruler object storage support generic #415

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659fdd2
cortex: Make ruler object storage support generic
aknuds1 Nov 9, 2021
3f45101
Remove ruler-storage.gcs.bucket-name for Azure
aknuds1 Nov 9, 2021
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 @@ -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
11 changes: 7 additions & 4 deletions cortex/config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,20 +244,23 @@

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: {
// TODO: Is this the correct flag??
'ruler-storage.gcs.bucket-name': $._config.ruler_storage_bucket_name,
},
'local': {
'ruler-storage.local.directory': $._config.ruler_local_directory,
Expand Down