mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-31 07:30:49 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #8994 from darshanime/federate_dup_fix

Browse source 
Ask querier for sorted series in /federate
This commit is contained in:
Julien Pivotto 2021-06-28 12:13:05 +02:00 committed by GitHub
parent 78d5a6d083 95c302723b
commit 67fae26b29
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/federate.go
View file

@ -95,7 +95,7 @@ func (h *Handler) federation(w http.ResponseWriter, req *http.Request) {
var sets []storage.SeriesSet var sets []storage.SeriesSet
for _, mset := range matcherSets { for _, mset := range matcherSets {
s := q.Select(false, hints, mset...) s := q.Select(true, hints, mset...)
sets = append(sets, s) sets = append(sets, s)
} }

8
web/federate_test.go
View file

@ -113,6 +113,14 @@ test_metric1{foo="bar",instance="i"} 10000 6000000
test_metric1{foo="boo",instance="i"} 1 6000000 test_metric1{foo="boo",instance="i"} 1 6000000
# TYPE test_metric2 untyped # TYPE test_metric2 untyped
test_metric2{foo="boo",instance="i"} 1 6000000 test_metric2{foo="boo",instance="i"} 1 6000000
`,
},
"two matchers with overlap": {
params: "match[]={__name__=~'test_metric1'}&match[]={foo='bar'}",
code: 200,
body: `# TYPE test_metric1 untyped
test_metric1{foo="bar",instance="i"} 10000 6000000
test_metric1{foo="boo",instance="i"} 1 6000000
`, `,
}, },
"everything": { "everything": {