Update prometheus for subqueries support in ruler.

CHANGELOG.md

@@ -39,6 +39,7 @@ We use *breaking* word for marking changes that are not backward compatible (rel
 is now exposed by new metric: `thanos_compact_group_compaction_runs_started_total` and `thanos_compact_group_compaction_runs_completed_total` which counts compaction runs overall.
 - [#1748](https://github.com/thanos-io/thanos/pull/1748) Updated all dependencies.
 - [#1694](https://github.com/thanos-io/thanos/pull/1694) `prober_ready` and `prober_healthy` metrics are removed, for sake of `status`. Now `status` exposes same metric with a label, `check`. `check` can have "healty" or "ready" depending on status of the probe.
+- [#1790](https://github.com/thanos-io/thanos/pull/1790) Fixes subqueries support for ruler. 
 
 ## [v0.8.1](https://github.com/thanos-io/thanos/releases/tag/v0.8.1) - 2019.10.14
 

cmd/thanos/bucket.go

@@ -19,7 +19,7 @@ import (
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
  "github.com/prometheus/common/route"
- "github.com/prometheus/prometheus/tsdb/labels"
+ "github.com/prometheus/prometheus/pkg/labels"
  "github.com/thanos-io/thanos/pkg/block"
  "github.com/thanos-io/thanos/pkg/block/metadata"
  "github.com/thanos-io/thanos/pkg/compact"

cmd/thanos/main_test.go

@@ -16,7 +16,7 @@ import (
  "github.com/oklog/ulid"
  "github.com/prometheus/client_golang/prometheus"
  promtest "github.com/prometheus/client_golang/prometheus/testutil"
- "github.com/prometheus/prometheus/tsdb/labels"
+ "github.com/prometheus/prometheus/pkg/labels"
  "github.com/thanos-io/thanos/pkg/block"
  "github.com/thanos-io/thanos/pkg/compact"
  "github.com/thanos-io/thanos/pkg/compact/downsample"

cmd/thanos/query.go

@@ -19,8 +19,8 @@ import (
  "github.com/prometheus/common/route"
  "github.com/prometheus/prometheus/discovery/file"
  "github.com/prometheus/prometheus/discovery/targetgroup"
+ "github.com/prometheus/prometheus/pkg/labels"
  "github.com/prometheus/prometheus/promql"
- "github.com/prometheus/prometheus/tsdb/labels"
  "github.com/thanos-io/thanos/pkg/component"
  "github.com/thanos-io/thanos/pkg/discovery/cache"
  "github.com/thanos-io/thanos/pkg/discovery/dns"

cmd/thanos/receive.go

@@ -14,8 +14,8 @@ import (
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
  "github.com/prometheus/common/model"
+ "github.com/prometheus/prometheus/pkg/labels"
  "github.com/prometheus/prometheus/storage/tsdb"
- "github.com/prometheus/prometheus/tsdb/labels"
  "github.com/thanos-io/thanos/pkg/block/metadata"
  "github.com/thanos-io/thanos/pkg/component"
  "github.com/thanos-io/thanos/pkg/extflag"

cmd/thanos/rule.go

@@ -27,11 +27,10 @@ import (
  "github.com/prometheus/common/route"
  "github.com/prometheus/prometheus/discovery/file"
  "github.com/prometheus/prometheus/discovery/targetgroup"
- promlabels "github.com/prometheus/prometheus/pkg/labels"
+ "github.com/prometheus/prometheus/pkg/labels"
  "github.com/prometheus/prometheus/promql"
  "github.com/prometheus/prometheus/rules"
  "github.com/prometheus/prometheus/storage/tsdb"
- "github.com/prometheus/prometheus/tsdb/labels"
  "github.com/prometheus/prometheus/util/strutil"
  "github.com/thanos-io/thanos/pkg/alert"
  "github.com/thanos-io/thanos/pkg/block/metadata"
@@ -327,6 +326,7 @@ func runRule(
  ResendDelay: resendDelay,
  }
 
+ // TODO(bwplotka): Hide this behind thanos rules.Manager.
  for _, strategy := range storepb.PartialResponseStrategy_value {
  s := storepb.PartialResponseStrategy(strategy)
 
@@ -718,9 +718,9 @@ func parseFlagLabels(s []string) (labels.Labels, error) {
  return lset, nil
 }
 
-func labelsTSDBToProm(lset labels.Labels) (res promlabels.Labels) {
+func labelsTSDBToProm(lset labels.Labels) (res labels.Labels) {
  for _, l := range lset {
- res = append(res, promlabels.Label{
+ res = append(res, labels.Label{
  Name: l.Name,
  Value: l.Value,
  })

cmd/thanos/sidecar.go

@@ -14,7 +14,7 @@ import (
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
  "github.com/prometheus/common/model"
- "github.com/prometheus/prometheus/tsdb/labels"
+ "github.com/prometheus/prometheus/pkg/labels"
  "github.com/thanos-io/thanos/pkg/block/metadata"
  "github.com/thanos-io/thanos/pkg/component"
  "github.com/thanos-io/thanos/pkg/extflag"

go.mod

@@ -69,7 +69,7 @@ require (
  github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
  github.com/prometheus/common v0.7.0
  github.com/prometheus/procfs v0.0.6 // indirect
- github.com/prometheus/prometheus v1.8.2-0.20191114185310-85cae37107c2 // Prometheus master v2.14.0
+ github.com/prometheus/prometheus v1.8.2-0.20191126064551-80ba03c67da1 // Prometheus master v2.14.0
  github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da // indirect
  github.com/satori/go.uuid v1.2.0 // indirect
  github.com/smartystreets/assertions v1.0.1 // indirect
@@ -89,10 +89,9 @@ require (
  golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056 // indirect
  golang.org/x/text v0.3.2
  golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
- golang.org/x/tools v0.0.0-20191114222411-4191b8cbba09 // indirect
- google.golang.org/api v0.13.0
+ google.golang.org/api v0.14.0
  google.golang.org/appengine v1.6.5 // indirect
- google.golang.org/genproto v0.0.0-20191114150713-6bbd007550de
+ google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9
  google.golang.org/grpc v1.25.1
  gopkg.in/alecthomas/kingpin.v2 v2.2.6
  gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect