*: Upgrade Prometheus to v2.39.0 #5767

douglascamata · 2022-10-06T12:26:41Z

Signed-off-by: Douglas Camata 159076+douglascamata@users.noreply.github.com

I added CHANGELOG entry for this change.
Change is not relevant to the end user.

Changes

Upgrade Prometheus to v2.39.0
Upgrade promql-engine

Almost the entirety of this work was started by @GiedriusS at #5602. This PR was opened with his consent, as he's on vacations.

Verification

Repro for thanos-io#5600. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Update prometheus dependency. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

…theus-239

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

yeya24

LGTM on green.
A little bit concern on the new TSDB change on the compactor side, but as long as the tests are passing then we can give it a try

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata · 2022-10-06T19:10:54Z

@yeya24 sure. I think the commit I just pushed should fix the e2e tests failure. Let's wait and see. What is the change in TSDB that worries you on the compactor side? Maybe we can try to write an e2e test for it (in this PR or a follow up).

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

yeya24 · 2022-10-06T19:21:08Z

@yeya24 sure. I think the commit I just pushed should fix the e2e tests failure. Let's wait and see. What is the change in TSDB that worries you on the compactor side? Maybe we can try to write an e2e test for it (in this PR or a follow up).

The OOO feature introduces a new chunk encoding. For blocks generated by Thanos I think that's fine since we don't enable this feature. But for blocks generated by Prometheus I am not sure if it will contain OOO chunks.

I think I need to read the OOO source code to see how it works. If OOO chunks only exist in memory (head block) then seems we should be safe.

douglascamata · 2022-10-06T19:36:38Z

Some TestCompactor_WriteSeries_e2e tests are failing. I will investigate tomorrow, but I believe I might already stumble on something related to what you mentioned, @yeya24.

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

fpetkovski · 2022-10-07T11:09:47Z

Hm, shouldn't OOO chunks be explicitly enabled? Or does Prometheus always create them?

douglascamata · 2022-10-07T11:34:05Z

Only one unit test left to fix 💪

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata · 2022-10-07T14:34:28Z

Hm, shouldn't OOO chunks be explicitly enabled? Or does Prometheus always create them?

After all the hacking I did today, I learned that OOO has to be explicitly enabled otherwise the OOO data is refused. I could be wrong though, please peer review my statement. 🤔 😂

douglascamata · 2022-10-07T15:35:53Z

@yeya24 @fpetkovski we are ✅ on all checks. PTAL whenever you have some time. 🙇

yeya24

LGTM, thanks!

yeya24 · 2022-10-07T15:43:16Z

cmd/thanos/receive.go

