From 0d4416a4b03739583349934b96f272fb4f685d15 Mon Sep 17 00:00:00 2001 From: Ashwanth Goli Date: Fri, 27 Oct 2023 15:03:00 +0530 Subject: [PATCH] include the deletes in deprecation config checker --- tools/deprecated-config-checker/checker/checker_test.go | 6 ++++++ tools/deprecated-config-checker/deleted-config.yaml | 9 +++++++++ .../deprecated-config-checker/test-fixtures/config.yaml | 7 +++++++ 3 files changed, 22 insertions(+) diff --git a/tools/deprecated-config-checker/checker/checker_test.go b/tools/deprecated-config-checker/checker/checker_test.go index 9d93bc84b62a..e02315821d4b 100644 --- a/tools/deprecated-config-checker/checker/checker_test.go +++ b/tools/deprecated-config-checker/checker/checker_test.go @@ -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{ diff --git a/tools/deprecated-config-checker/deleted-config.yaml b/tools/deprecated-config-checker/deleted-config.yaml index b21bc995185d..322e861d70ee 100644 --- a/tools/deprecated-config-checker/deleted-config.yaml +++ b/tools/deprecated-config-checker/deleted-config.yaml @@ -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." diff --git a/tools/deprecated-config-checker/test-fixtures/config.yaml b/tools/deprecated-config-checker/test-fixtures/config.yaml index 2600c63034ea..80d864188b0f 100644 --- a/tools/deprecated-config-checker/test-fixtures/config.yaml +++ b/tools/deprecated-config-checker/test-fixtures/config.yaml @@ -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: @@ -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