Wire tenant's external labels from hashring to multiTSDB

Signed-off-by: haanhvu <[email protected]>
thanos-io · Oct 26, 2022 · 6e5e45a · 6e5e45a
1 parent 5f2cb67
commit 6e5e45a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/pkg/receive/config.go b/pkg/receive/config.go
@@ -43,7 +43,7 @@ type HashringConfig struct {
 	Hashring       string   `json:"hashring,omitempty"`
 	Tenants        []string `json:"tenants,omitempty"`
 	Endpoints      []string `json:"endpoints"`
-	ExternalLabels []string `json:"external-labels"`
+	ExternalLabels []string `json:"external_labels"`
 }
 
 // ConfigWatcher is able to watch a file containing a hashring configuration

diff --git a/pkg/receive/multitsdb.go b/pkg/receive/multitsdb.go
@@ -35,6 +35,7 @@ import (
 	"github.com/thanos-io/thanos/pkg/store"
 	"github.com/thanos-io/thanos/pkg/store/labelpb"
 	"github.com/thanos-io/thanos/pkg/store/storepb"
+	"github.com/thanos-io/thanos/cmd/thanos"
 )
 
 type TSDBStats interface {
@@ -138,7 +139,7 @@ type tenant struct {
 	storeTSDB      *store.TSDBStore
 	exemplarsTSDB  *exemplars.TSDB
 	ship           *shipper.Shipper
-	externalLabels labels.Labels
+	externalLabels HashringConfig.ExternalLabels
 
 	mtx *sync.RWMutex
 }
@@ -181,12 +182,13 @@ func (t *tenant) shipper() *shipper.Shipper {
 	return t.ship
 }
 
-func (t *tenant) set(storeTSDB *store.TSDBStore, tenantTSDB *tsdb.DB, ship *shipper.Shipper, exemplarsTSDB *exemplars.TSDB) {
+func (t *tenant) set(storeTSDB *store.TSDBStore, tenantTSDB *tsdb.DB, ship *shipper.Shipper, exemplarsTSDB *exemplars.TSDB, externalLabels HashringConfig.ExternalLabels) {
 	t.readyS.Set(tenantTSDB)
 	t.mtx.Lock()
 	t.storeTSDB = storeTSDB
 	t.ship = ship
 	t.exemplarsTSDB = exemplarsTSDB
+	t.externalLabels = HashringConfig.ExternalLabels
 	t.mtx.Unlock()
 }
 
@@ -494,8 +496,9 @@ func (t *MultiTSDB) startTSDB(logger log.Logger, tenantID string, tenant *tenant
 	reg = NewUnRegisterer(reg)
 
 	lset := labelpb.ExtendSortedLabels(t.labels, labels.FromStrings(t.tenantLabelName, tenantID))
+	tenantExternalLabels := thanos.parseFlagLabels(tenant.externalLabels)
 	for _, tenantInstance := range t.tenants {
-		lset = labelpb.ExtendSortedLabels(t.labels, tenantInstance.externalLabels)
+		lset = labelpb.ExtendSortedLabels(t.labels, tenantExternalLabels)
 	}
 	dataDir := t.defaultTenantDataDir(tenantID)