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(operator): Use correct field name for remote write client timeout #11928

Merged
merged 3 commits into from
Mar 7, 2024

Conversation

periklis
Copy link
Collaborator

What this PR does / why we need it:
Since Loki switched to vendor the Prometheus RemoteWriteConfig struct for it's remote write client config, the Operator is missing to use the correct field name for the client timeout. This PR fixes the missing rename for the timeout field from timeout to remote_timeout.

Which issue(s) this PR fixes:
Fixes #11731

Special notes for your reviewer:

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
  • 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

@periklis periklis self-assigned this Feb 13, 2024
@periklis periklis requested review from xperimental and a team as code owners February 13, 2024 12:46
Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

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

lgtm

@xperimental xperimental changed the title operator: Fix remote write client timeout config rename fix(operator): Use correct field name for remote write client timeout Mar 5, 2024
Copy link
Collaborator

@xperimental xperimental left a comment

Choose a reason for hiding this comment

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

Looks good to me, just needs to be updated to get around the conflict.

@periklis periklis enabled auto-merge (squash) March 7, 2024 08:38
@periklis periklis merged commit a993a0a into grafana:main Mar 7, 2024
17 of 18 checks passed
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.

operator: RulerConfig remote_write timeout issue
3 participants