From 3f6eefb883d539ff99972a9cb02fafa2dec8127d Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Tue, 20 Nov 2018 13:42:02 +0000
Subject: [PATCH] RingConfig is in the IngesterConfig, so don't repeat it.
Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>
---
cmd/tempo/main.go | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/cmd/tempo/main.go b/cmd/tempo/main.go
index 6a4d6e93..c2a6731d 100644
--- a/cmd/tempo/main.go
+++ b/cmd/tempo/main.go
@@ -27,7 +27,6 @@ import (
type config struct {
serverConfig server.Config
- ringConfig ring.Config
distributorConfig distributor.Config
ingesterConfig ingester.Config
querierConfig querier.Config
@@ -39,8 +38,8 @@ func (c *config) RegisterFlags(f *flag.FlagSet) {
middleware.ServerUserHeaderInterceptor,
}
- flagext.RegisterConfigs(f, &c.serverConfig, &c.ringConfig,
- &c.distributorConfig, &c.ingesterConfig, &c.querierConfig)
+ flagext.RegisterConfigs(f, &c.serverConfig, &c.distributorConfig,
+ &c.ingesterConfig, &c.querierConfig)
}
type Tempo struct {
@@ -115,7 +114,7 @@ type module struct {
var modules = map[moduleName]module{
Ring: module{
init: func(t *Tempo, cfg *config) (err error) {
- t.ring, err = ring.New(cfg.ringConfig)
+ t.ring, err = ring.New(cfg.ingesterConfig.LifecyclerConfig.RingConfig)
if err != nil {
return
}
--
GitLab