[release-2.7.x] Add single compactor http client for delete and gennu…

…mber clients (grafana#7607)
periklis · Nov 30, 2022 · 58c4f80 · 58c4f80
1 parent 53da4cd
commit 58c4f80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -8,15 +8,15 @@ 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"`
 }
 
 // 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)