sidecar: Added support for streaming, chunked remote read.

Fixes: #488

Signed-off-by: Bartek Plotka <bwplotka@gmail.com>

cmd/thanos/query.go

@@ -399,8 +399,7 @@ func runQuery(
  }
 
  ins := extpromhttp.NewInstrumentationMiddleware(reg)
-
- ui.NewQueryUI(logger, stores, flagsMap).Register(router.WithPrefix(webRoutePrefix), ins)
+ ui.NewQueryUI(logger, reg, stores, flagsMap).Register(router.WithPrefix(webRoutePrefix), ins)
 
  api := v1.NewAPI(logger, reg, engine, queryableCreator, enableAutodownsampling, enablePartialResponse)
 

cmd/thanos/rule.go

@@ -529,9 +529,9 @@ func runRule(
 
  ins := extpromhttp.NewInstrumentationMiddleware(reg)
 
- ui.NewRuleUI(logger, ruleMgrs, alertQueryURL.String(), flagsMap).Register(router.WithPrefix(webRoutePrefix), ins)
+ ui.NewRuleUI(logger, reg, ruleMgrs, alertQueryURL.String(), flagsMap).Register(router.WithPrefix(webRoutePrefix), ins)
 
- api := v1.NewAPI(logger, ruleMgrs)
+ api := v1.NewAPI(logger, reg, ruleMgrs)
  api.Register(router.WithPrefix(path.Join(webRoutePrefix, "/api/v1")), tracer, logger, ins)
 
  mux := http.NewServeMux()

go.mod

@@ -1,5 +1,8 @@
 module github.com/thanos-io/thanos
 
+// v2.11.0-rc.0-rr-streaming
+replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.0.0-20190814100250-bd8bf91426aa
+
 require (
  cloud.google.com/go v0.44.1
  github.com/Azure/azure-storage-blob-go v0.7.0

pkg/query/api/v1.go

@@ -26,6 +26,8 @@ import (
  "time"
 
  "github.com/NYTimes/gziphandler"
+ "github.com/go-kit/kit/log"
+
  "github.com/go-kit/kit/log"
  "github.com/opentracing/opentracing-go"
  "github.com/pkg/errors"
@@ -104,7 +106,9 @@ type API struct {
  rangeQueryDuration prometheus.Histogram
  enableAutodownsampling bool
  enablePartialResponse bool
- now func() time.Time
+ reg prometheus.Registerer
+
+ now func() time.Time
 }
 
 // NewAPI returns an initialized API type.
@@ -143,6 +147,7 @@ func NewAPI(
  rangeQueryDuration: rangeQueryDuration,
  enableAutodownsampling: enableAutodownsampling,
  enablePartialResponse: enablePartialResponse,
+ reg: reg,
 
  now: time.Now,
  }

pkg/receive/handler.go

@@ -23,10 +23,10 @@ import (
  "github.com/prometheus/client_golang/prometheus"
  "github.com/prometheus/client_golang/prometheus/promhttp"
  "github.com/prometheus/common/route"
+ "github.com/prometheus/prometheus/prompb"
  promtsdb "github.com/prometheus/prometheus/storage/tsdb"
  terrors "github.com/prometheus/prometheus/tsdb/errors"
  "github.com/thanos-io/thanos/pkg/runutil"
- "github.com/thanos-io/thanos/pkg/store/prompb"
 )
 
 // Options for the web Handler.

pkg/receive/hashring.go

@@ -7,7 +7,7 @@ import (
  "sort"
  "sync"
 
- "github.com/thanos-io/thanos/pkg/store/prompb"
+ "github.com/prometheus/prometheus/prompb"
 
  "github.com/cespare/xxhash"
 )

pkg/receive/hashring_test.go

@@ -3,7 +3,7 @@ package receive
 import (
  "testing"
 
- "github.com/thanos-io/thanos/pkg/store/prompb"
+ "github.com/prometheus/prometheus/prompb"
 )
 
 func TestHash(t *testing.T) {

pkg/receive/writer.go

@@ -3,7 +3,7 @@ package receive
 import (
  "github.com/go-kit/kit/log"
  "github.com/pkg/errors"
- "github.com/thanos-io/thanos/pkg/store/prompb"
+ "github.com/prometheus/prometheus/prompb"
 
  "github.com/prometheus/prometheus/pkg/labels"
  "github.com/prometheus/prometheus/storage"

pkg/rule/api/v1.go

@@ -6,6 +6,8 @@ import (
  "time"
 
  "github.com/NYTimes/gziphandler"
+ "github.com/prometheus/client_golang/prometheus"
+
  "github.com/go-kit/kit/log"
  opentracing "github.com/opentracing/opentracing-go"
  "github.com/prometheus/common/route"
@@ -22,16 +24,19 @@ type API struct {
  logger log.Logger
  now func() time.Time
  ruleRetriever RulesRetriever
+ reg prometheus.Registerer
 }
 
 func NewAPI(
  logger log.Logger,
+ reg prometheus.Registerer,
  ruleRetriever RulesRetriever,
 ) *API {
  return &API{
  logger: logger,
  now: time.Now,
  ruleRetriever: ruleRetriever,
+ reg: reg,
  }
 }
 

pkg/rule/api/v1_test.go

@@ -12,15 +12,15 @@ import (
  "testing"
  "time"
 
- "github.com/prometheus/common/model"
- "github.com/prometheus/prometheus/storage"
- "github.com/prometheus/prometheus/storage/tsdb"
-
  "github.com/go-kit/kit/log"
+ "github.com/prometheus/client_golang/prometheus"
+ "github.com/prometheus/common/model"
  "github.com/prometheus/common/route"
  "github.com/prometheus/prometheus/pkg/labels"
  "github.com/prometheus/prometheus/promql"
  "github.com/prometheus/prometheus/rules"
+ "github.com/prometheus/prometheus/storage"
+ "github.com/prometheus/prometheus/storage/tsdb"
  qapi "github.com/thanos-io/thanos/pkg/query/api"
  thanosrule "github.com/thanos-io/thanos/pkg/rule"
 )
@@ -164,6 +164,7 @@ func TestEndpoints(t *testing.T) {
  algr.RuleGroups()
  api := NewAPI(
  nil,
+ prometheus.DefaultRegisterer,
  algr,
  )
  testEndpoints(t, api)

pkg/rule/rule.go

@@ -175,6 +175,7 @@ func (m *Managers) Update(dataDir string, evalInterval time.Duration, files []st
  continue
  }
  // We add external labels in `pkg/alert.Queue`.
+ // TODO(bwplotka): Investigate if we should put ext labels here or not.
  if err := updater.Update(evalInterval, fs, nil); err != nil {
  errs = append(errs, err)
  continue