Update cortex vendoring (#325)

* Update cortex vendoring Signed-off-by: Goutham Veeramachaneni <[email protected]> * Fix API breakage Signed-off-by: Goutham Veeramachaneni <[email protected]>
grafana · Mar 15, 2019 · ddddd14 · ddddd14
1 parent d0fcfd8
commit ddddd14
Show file tree

Hide file tree

Showing 45 changed files with 1,160 additions and 400 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -26,13 +26,11 @@
 
 [[constraint]]
   name = "github.com/cortexproject/cortex"
-  branch = "optionally-enforce-metric-name"
-  source = "https://github.com/grafana/cortex.git"
+  branch = "master"
 
 [[constraint]]
   name = "github.com/weaveworks/common"
-  source = "github.com/tomwilkie/weaveworks-common"
-  branch = "dev"
+  branch = "master"
 
 [[constraint]]
   name = "gopkg.in/fsnotify.v1"

diff --git a/pkg/ingester/flush.go b/pkg/ingester/flush.go
@@ -204,7 +204,7 @@ func (i *Ingester) removeFlushedChunks(instance *instance, stream *stream) {
 
 	if len(stream.chunks) == 0 {
 		delete(instance.streams, stream.fp)
-		instance.index.Delete(stream.labels, stream.fp)
+		instance.index.Delete(client.FromLabelPairsToLabels(stream.labels), stream.fp)
 		instance.streamsRemovedTotal.Inc()
 	}
 }

diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go
@@ -196,7 +196,7 @@ func (*Ingester) Watch(*grpc_health_v1.HealthCheckRequest, grpc_health_v1.Health
 // the addition removal of another ingester. Returns 204 when the ingester is
 // ready, 500 otherwise.
 func (i *Ingester) ReadinessHandler(w http.ResponseWriter, r *http.Request) {
-	if i.lifecycler.IsReady(r.Context()) {
+	if err := i.lifecycler.CheckReady(r.Context()); err == nil {
 		w.WriteHeader(http.StatusNoContent)
 	} else {
 		w.WriteHeader(http.StatusInternalServerError)

diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/dynamodb_storage_client.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/dynamodb_storage_client.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/fixtures.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/aws/fixtures.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/cassandra/fixtures.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/cassandra/fixtures.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/cassandra/storage_client.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/cassandra/storage_client.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/chunk_store.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/chunk_store.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/bigchunk.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/bigchunk.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/delta.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/delta.go
diff --git a/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/doubledelta.go b/vendor/github.com/cortexproject/cortex/pkg/chunk/encoding/doubledelta.go