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

fix: querier address in SingleBinary mode #13297

Merged
merged 4 commits into from
Jul 3, 2024

Conversation

wrdls
Copy link
Contributor

@wrdls wrdls commented Jun 24, 2024

What this PR does / why we need it:

Fix loki.querierAddress helper distributed check.

The current if statement effectively checks if the string is non-empty.

Which issue(s) this PR fixes:
Fixes #12772
Fixes #12586

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • 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
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@wrdls wrdls requested a review from a team as a code owner June 24, 2024 13:22
@wrdls wrdls changed the title fix: loki.querierAddress helper distributed check Fix: querier address in SingleBinary mode Jun 24, 2024
@wrdls wrdls changed the title Fix: querier address in SingleBinary mode fix: querier address in SingleBinary mode Jun 24, 2024
Copy link
Collaborator

@slim-bean slim-bean left a comment

Choose a reason for hiding this comment

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

this LGTM, sorry we missed it and looks like it needs to be updated before we can merge. Could you update it (likely just the version number needs a bump)

@wrdls
Copy link
Contributor Author

wrdls commented Jul 3, 2024

Hi @slim-bean. Thanks for reviewing this.

Could you update it (likely just the version number needs a bump)

It's not clear to me what needs to happen. Do you mean the version in Chart.yaml?

@JStickler JStickler merged commit 29f1ea9 into grafana:main Jul 3, 2024
62 checks passed
@wrdls wrdls deleted the fix-querier-address branch July 4, 2024 09:03
mraboosk pushed a commit to mraboosk/loki that referenced this pull request Oct 7, 2024
Co-authored-by: J Stickler <julie.stickler@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Helm: Wrong querier address in SingleBinary mode Helm: Tail url looks incorrect
3 participants