Update cortex vendor (grafana#610)

* Update cortex vendor
Use query max look back from cortex
Update config changes from cortex
Fixed breaking code due to updating cortex vendor

* fixed linter error

cmd/loki/loki-local-config.yaml

@@ -7,7 +7,8 @@ ingester:
   lifecycler:
     address: 127.0.0.1
     ring:
-      store: inmemory
+      kvstore:
+        store: inmemory
       replication_factor: 1
   chunk_idle_period: 15m
 
@@ -31,5 +32,5 @@ storage_config:
 limits_config:
   enforce_metric_name: false
 
-querier:
+chunk_store_config:
   max_look_back_period: 0

pkg/ingester/flush.go

@@ -11,6 +11,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/weaveworks/common/user"
 
 	"github.com/cortexproject/cortex/pkg/chunk"
@@ -58,8 +59,8 @@ const (
 	// position, not wallclock time.
 	flushBackoff = 1 * time.Second
 
-	nameLabel = model.LabelName("__name__")
-	logsValue = model.LabelValue("logs")
+	nameLabel = "__name__"
+	logsValue = "logs"
 )
 
 // Flush triggers a flush of all the chunks and closes the flush queues.
@@ -254,8 +255,9 @@ func (i *Ingester) flushChunks(ctx context.Context, fp model.Fingerprint, labelP
 		return err
 	}
 
-	metric := client.FromLabelAdaptersToMetric(labelPairs)
-	metric[nameLabel] = logsValue
+	labelsBuilder := labels.NewBuilder(client.FromLabelAdaptersToLabels(labelPairs))
+	labelsBuilder.Set(nameLabel, logsValue)
+	metric := labelsBuilder.Labels()
 
 	wireChunks := make([]chunk.Chunk, 0, len(cs))
 	for _, c := range cs {

pkg/ingester/flush_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/loki/pkg/chunkenc"
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/prometheus/pkg/labels"
 	"github.com/stretchr/testify/require"
 	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context"
@@ -67,13 +68,13 @@ func newTestStore(t require.TestingT, cfg Config) (*testStore, *Ingester) {
 
 // nolint
 func defaultIngesterTestConfig() Config {
-	consul := ring.NewInMemoryKVClient()
+	consul := ring.NewInMemoryKVClient(ring.ProtoCodec{Factory: ring.ProtoDescFactory})
 	cfg := Config{}
 	flagext.DefaultValues(&cfg)
 	cfg.FlushCheckPeriod = 99999 * time.Hour
 	cfg.MaxChunkIdle = 99999 * time.Hour
 	cfg.ConcurrentFlushes = 1
-	cfg.LifecyclerConfig.RingConfig.Mock = consul
+	cfg.LifecyclerConfig.RingConfig.KVStore.Mock = consul
 	cfg.LifecyclerConfig.NumTokens = 1
 	cfg.LifecyclerConfig.ListenPort = func(i int) *int { return &i }(0)
 	cfg.LifecyclerConfig.Addr = "localhost"
@@ -91,9 +92,9 @@ func (s *testStore) Put(ctx context.Context, chunks []chunk.Chunk) error {
 		return err
 	}
 	for _, chunk := range chunks {
-		for k, v := range chunk.Metric {
-			if v == "" {
-				return fmt.Errorf("Chunk has blank label %q", k)
+		for _, label := range chunk.Metric {
+			if label.Value == "" {
+				return fmt.Errorf("Chunk has blank label %q", label.Name)
 			}
 		}
 	}
@@ -157,7 +158,11 @@ func (s *testStore) checkData(t *testing.T, userIDs []string, testData map[strin
 		streams := []*logproto.Stream{}
 		for _, chunk := range chunks {
 			lokiChunk := chunk.Data.(*chunkenc.Facade).LokiChunk()
-			delete(chunk.Metric, nameLabel)
+			if chunk.Metric.Has("__name__") {
+				labelsBuilder := labels.NewBuilder(chunk.Metric)
+				labelsBuilder.Del("__name__")
+				chunk.Metric = labelsBuilder.Labels()
+			}
 			labels := chunk.Metric.String()
 			streams = append(streams, buildStreamsFromChunk(t, labels, lokiChunk))
 		}

pkg/ingester/ingester.go

@@ -91,7 +91,7 @@ func New(cfg Config, store ChunkStore) (*Ingester, error) {
 	}
 
 	var err error
-	i.lifecycler, err = ring.NewLifecycler(cfg.LifecyclerConfig, i)
+	i.lifecycler, err = ring.NewLifecycler(cfg.LifecyclerConfig, i, "ingester")
 	if err != nil {
 		return nil, err
 	}

pkg/loki/modules.go

@@ -93,7 +93,7 @@ func (t *Loki) initServer() (err error) {
 }
 
 func (t *Loki) initRing() (err error) {
-	t.ring, err = ring.New(t.cfg.Ingester.LifecyclerConfig.RingConfig)
+	t.ring, err = ring.New(t.cfg.Ingester.LifecyclerConfig.RingConfig, "ingester")
 	if err != nil {
 		return
 	}

pkg/querier/querier.go

@@ -3,7 +3,6 @@ package querier
 import (
 	"context"
 	"flag"
-	"time"
 
 	"github.com/cortexproject/cortex/pkg/chunk"
 	cortex_client "github.com/cortexproject/cortex/pkg/ingester/client"
@@ -19,13 +18,10 @@ import (
 
 // Config for a querier.
 type Config struct {
-	// Limits query start time to be greater than now() - MaxLookBackPeriod, if set.
-	MaxLookBackPeriod time.Duration `yaml:"max_look_back_period"`
 }
 
 // RegisterFlags register flags.
 func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
-	f.DurationVar(&cfg.MaxLookBackPeriod, "querier.max_look_back_period", 0, "Limit how long back data can be queried")
 }
 
 // Querier handlers queries.
@@ -96,13 +92,6 @@ func (q *Querier) forAllIngesters(f func(logproto.QuerierClient) (interface{}, e
 
 // Query does the heavy lifting for an actual query.
 func (q *Querier) Query(ctx context.Context, req *logproto.QueryRequest) (*logproto.QueryResponse, error) {
-	if q.cfg.MaxLookBackPeriod != 0 {
-		oldestStartTime := time.Now().Add(-q.cfg.MaxLookBackPeriod)
-		if oldestStartTime.After(req.Start) {
-			req.Start = oldestStartTime
-		}
-	}
-
 	ingesterIterators, err := q.queryIngesters(ctx, req)
 	if err != nil {
 		return nil, err

pkg/querier/store.go

@@ -80,7 +80,7 @@ func filterSeriesByMatchers(chks map[model.Fingerprint][][]chunkenc.LazyChunk, m
 outer:
 	for fp, chunks := range chks {
 		for _, matcher := range matchers {
-			if !matcher.Matches(string(chunks[0][0].Chunk.Metric[model.LabelName(matcher.Name)])) {
+			if !matcher.Matches(chunks[0][0].Chunk.Metric.Get(matcher.Name)) {
 				delete(chks, fp)
 				continue outer
 			}
@@ -184,7 +184,11 @@ func partitionBySeriesChunks(chunks [][]chunk.Chunk, fetchers []*chunk.Fetcher)
 		for _, c := range chks {
 			fp := c.Fingerprint
 			chunksByFp[fp] = append(chunksByFp[fp], chunkenc.LazyChunk{Chunk: c, Fetcher: fetchers[i]})
-			delete(c.Metric, "__name__")
+			if c.Metric.Has("__name__") {
+				labelsBuilder := labels.NewBuilder(c.Metric)
+				labelsBuilder.Del("__name__")
+				c.Metric = labelsBuilder.Labels()
+			}
 		}
 	}
 

production/helm/loki/values.yaml

@@ -26,7 +26,8 @@ config:
     chunk_block_size: 262144
     lifecycler:
       ring:
-        store: inmemory
+        kvstore:
+          store: inmemory
         replication_factor: 1
 
       ## Different ring configs can be used. E.g. Consul
@@ -56,7 +57,7 @@ config:
       directory: /data/loki/index
     filesystem:
       directory: /data/loki/chunks
-  querier:
+  chunk_store_config:
     max_look_back_period: 0
 
 deploymentStrategy: RollingUpdate

production/ksonnet/loki/config.libsonnet

@@ -41,15 +41,16 @@
 
         lifecycler: {
           ring: {
-            store: 'consul',
             heartbeat_timeout: '1m',
             replication_factor: 3,
-
-            consul: {
-              host: 'consul.%s.svc.cluster.local:8500' % $._config.namespace,
-              prefix: '',
-              httpclienttimeout: '20s',
-              consistentreads: true,
+            kvstore: {
+              store: 'consul',
+              consul: {
+                host: 'consul.%s.svc.cluster.local:8500' % $._config.namespace,
+                prefix: '',
+                httpclienttimeout: '20s',
+                consistentreads: true,
+              },
             },
           },