Merge pull request #415 from grafana/chore/generic-ruler-objectstorage

cortex: Make ruler object storage support generic
grafana · Nov 9, 2021 · fc50bc0 · fc50bc0
2 parents f723ef3 + 3f45101
commit fc50bc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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,
         },