-
Notifications
You must be signed in to change notification settings - Fork 460
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
ruler: fix TestRulerMetricsForInvalidQueriesAndNoFetchedSeries #6843
Merged
dimitarvdimitrov
merged 7 commits into
main
from
dimitar/ruler/fix-TestRulerMetricsForInvalidQueriesAndNoFetchedSeries
Dec 7, 2023
Merged
ruler: fix TestRulerMetricsForInvalidQueriesAndNoFetchedSeries #6843
dimitarvdimitrov
merged 7 commits into
main
from
dimitar/ruler/fix-TestRulerMetricsForInvalidQueriesAndNoFetchedSeries
Dec 7, 2023
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
instead of assuming that rules only evaluate once, use the increase in the counter to tell whether the query is with 0 series or not In addition to that add another helper function for comparing cortex_prometheus_last_evaluation_samples Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
zenador
requested changes
Dec 6, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thank you for this! Only have nits for formatting consistency.
4 tasks
Co-authored-by: zenador <zenador@users.noreply.github.com>
Co-authored-by: zenador <zenador@users.noreply.github.com>
Co-authored-by: zenador <zenador@users.noreply.github.com>
Co-authored-by: zenador <zenador@users.noreply.github.com>
Co-authored-by: zenador <zenador@users.noreply.github.com>
flxbk
approved these changes
Dec 7, 2023
zenador
approved these changes
Dec 7, 2023
grafanabot
pushed a commit
that referenced
this pull request
Dec 8, 2023
* ruler: fix TestRulerMetricsForInvalidQueriesAndNoFetchedSeries instead of assuming that rules only evaluate once, use the increase in the counter to tell whether the query is with 0 series or not In addition to that add another helper function for comparing cortex_prometheus_last_evaluation_samples Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix assertion Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update integration/ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update integration/ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> Co-authored-by: zenador <zenador@users.noreply.github.com> (cherry picked from commit 73ff5a2)
krajorama
pushed a commit
that referenced
this pull request
Dec 8, 2023
#6854) * ruler: fix TestRulerMetricsForInvalidQueriesAndNoFetchedSeries instead of assuming that rules only evaluate once, use the increase in the counter to tell whether the query is with 0 series or not In addition to that add another helper function for comparing cortex_prometheus_last_evaluation_samples Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix assertion Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update integration/ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> * Update integration/ruler_test.go Co-authored-by: zenador <zenador@users.noreply.github.com> --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> Co-authored-by: zenador <zenador@users.noreply.github.com> (cherry picked from commit 73ff5a2) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
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.
instead of assuming that rules only evaluate once, use the increase in the counter to tell whether the query is with 0 series or not
In addition to that add another helper function for comparing cortex_prometheus_last_evaluation_samples