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 two remote_timeout configs in ingester_client block #5418

Merged
merged 2 commits into from
Feb 24, 2022

Conversation

RangerCD
Copy link
Contributor

What this PR does / why we need it:

  1. Expose remote_timeout under pool_config block in yaml config file, as expected in documentation.
  2. Fix mismatched flags -ingester.client.healthcheck-timeout and -ingester.client.timeout in documentation.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

remotetimeout inside pool_config has been renamed to remote_timeout. This change does not affect any previous config file, since remotetimeout has never been actually exposed in yaml before.

loki-local-config.yaml:

ingester_client:
  pool_config:
    remotetimeout: 1s

auth_enabled: false
...

Running with latest version:

> loki -config.file=./loki-local-config.yaml
failed parsing config: ./loki-local-config.yaml: yaml: unmarshal errors:
  line 3: field remotetimeout not found in type distributor.PoolConfig

Checklist

  • Documentation added
  • Tests updated
  • Add an entry in the CHANGELOG.md about the changes.

Copy link
Contributor

@kavirajk kavirajk 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 @RangerCD. Now it's more clear :)

@kavirajk
Copy link
Contributor

cc @KMiller-Grafana

@kavirajk kavirajk merged commit daacfd0 into grafana:main Feb 24, 2022
@RangerCD RangerCD deleted the fix/ingester-client-config branch February 24, 2022 09:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants