Skip to content

Commit 0d4416a

Browse files
committed
include the deletes in deprecation config checker
1 parent fb73c48 commit 0d4416a

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

tools/deprecated-config-checker/checker/checker_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ var (
2727
"storage_config.aws.sse_encryption",
2828
"storage_config.s3.sse_encryption",
2929
"chunk_store_config.max_look_back_period",
30+
"storage_config.boltdb_shipper.shared_store",
31+
"storage_config.boltdb_shipper.shared_store_key_prefix",
32+
"storage_config.tsdb_shipper.shared_store",
33+
"storage_config.tsdb_shipper.shared_store_key_prefix",
34+
"compactor.shared_store",
35+
"compactor.shared_store_key_prefix",
3036
}
3137

3238
expectedConfigDeprecates = []string{

tools/deprecated-config-checker/deleted-config.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,18 @@ ruler:
2828

2929
storage_config:
3030
boltdb_shipper:
31+
shared_store: "object_store setting in the period_config will be used to configure the store for the index."
32+
shared_store_key_prefix: "Path prefix for storing the index can now be configured by setting path_prefix under index key in period_config."
3133
use_boltdb_shipper_as_backup: "Since TSDB is now stable and the recommended index type, the setting has become irrelevant and therefore was removed. The previous default value false is applied."
34+
tsdb_shipper:
35+
shared_store: "object_store setting in the period_config will be used to configure the store for the index."
36+
shared_store_key_prefix: "Path prefix for storing the index can now be configured by setting path_prefix under index key in period_config."
3237
aws: *s3_deletes
3338
s3: *s3_deletes
3439

40+
compactor:
41+
shared_store: "Compactor will now operate on all the object stores configured in period config where the index type is either tsdb or boltdb-shipper. -compactor.delete-request-store to configure the store for delete requests is now a required field."
42+
shared_store_key_prefix: "Use -compactor.delete-request-store.key-prefix to configure the path prefix under which the delete requests are stored."
43+
3544
chunk_store_config:
3645
max_look_back_period: "Use global or per-tenant max_query_lookback configuration from limits_config."

tools/deprecated-config-checker/test-fixtures/config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ index_gateway:
4141

4242
compactor:
4343
working_directory: /tmp/loki/boltdb-shipper-active
44+
shared_store: gcs # DELETED
45+
shared_store_key_prefix: /index # DELETED
4446
deletion_mode: "delete" # DEPRECATED
4547

4648
chunk_store_config:
@@ -68,8 +70,13 @@ storage_config:
6870
grpc_store: # DEPRECATED
6971
server_address: "grpc.123abc.net"
7072
boltdb_shipper:
73+
shared_store: gcs # DELETED
74+
shared_store_key_prefix: /index # DELETED
7175
active_index_directory: /tmp/loki/boltdb-shipper-active
7276
use_boltdb_shipper_as_backup: true # DELETED
77+
tsdb_shipper:
78+
shared_store: gcs # DELETED
79+
shared_store_key_prefix: /index # DELETED
7380
aws:
7481
s3: "bucket.123abc.net"
7582
sse_encryption: true # DELETED

0 commit comments

Comments
 (0)