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

Add a flag to disable step alignment middleware #3356

Merged
merged 4 commits into from
Oct 29, 2020

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Oct 23, 2020

Signed-off-by: Ben Ye yb532204897@gmail.com

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

Changes

Fix #3353

Verification

@yeya24
Copy link
Contributor Author

yeya24 commented Oct 23, 2020

Seems the E2E test failure is not related to this pr. But I am curious, can some maintainer help me re-trigger the GH CI?

Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just small nits. (:

@@ -57,6 +57,9 @@ func registerQueryFrontend(app *extkingpin.App) {
cfg.http.registerFlag(cmd)

// Query range tripperware flags.
cmd.Flag("query-range.align-querier-with-step", "Mutate incoming queries to align their start and end with their step.").
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cmd.Flag("query-range.align-querier-with-step", "Mutate incoming queries to align their start and end with their step.").
cmd.Flag("query-range.align-range-with-step", "Mutate incoming queries to align their start and end with their step for better cache-ability. Note: Grafana dashboards do that by default.")

@@ -139,6 +139,7 @@ type QueryRangeConfig struct {
ResultsCacheConfig *queryrange.ResultsCacheConfig
CachePathOrContent extflag.PathOrContent

AlignQueriesWithStep bool
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
AlignQueriesWithStep bool
AlignRangeWithStep bool

@yeya24
Copy link
Contributor Author

yeya24 commented Oct 26, 2020

Done. PTAL again @bwplotka

Signed-off-by: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Ben Ye <yb532204897@gmail.com>
Copy link
Member

@bwplotka bwplotka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@bwplotka bwplotka merged commit c534b6d into thanos-io:master Oct 29, 2020
@yeya24 yeya24 deleted the disable-step branch October 29, 2020 16:37
Oghenebrume50 pushed a commit to Oghenebrume50/thanos that referenced this pull request Dec 7, 2020
* add a flag to disable step alignment middleware

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* add changelog

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* add logic

Signed-off-by: Ben Ye <yb532204897@gmail.com>

* fix lint

Signed-off-by: Ben Ye <yb532204897@gmail.com>
Signed-off-by: Oghenebrume50 <raphlbrume@gmail.com>
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.

Query frontend: large step queries are shifted
2 participants