From bc659d5cf57bc77a5f3d9aff77ebef9cb001b877 Mon Sep 17 00:00:00 2001 From: Saswata Mukherjee Date: Tue, 28 May 2024 14:19:33 +0100 Subject: [PATCH] Cut patch release `v0.35.1` (#7394) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * compact: recover from panics (#7318) For https://github.com/thanos-io/thanos/issues/6775, it would be useful to know the exact block IDs to aid debugging. Signed-off-by: Giedrius Statkevičius * Sidecar: wait for prometheus on startup (#7323) Signed-off-by: Michael Hoffmann * Receive: fix serverAsClient.Series goroutines leak (#6948) * fix serverAsClient goroutines leak Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * fix lint Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * update changelog Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * delete invalid comment Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * remove temp dev test Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * remove timer channel drain Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> --------- Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> * Receive: fix stats (#7373) If we account stats for remote write and local writes we will count them twice since the remote write will be counted locally again by the remote receiver instance. Signed-off-by: Michael Hoffmann * *: Ensure objstore flag values are masked & disable debug/pprof/cmdline (#7382) * *: Ensure objstore flag values are masked & disable debug/pprof/cmdline Signed-off-by: Saswata Mukherjee * small fix Signed-off-by: Saswata Mukherjee --------- Signed-off-by: Saswata Mukherjee * Query: dont pass query hints to avoid triggering pushdown (#7392) If we have a new querier it will create query hints even without the pushdown feature being present anymore. Old sidecars will then trigger query pushdown which leads to broken max,min,max_over_time and min_over_time. Signed-off-by: Michael Hoffmann * Cut patch release v0.35.1 Signed-off-by: Saswata Mukherjee --------- Signed-off-by: Giedrius Statkevičius Signed-off-by: Michael Hoffmann Signed-off-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> Signed-off-by: Saswata Mukherjee Co-authored-by: Giedrius Statkevičius Co-authored-by: Michael Hoffmann Co-authored-by: Thibault Mange <22740367+thibaultmg@users.noreply.github.com> --- cmd/thanos/sidecar.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmd/thanos/sidecar.go b/cmd/thanos/sidecar.go index 2d51063980b..a06552b5761 100644 --- a/cmd/thanos/sidecar.go +++ b/cmd/thanos/sidecar.go @@ -220,14 +220,14 @@ func runSidecar( return err } - level.Info(logger).Log( - "msg", "successfully loaded prometheus version", - ) - return nil - }) - if err != nil { - return errors.Wrap(err, "failed to get prometheus version") - } + level.Info(logger).Log( + "msg", "successfully loaded prometheus version", + ) + return nil + }) + if err != nil { + return errors.Wrap(err, "failed to get prometheus version") + } // Blocking query of external labels before joining as a Source Peer into gossip. // We retry infinitely until we reach and fetch labels from our Prometheus. @@ -261,6 +261,8 @@ func runSidecar( close(readyToStartGRPC) + ctx, cancel := context.WithCancel(context.Background()) + g.Add(func() error { // Periodically query the Prometheus config. We use this as a heartbeat as well as for updating // the external labels we apply. return runutil.Repeat(conf.prometheus.getConfigInterval, ctx.Done(), func() error {