From 466c27e0dc70ded9f4d299717adc4e00984da205 Mon Sep 17 00:00:00 2001 From: Andre Baptista Aguas Date: Mon, 13 Feb 2023 21:48:47 +0100 Subject: [PATCH 1/3] Deduplicate metamonitoring queries Signed-off-by: Andre Baptista Aguas Signed-off-by: Andre Baptista Aguas --- pkg/receive/head_series_limiter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/receive/head_series_limiter.go b/pkg/receive/head_series_limiter.go index 746b92d990..c088dc6495 100644 --- a/pkg/receive/head_series_limiter.go +++ b/pkg/receive/head_series_limiter.go @@ -106,7 +106,7 @@ func NewHeadSeriesLimit(w WriteLimitsConfig, registerer prometheus.Registerer, l func (h *headSeriesLimit) QueryMetaMonitoring(ctx context.Context) error { c := promclient.NewWithTracingClient(h.logger, h.metaMonitoringClient, httpconfig.ThanosUserAgent) - vectorRes, _, err := c.QueryInstant(ctx, h.metaMonitoringURL, h.metaMonitoringQuery, time.Now(), promclient.QueryOptions{}) + vectorRes, _, err := c.QueryInstant(ctx, h.metaMonitoringURL, h.metaMonitoringQuery, time.Now(), promclient.QueryOptions{Deduplicate: true}) if err != nil { h.metaMonitoringErr.Inc() return err From f33f082c0fd1367a875dcd3e0303b9ced3a792f7 Mon Sep 17 00:00:00 2001 From: Andre Baptista Aguas Date: Mon, 13 Feb 2023 22:02:53 +0100 Subject: [PATCH 2/3] Update CHANGELOG Signed-off-by: Andre Baptista Aguas Signed-off-by: Andre Baptista Aguas --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index abc3d2ad4c..1296336695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,7 +31,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#6082](https://github.com/thanos-io/thanos/pull/6082) Store: Don't error when no stores are matched. - [#6098](https://github.com/thanos-io/thanos/pull/6098) Cache/Redis: upgrade `rueidis` to v0.0.93 to fix potential panic when the client-side caching is disabled. - [#6103](https://github.com/thanos-io/thanos/pull/6103) Mixins(Rule): Fix query for long rule evaluations. - +- [#6121](https://github.com/thanos-io/thanos/pull/6121) Receive: Deduplicate metamonitoring queries. ### Changed - [#6010](https://github.com/thanos-io/thanos/pull/6010) *: Upgrade Prometheus to v0.41.0. From 04a4c383c9565a15853af6ea7a22d10343b6c227 Mon Sep 17 00:00:00 2001 From: Andre Baptista Aguas Date: Tue, 14 Feb 2023 06:30:12 +0100 Subject: [PATCH 3/3] do not remove empty line from CHANGELOG Signed-off-by: Andre Baptista Aguas --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1296336695..99ea95e825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#6098](https://github.com/thanos-io/thanos/pull/6098) Cache/Redis: upgrade `rueidis` to v0.0.93 to fix potential panic when the client-side caching is disabled. - [#6103](https://github.com/thanos-io/thanos/pull/6103) Mixins(Rule): Fix query for long rule evaluations. - [#6121](https://github.com/thanos-io/thanos/pull/6121) Receive: Deduplicate metamonitoring queries. + ### Changed - [#6010](https://github.com/thanos-io/thanos/pull/6010) *: Upgrade Prometheus to v0.41.0.