Skip to content

Commit

Permalink
include the deletes in deprecation config checker
Browse files Browse the repository at this point in the history
  • Loading branch information
ashwanthgoli committed Oct 27, 2023
1 parent fb73c48 commit 0d4416a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 0 deletions.
6 changes: 6 additions & 0 deletions tools/deprecated-config-checker/checker/checker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ var (
"storage_config.aws.sse_encryption",
"storage_config.s3.sse_encryption",
"chunk_store_config.max_look_back_period",
"storage_config.boltdb_shipper.shared_store",
"storage_config.boltdb_shipper.shared_store_key_prefix",
"storage_config.tsdb_shipper.shared_store",
"storage_config.tsdb_shipper.shared_store_key_prefix",
"compactor.shared_store",
"compactor.shared_store_key_prefix",
}

expectedConfigDeprecates = []string{
Expand Down
9 changes: 9 additions & 0 deletions tools/deprecated-config-checker/deleted-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,18 @@ ruler:

storage_config:
boltdb_shipper:
shared_store: "object_store setting in the period_config will be used to configure the store for the index."
shared_store_key_prefix: "Path prefix for storing the index can now be configured by setting path_prefix under index key in period_config."
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."
tsdb_shipper:
shared_store: "object_store setting in the period_config will be used to configure the store for the index."
shared_store_key_prefix: "Path prefix for storing the index can now be configured by setting path_prefix under index key in period_config."
aws: *s3_deletes
s3: *s3_deletes

compactor:
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."
shared_store_key_prefix: "Use -compactor.delete-request-store.key-prefix to configure the path prefix under which the delete requests are stored."

chunk_store_config:
max_look_back_period: "Use global or per-tenant max_query_lookback configuration from limits_config."
7 changes: 7 additions & 0 deletions tools/deprecated-config-checker/test-fixtures/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ index_gateway:

compactor:
working_directory: /tmp/loki/boltdb-shipper-active
shared_store: gcs # DELETED
shared_store_key_prefix: /index # DELETED
deletion_mode: "delete" # DEPRECATED

chunk_store_config:
Expand Down Expand Up @@ -68,8 +70,13 @@ storage_config:
grpc_store: # DEPRECATED
server_address: "grpc.123abc.net"
boltdb_shipper:
shared_store: gcs # DELETED
shared_store_key_prefix: /index # DELETED
active_index_directory: /tmp/loki/boltdb-shipper-active
use_boltdb_shipper_as_backup: true # DELETED
tsdb_shipper:
shared_store: gcs # DELETED
shared_store_key_prefix: /index # DELETED
aws:
s3: "bucket.123abc.net"
sse_encryption: true # DELETED
Expand Down

0 comments on commit 0d4416a

Please sign in to comment.