From 659fdd2057c45bcbd65410bebad76d9725171a82 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 9 Nov 2021 16:46:53 +0100 Subject: [PATCH 1/2] cortex: Make ruler object storage support generic Signed-off-by: Arve Knudsen --- CHANGELOG.md | 1 + cortex/config.libsonnet | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a78723..a0fed5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 8dc473a..8d12ded 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -244,8 +244,7 @@ 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: { @@ -253,11 +252,15 @@ } + { 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, From 3f451017e80991f465d0322b3e5ac0b74f5accaf Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Tue, 9 Nov 2021 17:31:46 +0100 Subject: [PATCH 2/2] Remove ruler-storage.gcs.bucket-name for Azure Signed-off-by: Arve Knudsen --- cortex/config.libsonnet | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 8d12ded..1761bed 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -258,10 +258,7 @@ 'ruler-storage.s3.region': $._config.aws_region, '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, - }, + azure: {}, 'local': { 'ruler-storage.local.directory': $._config.ruler_local_directory, },