Mixins(Rule): Fix query for long rule evaluations #6103
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Douglas Camata <[email protected]>
Signed-off-by: Douglas Camata <[email protected]>
saswatamcode
approved these changes
Feb 8, 2023
rabenhorst
added a commit
to rabenhorst/thanos
that referenced
this pull request
Feb 8, 2023
* Update Thanos engine to latest version (thanos-io#6069) This commit updates the Thanos PromQL engine to the latest version. Signed-off-by: Filip Petkovski <[email protected]> Signed-off-by: Filip Petkovski <[email protected]> * Receive: Tenants' external labels proposal (thanos-io#5720) * Receive external labels proposal Signed-off-by: haanhvu <[email protected]> * Restructure and edit proposal's content Signed-off-by: haanhvu <[email protected]> * Update proposal Signed-off-by: haanhvu <[email protected]> * Fix doc error Signed-off-by: haanhvu <[email protected]> Signed-off-by: haanhvu <[email protected]> * fixing doc CI (thanos-io#6072) Signed-off-by: Ben Ye <[email protected]> Signed-off-by: Ben Ye <[email protected]> * Fix stores filtering resets on reload (thanos-io#6063) * Fix stores filtering resets on reload `g0.store_matches` parameter appears in the url but doesn't applies in the frontend. Looks like it has been done on purpose and by removing a small piece of code fixes this issue. variable named `debugMode` is used for the store filtering checkbox which is an unappropriate name. Using `enableStoreFiltering` variable to represent the state of checkbox. Signed-off-by: Pradyumna Krishna <[email protected]> * Regenerate bindata.go Signed-off-by: Pradyumna Krishna <[email protected]> Signed-off-by: Pradyumna Krishna <[email protected]> * Store: Make initial sync more robust Added re-try mechanism for store inital sync, where if the initial sync fails, it tries to do the initial sync again for given timeout duration. Signed-off-by: Kartik-Garg <[email protected]> * Recover from panics in Series calls (thanos-io#6077) * Recover from panics in Series calls This commit adds panic recovery for Series calls in all Store servers. Signed-off-by: Filip Petkovski <[email protected]> * Apply error suggestion Signed-off-by: Filip Petkovski <[email protected]> --------- Signed-off-by: Filip Petkovski <[email protected]> * query: reuse our own gate (thanos-io#6079) Do not call promgate directly but rather use our own wrapper that does everything we want - duration histogram, current in-flight calls, total calls. Signed-off-by: Giedrius Statkevičius <[email protected]> * Store: Support disable cache index header file. (thanos-io#5773) * Store: Support disable cache index header file. Signed-off-by: wanjunlei <[email protected]> * Store: add a seprate flag to disable caching index header file Signed-off-by: wanjunlei <[email protected]> * Tools: add cleanup API for bucket web Signed-off-by: wanjunlei <[email protected]> * resolve conversation Signed-off-by: wanjunlei <[email protected]> * resolve confilcts Signed-off-by: wanjunlei <[email protected]> * change the flag to `--cache-index-header` Signed-off-by: wanjunlei <[email protected]> * Wrap mem writer in file writer Signed-off-by: wanjunlei <[email protected]> * update CHANGELOG Signed-off-by: wanjunlei <[email protected]> * update CHANGELOG Signed-off-by: wanjunlei <[email protected]> * fix bug Signed-off-by: wanjunlei <[email protected]> --------- Signed-off-by: wanjunlei <[email protected]> Co-authored-by: wanjunlei <[email protected]> * CVE: Fix Receiver malicious tenant (thanos-io#5969) If running as root or with enough privileges, receiver can create a directory outside of the configured TenantHeader. This commit fixes it up by sanitizing the user input and explicity not allowing such behavior. Signed-off-by: Daniel Mellado <[email protected]> * Add adopter Grupo MasMovil (thanos-io#6084) Signed-off-by: Pablo Moncada Isla <[email protected]> * fix typo (thanos-io#6087) Signed-off-by: cyip <[email protected]> Co-authored-by: cyip <[email protected]> * optimize selector to string (thanos-io#6076) Signed-off-by: Kama Huang <[email protected]> * Fix: Failure to close BlockSeriesClient cause store-gateway deadlock (thanos-io#6086) * Fix: Failure to close BlockSeriesClient cause store-gateway deadlock Signed-off-by: Alan Protasio <[email protected]> * Adding tests Signed-off-by: Alan Protasio <[email protected]> * reverting the change on get series Signed-off-by: Alan Protasio <[email protected]> * fix lint Signed-off-by: Alan Protasio <[email protected]> --------- Signed-off-by: Alan Protasio <[email protected]> * Cut 0.30.2 (thanos-io#6081) * tracing: fixed panic because of nil sampler (thanos-io#6066) * fixed panic because of nil sampler Signed-off-by: Vasiliy Rumyantsev <[email protected]> * added CHANGELOG entry Signed-off-by: Vasiliy Rumyantsev <[email protected]> Signed-off-by: Vasiliy Rumyantsev <[email protected]> * bump version to 0.30.2 Signed-off-by: Ben Ye <[email protected]> * Updates busybox SHA (thanos-io#6046) Signed-off-by: GitHub <[email protected]> Signed-off-by: GitHub <[email protected]> Co-authored-by: yeya24 <[email protected]> * Use `e2edb.NewMinio` to disable SSE-S3 in e2e tests (thanos-io#6055) * Use e2edb.NewMinio to disable SSE Signed-off-by: Saswata Mukherjee <[email protected]> * Use temp fork for TLS Signed-off-by: Saswata Mukherjee <[email protected]> * Fix broken rules api fanout test Signed-off-by: Saswata Mukherjee <[email protected]> * Fix broken query compatibility test Signed-off-by: Saswata Mukherjee <[email protected]> * Remove fork Signed-off-by: Saswata Mukherjee <[email protected]> Signed-off-by: Saswata Mukherjee <[email protected]> --------- Signed-off-by: Vasiliy Rumyantsev <[email protected]> Signed-off-by: Ben Ye <[email protected]> Signed-off-by: GitHub <[email protected]> Signed-off-by: Saswata Mukherjee <[email protected]> Co-authored-by: Vasiliy Rumyantsev <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yeya24 <[email protected]> Co-authored-by: Saswata Mukherjee <[email protected]> * cherry pick store gateway fix to release 0.30 (thanos-io#6089) * Fix: Failure to close BlockSeriesClient cause store-gateway deadlock (thanos-io#6086) * Fix: Failure to close BlockSeriesClient cause store-gateway deadlock Signed-off-by: Alan Protasio <[email protected]> * Adding tests Signed-off-by: Alan Protasio <[email protected]> * reverting the change on get series Signed-off-by: Alan Protasio <[email protected]> * fix lint Signed-off-by: Alan Protasio <[email protected]> --------- Signed-off-by: Alan Protasio <[email protected]> * update changelog Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Alan Protasio <[email protected]> Signed-off-by: Ben Ye <[email protected]> Co-authored-by: Alan Protasio <[email protected]> * fix changelog entries Signed-off-by: Ben Ye <[email protected]> * docs: improving the description for tsdb.retention on the receiver Signed-off-by: Victor Fernandes <[email protected]> * Receiver: Use `intern` package when reallocating label strings (thanos-io#5926) * Cleanup go mod Signed-off-by: Matej Gera <[email protected]> * Use string interning for labels realloc method Signed-off-by: Matej Gera <[email protected]> * Enhance label realloc benchmarks Signed-off-by: Matej Gera <[email protected]> * Make interning optional; put behind hiddend flag Signed-off-by: Matej Gera <[email protected]> * Update CHANGELOG Signed-off-by: Matej Gera <[email protected]> * Address feedback - Fix wrong condition - Adjust benchmarks Signed-off-by: Matej Gera <[email protected]> --------- Signed-off-by: Matej Gera <[email protected]> Signed-off-by: Matej Gera <[email protected]> Signed-off-by: Matej Gera <[email protected]> * Updaing README with drawing fixes and minor wording clarification (thanos-io#6078) * New drawing and wording for Thanos other deployment models Signed-off-by: Jonah Kowall <[email protected]> * New drawing and wording for Thanos other deployment models Signed-off-by: Jonah Kowall <[email protected]> * Added comments to README.md and updated the quick-tutorial.md with the same diagram updates and text to match Signed-off-by: Jonah Kowall <[email protected]> * Ran make docs Signed-off-by: Jonah Kowall <[email protected]> --------- Signed-off-by: Jonah Kowall <[email protected]> * Compact: Remove spam of replica label removed log (thanos-io#6088) * Remove spam of replica label removed log Signed-off-by: Douglas Camata <[email protected]> * Reduce amount of removed replica label instead of removing it Signed-off-by: Douglas Camata <[email protected]> * Reformat code Signed-off-by: Douglas Camata <[email protected]> --------- Signed-off-by: Douglas Camata <[email protected]> * Store: Don't error when no stores are matched (thanos-io#6082) It's normal and not an error if a query does not match due to no downstream stores. This is common when querying with external labels and tiered query servers. This bug was introduced in thanos-io#5296 Fixes: thanos-io#5862 Signed-off-by: SuperQ <[email protected]> * docs: Fix must have Ruler alerts definition (thanos-io#6058) * Fix must have Ruler alerts definition ThanosRuler missing rule intervals metric used the wrong comparator sign, confusing users trying to create the rule. Signed-off-by: Maxim Muzafarov <[email protected]> * Update docs/components/rule.md Co-authored-by: Saswata Mukherjee <[email protected]> Signed-off-by: Maxim Muzafarov <[email protected]> --------- Signed-off-by: Maxim Muzafarov <[email protected]> Co-authored-by: Saswata Mukherjee <[email protected]> * Fix conflicts Signed-off-by: haanhvu <[email protected]> * Specify overwriting behavior in flag and add validation Signed-off-by: haanhvu <[email protected]> * Add log and doc Signed-off-by: haanhvu <[email protected]> * Mixins(Rule): Fix query for long rule evaluations (thanos-io#6103) * mixin(Rule): Fix query for long rule evaluations Signed-off-by: Douglas Camata <[email protected]> * Update changelog Signed-off-by: Douglas Camata <[email protected]> --------- Signed-off-by: Douglas Camata <[email protected]> --------- Signed-off-by: Filip Petkovski <[email protected]> Signed-off-by: haanhvu <[email protected]> Signed-off-by: Ben Ye <[email protected]> Signed-off-by: Pradyumna Krishna <[email protected]> Signed-off-by: Kartik-Garg <[email protected]> Signed-off-by: Giedrius Statkevičius <[email protected]> Signed-off-by: wanjunlei <[email protected]> Signed-off-by: Daniel Mellado <[email protected]> Signed-off-by: Pablo Moncada Isla <[email protected]> Signed-off-by: cyip <[email protected]> Signed-off-by: Kama Huang <[email protected]> Signed-off-by: Alan Protasio <[email protected]> Signed-off-by: Vasiliy Rumyantsev <[email protected]> Signed-off-by: GitHub <[email protected]> Signed-off-by: Saswata Mukherjee <[email protected]> Signed-off-by: Victor Fernandes <[email protected]> Signed-off-by: Matej Gera <[email protected]> Signed-off-by: Matej Gera <[email protected]> Signed-off-by: Matej Gera <[email protected]> Signed-off-by: Jonah Kowall <[email protected]> Signed-off-by: Douglas Camata <[email protected]> Signed-off-by: SuperQ <[email protected]> Signed-off-by: Maxim Muzafarov <[email protected]> Signed-off-by: Sebastian Rabenhorst <[email protected]> Co-authored-by: Filip Petkovski <[email protected]> Co-authored-by: Ha Anh Vu <[email protected]> Co-authored-by: Ben Ye <[email protected]> Co-authored-by: Pradyumna Krishna <[email protected]> Co-authored-by: Kartik-Garg <[email protected]> Co-authored-by: Giedrius Statkevičius <[email protected]> Co-authored-by: wanjunlei <[email protected]> Co-authored-by: wanjunlei <[email protected]> Co-authored-by: Daniel Mellado <[email protected]> Co-authored-by: Pablo Moncada <[email protected]> Co-authored-by: Chantel Yip <[email protected]> Co-authored-by: cyip <[email protected]> Co-authored-by: Kama Huang <[email protected]> Co-authored-by: Alan Protasio <[email protected]> Co-authored-by: Vasiliy Rumyantsev <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: yeya24 <[email protected]> Co-authored-by: Saswata Mukherjee <[email protected]> Co-authored-by: Victor Fernandes <[email protected]> Co-authored-by: Matej Gera <[email protected]> Co-authored-by: Jonah Kowall <[email protected]> Co-authored-by: Douglas Camata <[email protected]> Co-authored-by: Ben Kochie <[email protected]> Co-authored-by: Maxim Muzafarov <[email protected]> Co-authored-by: haanhvu <[email protected]>
ngraham20
pushed a commit
to ngraham20/thanos
that referenced
this pull request
Apr 17, 2023
* mixin(Rule): Fix query for long rule evaluations Signed-off-by: Douglas Camata <[email protected]> * Update changelog Signed-off-by: Douglas Camata <[email protected]> --------- Signed-off-by: Douglas Camata <[email protected]>
ngraham20
pushed a commit
to ngraham20/thanos
that referenced
this pull request
Apr 17, 2023
* mixin(Rule): Fix query for long rule evaluations Signed-off-by: Douglas Camata <[email protected]> * Update changelog Signed-off-by: Douglas Camata <[email protected]> --------- Signed-off-by: Douglas Camata <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Douglas Camata [email protected]
Changes
Verification
Now it properly matches the PromQL used for the alert
ThanosRuleRuleEvaluationLatencyHigh.