Skip to content

Commit 250f7f3

Browse files
authored
Update Thanos (#4929)
Signed-off-by: Alan Protasio <[email protected]> Signed-off-by: Alan Protasio <[email protected]>
1 parent 9a622ac commit 250f7f3

File tree

6 files changed

+143
-9
lines changed

6 files changed

+143
-9
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/spf13/afero v1.6.0
4949
github.com/stretchr/testify v1.8.0
5050
github.com/thanos-io/objstore v0.0.0-20221006135717-79dcec7fe604
51-
github.com/thanos-io/thanos v0.27.0-rc.0.0.20221007170555-a4e334152549
51+
github.com/thanos-io/thanos v0.27.0-rc.0.0.20221020152244-d5744e794d97
5252
github.com/uber/jaeger-client-go v2.30.0+incompatible
5353
github.com/weaveworks/common v0.0.0-20220706100410-67d27ed40fae
5454
go.etcd.io/etcd/api/v3 v3.5.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,8 +927,8 @@ github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1
927927
github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM=
928928
github.com/thanos-io/objstore v0.0.0-20221006135717-79dcec7fe604 h1:9dceDSKKsLWNHjrMpyzK1t7eVcAZv9Dp3FX+uokUS2Y=
929929
github.com/thanos-io/objstore v0.0.0-20221006135717-79dcec7fe604/go.mod h1:Vx5dZs9ElxEhNLnum/OgB0pNTqNdI2zdXL82BeJr3T4=
930-
github.com/thanos-io/thanos v0.27.0-rc.0.0.20221007170555-a4e334152549 h1:zsMUSPJvOZ9jADN0rDeOQj1MdaY5Bx3uGzf1Os93L+w=
931-
github.com/thanos-io/thanos v0.27.0-rc.0.0.20221007170555-a4e334152549/go.mod h1:uO/S/3k1sxy96Z5iD+e//NRjK58X070Cj5fP2nFat3s=
930+
github.com/thanos-io/thanos v0.27.0-rc.0.0.20221020152244-d5744e794d97 h1:FPFrA/tx2XGRGuIi3FArTosESoZc8fJZDOCug2hhYvc=
931+
github.com/thanos-io/thanos v0.27.0-rc.0.0.20221020152244-d5744e794d97/go.mod h1:hjmmdeaAWtZFrIBFR3tbzhPEajIrg+A3lG55bYAXZYA=
932932
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
933933
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
934934
github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

pkg/querier/tripperware/test_shard_by_query_utils.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"time"
1414

1515
"github.com/go-kit/log"
16+
"github.com/prometheus/common/model"
1617
"github.com/prometheus/prometheus/promql/parser"
1718
"github.com/stretchr/testify/require"
1819
"github.com/thanos-io/thanos/pkg/store/storepb"
@@ -162,20 +163,20 @@ sum by (container) (
162163
{
163164
name: "binary expression with without vector matching and grouping",
164165
expression: `sum without (cluster, pod) (http_requests_total{code="400"}) / ignoring (pod) sum without (cluster, pod) (http_requests_total)`,
165-
shardingLabels: []string{"pod", "cluster"},
166+
shardingLabels: []string{"pod", "cluster", model.MetricNameLabel},
166167
},
167168
{
168169
name: "multiple binary expressions with without grouping",
169170
expression: `(http_requests_total{code="400"} + ignoring (pod) http_requests_total{code="500"}) / ignoring (cluster, pod) http_requests_total`,
170-
shardingLabels: []string{"cluster", "pod"},
171+
shardingLabels: []string{"cluster", "pod", model.MetricNameLabel},
171172
},
172173
{
173174
name: "multiple binary expressions with without vector matchers",
174175
expression: `
175176
(http_requests_total{code="400"} + ignoring (cluster, pod) http_requests_total{code="500"})
176177
/ ignoring (pod)
177178
http_requests_total`,
178-
shardingLabels: []string{"cluster", "pod"},
179+
shardingLabels: []string{"cluster", "pod", model.MetricNameLabel},
179180
},
180181
}
181182

vendor/github.com/thanos-io/thanos/pkg/querysharding/analyzer.go

Lines changed: 47 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/store/telemetry.go

Lines changed: 88 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)