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
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docs/sources/configuration/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -1006,10 +1006,11 @@ pool_config:
# How quickly a dead client will be removed after it has been detected
# to disappear. Set this to a value to allow time for a secondary
# health check to recover the missing client.
[remotetimeout: <duration>]
# CLI flag: -ingester.client.healthcheck-timeout
[remote_timeout: <duration>]
RangerCD marked this conversation as resolved.
Show resolved Hide resolved

# The remote request timeout on the client side.
# CLI flag: -ingester.client.healthcheck-timeout
# CLI flag: -ingester.client.timeout
[remote_timeout: <duration> | default = 5s]

# Configures how the gRPC connection to ingesters work as a client
Expand Down
2 changes: 1 addition & 1 deletion pkg/distributor/clientpool/ingester_client_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var clients = promauto.NewGauge(prometheus.GaugeOpts{
type PoolConfig struct {
ClientCleanupPeriod time.Duration `yaml:"client_cleanup_period"`
HealthCheckIngesters bool `yaml:"health_check_ingesters"`
RemoteTimeout time.Duration `yaml:"-"`
RemoteTimeout time.Duration `yaml:"remote_timeout"`
}

// RegisterFlags adds the flags required to config this to the given FlagSet.
Expand Down