From 58c4f80fbefcd62528ed21875daf92345f775dae Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Wed, 30 Nov 2022 11:46:24 +0100 Subject: [PATCH] [release-2.7.x] Add single compactor http client for delete and gennumber clients (#7607) --- pkg/loki/loki.go | 2 +- pkg/storage/stores/indexshipper/compactor/compactor_client.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go index 0f6d53790b0ac..a667be14d7fd4 100644 --- a/pkg/loki/loki.go +++ b/pkg/loki/loki.go @@ -74,7 +74,7 @@ type Config struct { InternalServer internalserver.Config `yaml:"internal_server,omitempty"` Distributor distributor.Config `yaml:"distributor,omitempty"` Querier querier.Config `yaml:"querier,omitempty"` - CompactorClient compactor.ClientConfig `yaml:"compactor_client,omitempty"` + CompactorClient compactor.ClientConfig `yaml:"delete_client,omitempty"` IngesterClient client.Config `yaml:"ingester_client,omitempty"` Ingester ingester.Config `yaml:"ingester,omitempty"` StorageConfig storage.Config `yaml:"storage_config,omitempty"` diff --git a/pkg/storage/stores/indexshipper/compactor/compactor_client.go b/pkg/storage/stores/indexshipper/compactor/compactor_client.go index 63468568dc415..e37cdcab5e446 100644 --- a/pkg/storage/stores/indexshipper/compactor/compactor_client.go +++ b/pkg/storage/stores/indexshipper/compactor/compactor_client.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/dskit/crypto/tls" ) -// Config for compactor's generation-number client +// Config for compactor's delete and generation-number client type ClientConfig struct { TLSEnabled bool `yaml:"tls_enabled"` TLS tls.ClientConfig `yaml:",inline"` @@ -16,7 +16,7 @@ type ClientConfig struct { // RegisterFlags adds the flags required to config this to the given FlagSet. func (cfg *ClientConfig) RegisterFlags(f *flag.FlagSet) { - prefix := "boltdb.shipper.compactor.client" + prefix := "boltdb.shipper.compactor.delete_client" f.BoolVar(&cfg.TLSEnabled, prefix+".tls-enabled", false, "Enable TLS in the HTTP client. This flag needs to be enabled when any other TLS flag is set. If set to false, insecure connection to HTTP server will be used.") cfg.TLS.RegisterFlagsWithPrefix(prefix, f)