Merge pull request #306 from grafana/migrate-ruler-to-bucket-client

Use new ruler storage config and enable API compression

Author: pracucci

CHANGELOG.md

@@ -6,6 +6,8 @@
 * [CHANGE] The default dashboards config now display panels for the Cortex blocks storage only. If you're running Cortex chunks storage, please change `storage_engine` config to `['chunks']` or `['chunks', 'blocks']` if running both. #302
 * [CHANGE] Enabled index-header lazy loading in store-gateways. #303
 * [CHANGE] Replaced the deprecated CLI flag `-limits.per-user-override-config` (removed in Cortex 1.9) with `-runtime-config.file`. #304
+* [CHANGE] Ruler: changed ruler config to use the new storage config. #306
+* [CHANGE] Ruler: enabled API response compression. #306
 * [FEATURE] Added "Cortex / Rollout progress" dashboard. #289 #290
 * [FEATURE] Added support for using query-scheduler component, which moves the queue out of query-frontend, and allows scaling up of query-frontend component. #295
 * [ENHANCEMENT] Added `newCompactorStatefulSet()` function to create a custom statefulset for the compactor. #287

cortex/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],
 

cortex/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,