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.

Sign up for GitHub

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

Jump to bottom

querier: remove query_timeout and engine timeout from querier conf #10302

Merged
merged 10 commits into from Aug 25, 2023
Merged

querier: remove query_timeout and engine timeout from querier conf #10302

merged 10 commits into from Aug 25, 2023

Conversation

ashwanthgoli
Copy link
Contributor

@ashwanthgoli ashwanthgoli commented Aug 21, 2023 •
edited

What this PR does / why we need it:
Removes query_timeout and engine:timeout from querier's config section
Both these configs have been deprecated in 2.7.0 release in favor of query_timeout in limits_config which also allows applying per-tenant overrides at runtime.

CLI flag -querier.engine.timeout is also removed

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
    • If the change is worth mentioning in the release notes, add add-to-release-notes label
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Aug 21, 2023
@ashwanthgoli ashwanthgoli marked this pull request as ready for review August 22, 2023 06:29
@ashwanthgoli ashwanthgoli requested a review from a team as a code owner August 22, 2023 06:30
MichelHollands
MichelHollands approved these changes Aug 22, 2023
View reviewed changes
Copy link
Contributor

@MichelHollands MichelHollands left a comment

Choose a reason for hiding this comment

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

LGTM

chaudum
chaudum reviewed Aug 22, 2023
View reviewed changes
Copy link
Contributor

@chaudum chaudum left a comment

Choose a reason for hiding this comment

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

I think we should make the changelog entry and upgrade notes as specific as possible. Otherwise LGTM

CHANGELOG.md Outdated Show resolved Hide resolved
chaudum
chaudum approved these changes Aug 23, 2023
View reviewed changes
docs/sources/setup/upgrade/_index.md Outdated Show resolved Hide resolved
@ashwanthgoli @chaudum
Update docs/sources/setup/upgrade/_index.md
5a955dd 
Co-authored-by: Christian Haudum <christian.haudum@gmail.com>
JStickler
JStickler approved these changes Aug 23, 2023
View reviewed changes
Copy link
Contributor

@JStickler JStickler left a comment

Choose a reason for hiding this comment

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

[docs team] Thanks for tagging me on this. One suggestion, otherwise LGTM.

docs/sources/setup/upgrade/_index.md Outdated Show resolved Hide resolved
@ashwanthgoli @JStickler
Update docs/sources/setup/upgrade/_index.md
236c86e 
Co-authored-by: J Stickler <julie.stickler@grafana.com>
@ashwanthgoli ashwanthgoli merged commit 470cbbf into main Aug 25, 2023
5 checks passed
@ashwanthgoli ashwanthgoli deleted the ashwanth/remove-engine-timeout branch August 25, 2023 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chaudum chaudum chaudum approved these changes

@JStickler JStickler JStickler approved these changes

@MichelHollands MichelHollands MichelHollands approved these changes

Assignees
No one assigned
Labels
size/L type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ashwanthgoli @chaudum @JStickler @MichelHollands