@@ -82,7 +82,6 @@ func registerReceive(app *extkingpin.App) {
 			RetentionDuration:        int64(time.Duration(*conf.retention) / time.Millisecond),
 			NoLockfile:               conf.noLockFile,
 			WALCompression:           conf.walCompression,
-			AllowOverlappingBlocks:   conf.tsdbAllowOverlappingBlocks,


I am wondering if we make overlapping blocks a default at the TSDB level, on the compactor side should we also do the same? Right now it is not enabled by default, we can follow up it on a separate pr though.

I think it makes sense to be consistent and also enable it by default in the compactor.

bwplotka

Amazing, thanks!

bwplotka · 2022-10-07T16:20:47Z

CHANGELOG.md

@@ -37,6 +37,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#5641](https://github.com/thanos-io/thanos/pull/5641) Query: Inject unshardable le label in query analyzer.
 - [#5685](https://github.com/thanos-io/thanos/pull/5685) Receive: Make active/head series limiting configuration per tenant by adding it to new limiting config.
 - [#5411](https://github.com/thanos-io/thanos/pull/5411) Tracing: Change Jaeger exporter from OpenTracing to OpenTelemetry. *Options `RPC Metrics`, `Gen128Bit` and `Disabled` are now deprecated and won't have any effect when set :warning:.*
+- [#5767](https://github.com/thanos-io/thanos/pull/5767) *: Upgrade Prometheus to v2.39.0.


Anything notable to mention? 🤔

Besides the perf improvements notables, I think the overlapping blocks being on by default is also notable.

bwplotka · 2022-10-07T16:22:25Z

After all the hacking I did today, I learned that OOO has to be explicitly enabled otherwise the OOO data is refused.

That's correct.

* e2e: add tests for pushed down subqueries Repro for thanos-io#5600. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * *: update dependency Update prometheus dependency. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * test: fix test Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> * Upgrade Prometheus to v2.39.0 Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix UnRegisterer to work well when it's wrapped Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Update CHANGELOG Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix UnRegisterer creation Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix e2e env name to comply with new rules Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Remove query pushdown test case Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix compactor relabeling after Prometheus upgrade Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> * Fix tsdb.NewHead call after wbl addition Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com> Co-authored-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com> Signed-off-by: utukj <utukphd@gmail.com>

GiedriusS added 4 commits September 28, 2022 14:30

e2e: add tests for pushed down subqueries

84d22a1

Repro for thanos-io#5600. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

*: update dependency

b98f5ae

Update prometheus dependency. Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

Merge remote-tracking branch 'origin/main' into HEAD

681a9a1

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

test: fix test

39ea486

Signed-off-by: Giedrius Statkevičius <giedrius.statkevicius@vinted.com>

pull-request-size bot added the size/XS label Oct 6, 2022

douglascamata changed the title ~~Upgrade Prometheus to v2.39.0~~ *: Upgrade Prometheus to v2.39.0 Oct 6, 2022

douglascamata force-pushed the upgrade-prometheus-239 branch from f376340 to 507dcd8 Compare October 6, 2022 14:17

pull-request-size bot added size/XXL and removed size/XS labels Oct 6, 2022

Upgrade Prometheus to v2.39.0

49978ca

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata force-pushed the upgrade-prometheus-239 branch from 507dcd8 to 49978ca Compare October 6, 2022 14:22

pull-request-size bot added size/L and removed size/XXL labels Oct 6, 2022

douglascamata added 2 commits October 6, 2022 20:36

Fix UnRegisterer to work well when it's wrapped

231b005

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Merge branch 'main' of github.com:thanos-io/thanos into upgrade-prome…

2d2beba

…theus-239

douglascamata marked this pull request as ready for review October 6, 2022 18:44

douglascamata added 2 commits October 6, 2022 20:50

Update CHANGELOG

8a5a6d9

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Fix UnRegisterer creation

634e2bb

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

yeya24 previously approved these changes Oct 6, 2022

View reviewed changes

Fix e2e env name to comply with new rules

717ced7

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata dismissed yeya24’s stale review via 717ced7 October 6, 2022 19:07

Remove query pushdown test case

7fbf821

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Fix compactor relabeling after Prometheus upgrade

c1ae7d0

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

douglascamata mentioned this pull request Oct 7, 2022

Better document possible relabel input modification prometheus/prometheus#11426

Merged

Fix tsdb.NewHead call after wbl addition

022ae2a

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

yeya24 approved these changes Oct 7, 2022

View reviewed changes

yeya24 reviewed Oct 7, 2022

View reviewed changes

bwplotka approved these changes Oct 7, 2022

View reviewed changes

bwplotka merged commit 561a113 into thanos-io:main Oct 7, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: Upgrade Prometheus to v2.39.0 #5767

*: Upgrade Prometheus to v2.39.0 #5767

douglascamata commented Oct 6, 2022 •

edited

Loading

yeya24 left a comment

douglascamata commented Oct 6, 2022

yeya24 commented Oct 6, 2022 •

edited

Loading

douglascamata commented Oct 6, 2022 •

edited

Loading

fpetkovski commented Oct 7, 2022

douglascamata commented Oct 7, 2022

douglascamata commented Oct 7, 2022

douglascamata commented Oct 7, 2022

yeya24 left a comment

yeya24 Oct 7, 2022

douglascamata Oct 7, 2022

bwplotka left a comment

bwplotka Oct 7, 2022

douglascamata Oct 7, 2022

bwplotka commented Oct 7, 2022

*: Upgrade Prometheus to v2.39.0 #5767

*: Upgrade Prometheus to v2.39.0 #5767

Conversation

douglascamata commented Oct 6, 2022 • edited Loading

Changes

Verification

yeya24 left a comment

Choose a reason for hiding this comment

douglascamata commented Oct 6, 2022

yeya24 commented Oct 6, 2022 • edited Loading

douglascamata commented Oct 6, 2022 • edited Loading

fpetkovski commented Oct 7, 2022

douglascamata commented Oct 7, 2022

douglascamata commented Oct 7, 2022

douglascamata commented Oct 7, 2022

yeya24 left a comment

Choose a reason for hiding this comment

yeya24 Oct 7, 2022

Choose a reason for hiding this comment

douglascamata Oct 7, 2022

Choose a reason for hiding this comment

bwplotka left a comment

Choose a reason for hiding this comment

bwplotka Oct 7, 2022

Choose a reason for hiding this comment

douglascamata Oct 7, 2022

Choose a reason for hiding this comment

bwplotka commented Oct 7, 2022

douglascamata commented Oct 6, 2022 •

edited

Loading

yeya24 commented Oct 6, 2022 •

edited

Loading

douglascamata commented Oct 6, 2022 •

edited

Loading