mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 14:09:41 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

api/v1: deduplicate selected series

Browse source
This commit is contained in:
Fabian Reinartz 2017-04-04 11:09:11 +02:00
parent 4e41987bcb
commit f56644e3ae
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
web/api/v1/api.go
View file

@ -337,21 +337,25 @@ func (api *API) series(r *http.Request) (interface{}, *apiError) {
} }
defer q.Close() defer q.Close()
// TODO(fabxc): expose merge functionality in storage interface. var set storage.SeriesSet
// We just concatenate results for all sets of matchers, which may produce
// duplicated results.
metrics := []labels.Labels{}
for _, mset := range matcherSets { for _, mset := range matcherSets {
series := q.Select(mset...) if set == nil {
for series.Next() { set = q.Select(mset...)
metrics = append(metrics, series.At().Labels()) } else {
} set = storage.DeduplicateSeriesSet(set, q.Select(mset...))
if series.Err() != nil {
return nil, &apiError{errorExec, series.Err()}
} }
} }
metrics := []labels.Labels{}
for set.Next() {
metrics = append(metrics, set.At().Labels())
}
if set.Err() != nil {
return nil, &apiError{errorExec, set.Err()}
}
return metrics, nil return metrics, nil
} }

1
web/api/v1/api_test.go
View file

@ -310,7 +310,6 @@ func TestEndpoints(t *testing.T) {
}, },
response: []labels.Labels{ response: []labels.Labels{
labels.FromStrings("__name__", "test_metric1", "foo", "boo"), labels.FromStrings("__name__", "test_metric1", "foo", "boo"),
labels.FromStrings("__name__", "test_metric1", "foo", "boo"), // TODO(fabxc): see comment in implementation.
}, },
}, },
{ {