Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update prometheus 3.0 rebase #514

Conversation

SungJin1212
Copy link

@SungJin1212 SungJin1212 commented Feb 3, 2025

Get a rebase from the main branch to the update-prometheus-3.0 branch to try applying the update-prometheus-3.0 branch to the Thanos.

@SungJin1212 SungJin1212 force-pushed the update-prometheus-3.0-rebase branch from 25f4429 to 1cc718a Compare February 3, 2025 11:02
MichaHoffmann and others added 10 commits February 3, 2025 20:11
* engine: allow to override opts at query time

Signed-off-by: Michael Hoffmann <[email protected]>

* engine: add more constructors

Signed-off-by: Michael Hoffmann <[email protected]>

---------

Signed-off-by: Michael Hoffmann <[email protected]>
Co-authored-by: Michael Hoffmann <[email protected]>
For very distributed setups we need to be able to deal with partial
failures. This commit adds an option to continue evaulation if we
encounter an error in a remote engine but dont want to fail the whole
query.

Signed-off-by: Michael Hoffmann <[email protected]>
Signed-off-by: Michael Hoffmann <[email protected]>
…#502)

LookbackDelta and Stats were unexported fields of the struct.
We cannot write to them like this so we need to export them.

Signed-off-by: Michael Hoffmann <[email protected]>
Co-authored-by: Michael Hoffmann <[email protected]>
…bels away (thanos-io#504)

* execution: initialize next in aggregation even if we aggregate the labels away

Signed-off-by: Michael Hoffmann <[email protected]>

* execute: review on execution/aggregate/hashaggregate.go

Co-authored-by: Filip Petkovski <[email protected]>
Signed-off-by: Michael Hoffmann <[email protected]>

---------

Signed-off-by: Michael Hoffmann <[email protected]>
Signed-off-by: Michael Hoffmann <[email protected]>
Co-authored-by: Michael Hoffmann <[email protected]>
Co-authored-by: Filip Petkovski <[email protected]>
Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>
If coalesce has a single downstream operator, we can skip it
and directly return the downstream.

Signed-off-by: Filip Petkovski <[email protected]>
* Fix distributed queries with explicit timestamp

The distributed optimizer does not consider queries with a specific
timestamp which causes them to be incorrect for some cases.

Signed-off-by: Filip Petkovski <[email protected]>

* Fallback when no match

Signed-off-by: Filip Petkovski <[email protected]>

* Fix tests

Signed-off-by: Filip Petkovski <[email protected]>

* Remove leftover

Signed-off-by: Filip Petkovski <[email protected]>

* Cover subqueries

Signed-off-by: Filip Petkovski <[email protected]>

* Remove field

Signed-off-by: Filip Petkovski <[email protected]>

* Add logical tests

Signed-off-by: Filip Petkovski <[email protected]>

---------

Signed-off-by: Filip Petkovski <[email protected]>
scalar() is not really distributive from our experience. This is because
it returns NaN even if the given vector selector doesn't match anything
so as a consequence it is impossible to know whether the NaN is expected
or not from the PoV of the root querier.

Signed-off-by: Giedrius Statkevičius <[email protected]>
Signed-off-by: Michael Hoffmann <[email protected]>
Co-authored-by: Michael Hoffmann <[email protected]>
@SungJin1212 SungJin1212 force-pushed the update-prometheus-3.0-rebase branch from 1cc718a to c8f835b Compare February 3, 2025 11:19
@yeya24
Copy link
Contributor

yeya24 commented Feb 4, 2025

 >> generating docs
PATH="/home/runner/go/bin:/opt/hostedtoolcache/go/1.22.11/x64/bin:/snap/bin:/home/runner/.local/bin:/opt/pipx_bin:/home/runner/.cargo/bin:/home/runner/.config/composer/vendor/bin:/usr/local/.ghcup/bin:/home/runner/.dotnet/tools:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/tmp/.bin" /tmp/.bin/mdox-v0.9.0 fmt README.md
make white-noise-cleanup
make[1]: Entering directory '/home/runner/work/promql-engine/promql-engine'
>> cleaning up white noise
make[1]: Leaving directory '/home/runner/work/promql-engine/promql-engine'
cannot 'detected not clean work tree before running lint: you have unstaged changes.
M	execution/unary/unary.go
Please commit or stash them.

@SungJin1212 linter failure seems related

Signed-off-by: SungJin1212 <[email protected]>
@yeya24
Copy link
Contributor

yeya24 commented Feb 5, 2025

Umm, looks like lint is OOM kill a lot. We should do something to fix that. Doesn't need to be this PR

@yeya24 yeya24 merged commit ccef0ea into thanos-io:update-prometheus-3.0 Feb 5, 2025
3 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants