From 9129be28250afca8d0f08afe5a5e6a1920108c77 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 --- operations/mimir/config.libsonnet | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet index 8dc473aad33..8d12ded8ff6 100644 --- a/operations/mimir/config.libsonnet +++ b/operations/mimir/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 e3ad38200049169c593ce408b6d761be07cb4cea 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 --- operations/mimir/config.libsonnet | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet index 8d12ded8ff6..1761bed9004 100644 --- a/operations/mimir/config.libsonnet +++ b/operations/mimir/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, },