Merge pull request grafana/cortex-jsonnet#306 from grafana/migrate-ru…

…ler-to-bucket-client Use new ruler storage config and enable API compression
grafana · May 14, 2021 · e5cba39 · e5cba39
2 parents 12fda45 + 3db36ef
commit e5cba39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/operations/mimir/config.libsonnet b/operations/mimir/config.libsonnet
@@ -260,20 +260,21 @@
 
     rulerClientConfig:
       {
-        'ruler.storage.type': $._config.ruler_client_type,
+        'ruler-storage.backend': $._config.ruler_client_type,
       } +
       {
         configdb: {
           configs_api_url: 'config.%s.svc.cluster.local' % $._config.namespace,
         },
         gcs: {
-          'ruler.storage.gcs.bucketname': $._config.ruler_gcs_bucket_name,
+          'ruler-storage.gcs.bucket-name': $._config.ruler_gcs_bucket_name,
         },
         s3: {
-          'ruler.storage.s3.url': 'https://%s/%s' % [$._config.aws_region, $._config.ruler_s3_bucket_name],
+          'ruler-storage.s3.region': $._config.aws_region,
+          'ruler-storage.s3.bucket-name': $._config.ruler_s3_bucket_name,
         },
         'local': {
-          'ruler.storage.local.directory': $._config.ruler_local_directory,
+          'ruler-storage.local.directory': $._config.ruler_local_directory,
         },
       }[$._config.ruler_client_type],
 

diff --git a/operations/mimir/ruler.libsonnet b/operations/mimir/ruler.libsonnet
@@ -15,6 +15,7 @@
       // Alertmanager configs
       'ruler.alertmanager-url': 'http://alertmanager.%s.svc.cluster.local/alertmanager' % $._config.namespace,
       'experimental.ruler.enable-api': true,
+      'api.response-compression-enabled': true,
 
       // Ring Configs
       'ruler.enable-sharding': true,