Fix duplicate labels (update cortex) (grafana#1280)

* Update to latest cortex to fix duplicate labels Signed-off-by: Cyril Tovena <[email protected]> * Start the licycler in the ingester Required since this cortex change in https://github.com/cortexproject/cortex/commit/00566f61af49f2dd8257413d9e49a3053f708fce\#diff-dcd65a4ff2de424be70a561f141e067bR180 Signed-off-by: Cyril Tovena <[email protected]> * go mod tidy Signed-off-by: Cyril Tovena <[email protected]> * Move cortex to a fork for ARM support Signed-off-by: Cyril Tovena <[email protected]> * updates cortex to master Signed-off-by: Owen Diehl <[email protected]> * go mod tidy/vendor Signed-off-by: Owen Diehl <[email protected]>
sluongng · Nov 19, 2019 · b5c03b0 · b5c03b0
1 parent 2739551
commit b5c03b0
Show file tree

Hide file tree

Showing 238 changed files with 29,299 additions and 2,786 deletions.
diff --git a/go.mod b/go.mod
@@ -5,12 +5,11 @@ go 1.13
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Microsoft/go-winio v0.4.12 // indirect
-	github.com/aws/aws-sdk-go v1.23.13 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
 	github.com/bmatcuk/doublestar v1.1.1
 	github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect
 	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
-	github.com/cortexproject/cortex v0.3.1-0.20191025190927-77a09cc7c953
+	github.com/cortexproject/cortex v0.3.1-0.20191117214907-06c4340e652d
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v0.0.0-20190607191414-238f8eaa31aa
@@ -51,14 +50,13 @@ require (
 	github.com/weaveworks/common v0.0.0-20191103151037-0e7cefadc44f
 	go.etcd.io/etcd v0.0.0-20190815204525-8f85f0dc2607 // indirect
 	go.opencensus.io v0.22.1 // indirect
-	go.uber.org/atomic v1.4.0 // indirect
 	golang.org/x/net v0.0.0-20190923162816-aa69164e4478
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
 	golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
 	golang.org/x/tools v0.0.0-20190925134113-a044388aa56f // indirect
 	google.golang.org/appengine v1.6.3 // indirect
 	google.golang.org/genproto v0.0.0-20190916214212-f660b8655731 // indirect
-	google.golang.org/grpc v1.23.1
+	google.golang.org/grpc v1.25.1
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/fsnotify.v1 v1.4.7
 	gopkg.in/yaml.v2 v2.2.2

diff --git a/go.sum b/go.sum
diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
@@ -124,6 +124,8 @@ func New(cfg Config, clientConfig client.Config, store ChunkStore, limits *valid
 		return nil, err
 	}
 
+	i.lifecycler.Start()
+
 	i.done.Add(1)
 	go i.loop()
 

diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/client.go b/vendor/github.com/aws/aws-sdk-go/aws/client/client.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go b/vendor/github.com/aws/aws-sdk-go/aws/client/metadata/client_info.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/client/no_op_retryer.go b/vendor/github.com/aws/aws-sdk-go/aws/client/no_op_retryer.go
diff --git a/vendor/github.com/aws/aws-sdk-go/aws/config.go b/vendor/github.com/aws/aws-sdk-go/aws/config.go