From 582a4c324269a79184cec1c126976131dddf9ef0 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Wed, 1 Jul 2020 15:10:58 +0200 Subject: [PATCH 1/3] Removed -experimental.tsdb.store-gateway-enabled flag Signed-off-by: Marco Pracucci --- cortex/config.libsonnet | 1 - 1 file changed, 1 deletion(-) diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 5b5b3f07..57d3fa7c 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -143,7 +143,6 @@ 'experimental.tsdb.ship-interval': '1m', 'experimental.tsdb.backend': 'gcs', 'experimental.tsdb.gcs.bucket-name': $._config.storage_tsdb_bucket_name, - 'experimental.tsdb.store-gateway-enabled': true, 'experimental.store-gateway.sharding-enabled': true, 'experimental.store-gateway.sharding-ring.store': 'consul', 'experimental.store-gateway.sharding-ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace, From ef34da6c7f5f633b0650f3e1f5086c4ac49896fa Mon Sep 17 00:00:00 2001 From: Austin McKinley Date: Tue, 1 Sep 2020 19:58:52 -0700 Subject: [PATCH 2/3] Use correct config variable for s3 ruler config --- cortex/config.libsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 57d3fa7c..1efe6fad 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -224,7 +224,7 @@ 'ruler.storage.gcs.bucketname': $._config.ruler_gcs_bucket_name, }, s3: { - 's3.url': 'https://%s/%s' % [$._config.aws_region, $._config.s3_bucket_name], + 's3.url': 'https://%s/%s' % [$._config.aws_region, $._config.ruler_s3_bucket_name], }, }[$._config.ruler_client_type], From b76bdde109f797ca62041bfef1a1753120f3d01b Mon Sep 17 00:00:00 2001 From: Austin McKinley Date: Tue, 1 Sep 2020 20:01:17 -0700 Subject: [PATCH 3/3] restore dropped line --- cortex/config.libsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/cortex/config.libsonnet b/cortex/config.libsonnet index 1efe6fad..76fe479b 100644 --- a/cortex/config.libsonnet +++ b/cortex/config.libsonnet @@ -143,6 +143,7 @@ 'experimental.tsdb.ship-interval': '1m', 'experimental.tsdb.backend': 'gcs', 'experimental.tsdb.gcs.bucket-name': $._config.storage_tsdb_bucket_name, + 'experimental.tsdb.store-gateway-enabled': true, 'experimental.store-gateway.sharding-enabled': true, 'experimental.store-gateway.sharding-ring.store': 'consul', 'experimental.store-gateway.sharding-ring.consul.hostname': 'consul.%s.svc.cluster.local:8500' % $._config.namespace,