revendor cortex to latest master

docs/sources/configuration/query-frontend.md

@@ -48,14 +48,16 @@ data:
       cache_results: true
 
       results_cache:
-        max_freshness: 10m
         cache:
           # We're going to use the in-process "FIFO" cache
           enable_fifocache: true
           fifocache:
             size: 1024
             validity: 24h
 
+    limits_config:
+      max_cache_freshness_per_query: '10m'
+
     frontend:
       log_queries_longer_than: 5s
       downstream_url: querier.<namespace>.svc.cluster.local:3100

docs/sources/operations/upgrade.md

@@ -12,6 +12,11 @@ On this page we will document any upgrade issues/gotchas/considerations we are a
 
 ## Master / Unreleased
 
+### IMPORTANT: `results_cache.max_freshness` removed from YAML config
+
+The `max_freshness` config from `results_cache` has been removed in favour of another flag called `max_cache_freshness_per_query` in `limits_config` which has the same effect.
+If you happen to have `results_cache.max_freshness` set please use `limits_config.max_cache_freshness_per_query` YAML config instead.
+
 ## 1.6.0
 
 ### IMPORTANT: Ksonnet Port Change and Removal of NET_BIND_SERVICE Capability from docker image

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.1
 	github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
-	github.com/cortexproject/cortex v1.3.1-0.20200901164804-97d13c1ef16f
+	github.com/cortexproject/cortex v1.3.1-0.20200915110508-cbaf36e4fa61
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/docker v17.12.0-ce-rc1.0.20200706150819-a40b877fbb9e+incompatible
 	github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
@@ -49,11 +49,11 @@ require (
 	github.com/segmentio/fasthash v1.0.2
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20200627165143-92b8a710ab6c
-	github.com/stretchr/testify v1.5.1
+	github.com/stretchr/testify v1.6.1
 	github.com/tonistiigi/fifo v0.0.0-20190226154929-a9fb20d87448
 	github.com/uber/jaeger-client-go v2.25.0+incompatible
 	github.com/ugorji/go v1.1.7 // indirect
-	github.com/weaveworks/common v0.0.0-20200820123129-280614068c5e
+	github.com/weaveworks/common v0.0.0-20200914083218-61ffdd448099
 	go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
 	go.uber.org/atomic v1.6.0
 	golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de

pkg/loki/modules.go

@@ -432,7 +432,7 @@ func (t *Loki) initMemberlistKV() (services.Service, error) {
 		ring.GetCodec(),
 	}
 
-	t.memberlistKV = memberlist.NewKVInitService(&t.cfg.MemberlistKV)
+	t.memberlistKV = memberlist.NewKVInitService(&t.cfg.MemberlistKV, util.Logger)
 	return t.memberlistKV, nil
 }
 

pkg/querier/querier_mock_test.go

@@ -261,6 +261,10 @@ func (s *storeMock) DeleteSeriesIDs(ctx context.Context, from, through model.Tim
 	panic("don't call me please")
 }
 
+func (s *storeMock) GetChunkFetcher(_ model.Time) *chunk.Fetcher {
+	panic("don't call me please")
+}
+
 func (s *storeMock) GetSeries(ctx context.Context, req logql.SelectLogParams) ([]logproto.SeriesIdentifier, error) {
 	args := s.Called(ctx, req)
 	res := args.Get(0)

pkg/querier/queryrange/roundtrip_test.go

@@ -38,7 +38,6 @@ var (
 		MaxRetries:             3,
 		CacheResults:           true,
 		ResultsCacheConfig: queryrange.ResultsCacheConfig{
-			LegacyMaxCacheFreshness: 1 * time.Minute,
 			CacheConfig: cache.Config{
 				EnableFifoCache: true,
 				Fifocache: cache.FifoCacheConfig{

pkg/storage/util_test.go

@@ -189,6 +189,9 @@ func (m *mockChunkStore) Stop() {}
 func (m *mockChunkStore) Get(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) ([]chunk.Chunk, error) {
 	return nil, nil
 }
+func (m *mockChunkStore) GetChunkFetcher(_ model.Time) *chunk.Fetcher {
+	return nil
+}
 
 func (m *mockChunkStore) GetChunkRefs(ctx context.Context, userID string, from, through model.Time, matchers ...*labels.Matcher) ([][]chunk.Chunk, []*chunk.Fetcher, error) {
 	refs := make([]chunk.Chunk, 0, len(m.chunks))

production/ksonnet/loki/config.libsonnet

@@ -150,7 +150,6 @@
         cache_results: true,
         max_retries: 5,
         results_cache: {
-          max_freshness: '10m',
           cache: {
             memcached_client: {
               timeout: '500ms',
@@ -180,6 +179,7 @@
         ingestion_rate_strategy: 'global',
         ingestion_rate_mb: 10,
         ingestion_burst_size_mb: 20,
+        max_cache_freshness_per_query: '10m',
       },
 
       ingester: {