diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md index ee880030e9d..92bffc8ec65 100644 --- a/docs/sources/mimir/configure/configuration-parameters/index.md +++ b/docs/sources/mimir/configure/configuration-parameters/index.md @@ -1073,7 +1073,7 @@ The `ingester` block configures the ingester. ```yaml ring: # The key-value store used to share the hash ring across multiple instances. - # This option needs be set on ingesters, distributors, queriers and rulers + # This option needs be set on ingesters, distributors, queriers, and rulers # when running in microservices mode. kvstore: # Backend storage to use for the ring. Supported values are: consul, etcd, @@ -1220,7 +1220,7 @@ ring: partition_ring: # The key-value store used to share the hash ring across multiple instances. - # This option needs be set on ingesters, distributors, queriers and rulers + # This option needs be set on ingesters, distributors, queriers, and rulers # when running in microservices mode. kvstore: # Backend storage to use for the ring. Supported values are: consul, etcd, diff --git a/pkg/ingester/ingester_partition_ring.go b/pkg/ingester/ingester_partition_ring.go index 6a7f7c61b08..fbfbfce7415 100644 --- a/pkg/ingester/ingester_partition_ring.go +++ b/pkg/ingester/ingester_partition_ring.go @@ -11,7 +11,7 @@ import ( ) type PartitionRingConfig struct { - KVStore kv.Config `yaml:"kvstore" doc:"description=The key-value store used to share the hash ring across multiple instances. This option needs be set on ingesters, distributors, queriers and rulers when running in microservices mode."` + KVStore kv.Config `yaml:"kvstore" doc:"description=The key-value store used to share the hash ring across multiple instances. This option needs be set on ingesters, distributors, queriers, and rulers when running in microservices mode."` // MinOwnersCount maps to ring.PartitionInstanceLifecyclerConfig's WaitOwnersCountOnPending. MinOwnersCount int `yaml:"min_partition_owners_count"` diff --git a/pkg/ingester/ingester_ring.go b/pkg/ingester/ingester_ring.go index 6c0a462f9d9..f75ec306726 100644 --- a/pkg/ingester/ingester_ring.go +++ b/pkg/ingester/ingester_ring.go @@ -35,7 +35,7 @@ const sharedOptionWithRingClient = " This option needs be set on ingesters, dist var ErrSpreadMinimizingValidation = fmt.Errorf("%q token generation strategy is misconfigured", tokenGenerationSpreadMinimizing) type RingConfig struct { - KVStore kv.Config `yaml:"kvstore" doc:"description=The key-value store used to share the hash ring across multiple instances. This option needs be set on ingesters, distributors, queriers and rulers when running in microservices mode."` + KVStore kv.Config `yaml:"kvstore" doc:"description=The key-value store used to share the hash ring across multiple instances. This option needs be set on ingesters, distributors, queriers, and rulers when running in microservices mode."` HeartbeatPeriod time.Duration `yaml:"heartbeat_period" category:"advanced"` HeartbeatTimeout time.Duration `yaml:"heartbeat_timeout" category:"advanced"` ReplicationFactor int `yaml:"replication_factor"`