Various small nits.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

cmd/ingester/main.go

@@ -7,7 +7,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/weaveworks/common/middleware"
 	"github.com/weaveworks/common/server"
-	"github.com/weaveworks/cortex/pkg/ring"
 	"github.com/weaveworks/cortex/pkg/util"
 	"google.golang.org/grpc"
 
@@ -23,12 +22,12 @@ func main() {
 				middleware.ServerUserHeaderInterceptor,
 			},
 		}
-		ringConfig     ring.Config
 		ingesterConfig ingester.Config
 	)
-	util.RegisterFlags(&serverConfig, &ringConfig, &ingesterConfig)
+	util.RegisterFlags(&serverConfig, &ingesterConfig)
 	flag.Parse()
 
+	ingesterConfig.LifecyclerConfig.ListenPort = &serverConfig.GRPCListenPort
 	ingester, err := ingester.New(ingesterConfig)
 	if err != nil {
 		log.Fatalf("Error initializing ingester: %v", err)

pkg/distributor/distributor.go

@@ -5,12 +5,12 @@ import (
 	"flag"
 	"hash/fnv"
 	"sync/atomic"
+	"time"
 
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/weaveworks/common/instrument"
 	"github.com/weaveworks/common/user"
-	cortex "github.com/weaveworks/cortex/pkg/distributor"
 	cortex_client "github.com/weaveworks/cortex/pkg/ingester/client"
 	"github.com/weaveworks/cortex/pkg/ring"
 	"google.golang.org/grpc/health/grpc_health_v1"
@@ -46,15 +46,16 @@ func init() {
 
 // Config for a Distributor.
 type Config struct {
-	cortex.Config
-	ClientConfig client.Config
-	PoolConfig   cortex_client.PoolConfig
+	RemoteTimeout time.Duration
+	ClientConfig  client.Config
+	PoolConfig    cortex_client.PoolConfig
 }
 
 func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
-	cfg.Config.RegisterFlags(f)
 	cfg.ClientConfig.RegisterFlags(f)
 	cfg.PoolConfig.RegisterFlags(f)
+
+	f.DurationVar(&cfg.RemoteTimeout, "ingester.remote-timeout", 10*time.Second, "")
 }
 
 // Distributor coordinates replicates and distribution of log streams.

pkg/promtail/config.go

@@ -12,7 +12,7 @@ import (
 )
 
 type Config struct {
-	ScrapeConfig []ScrapeConfig `yaml:"scrape_config,omitempty"`
+	ScrapeConfig []ScrapeConfig `yaml:"scrape_configs,omitempty"`
 
 	// Catches all undefined fields and must be empty after parsing.
 	XXX map[string]interface{} `yaml:",inline"`