diff --git a/agent/consul/segment_oss.go b/agent/consul/segment_oss.go index 8f30e06059..11b06b6959 100644 --- a/agent/consul/segment_oss.go +++ b/agent/consul/segment_oss.go @@ -57,7 +57,7 @@ func (s *Server) floodSegments(config *Config) { // reconcile is used to reconcile the differences between Serf membership and // what is reflected in our strongly consistent store. Mainly we need to ensure // all live nodes are registered, all failed nodes are marked as such, and all -// left nodes are de-registered. +// left nodes are deregistered. func (s *Server) reconcile() (err error) { defer metrics.MeasureSince([]string{"leader", "reconcile"}, time.Now()) members := s.serfLAN.Members() diff --git a/agent/consul/state/catalog.go b/agent/consul/state/catalog.go index 3c35f2fa23..ed24827367 100644 --- a/agent/consul/state/catalog.go +++ b/agent/consul/state/catalog.go @@ -2126,7 +2126,7 @@ func (s *Store) checkServiceNodesTxn(tx *memdb.Txn, ws memdb.WatchSet, serviceNa } } else { // If we have no results, we should use the index of the last service - // extinction event so we don't go backwards when services de-register. We + // extinction event so we don't go backwards when services deregister. We // use target serviceName here but it actually doesn't matter. No chan will // be returned as we can't use the optimization in this case (and don't need // to as there is only one chan to watch anyway). diff --git a/agent/consul/state/catalog_test.go b/agent/consul/state/catalog_test.go index a9656f2351..9a108541f4 100644 --- a/agent/consul/state/catalog_test.go +++ b/agent/consul/state/catalog_test.go @@ -2200,7 +2200,7 @@ func TestStateStore_ConnectServiceNodes_Gateways(t *testing.T) { _, _, err = s.ConnectServiceNodes(ws, "db", nil) assert.Nil(err) - // Watch should fire when a gateway instance is de-registered + // Watch should fire when a gateway instance is deregistered assert.Nil(s.DeleteService(19, "bar", "gateway", nil)) assert.True(watchFired(ws)) @@ -3661,7 +3661,7 @@ func TestStateStore_CheckConnectServiceNodes_Gateways(t *testing.T) { assert.Equal(idx, uint64(22)) assert.Len(nodes, 3) - // Watch should fire when a gateway instance is de-registered + // Watch should fire when a gateway instance is deregistered assert.Nil(s.DeleteService(23, "bar", "gateway", nil)) assert.True(watchFired(ws)) diff --git a/logging/monitor/monitor.go b/logging/monitor/monitor.go index 21acb57986..a8e4e52324 100644 --- a/logging/monitor/monitor.go +++ b/logging/monitor/monitor.go @@ -14,7 +14,7 @@ type Monitor interface { // ever time a log message occurs Start() <-chan []byte - // Stop de-registers the sink from the InterceptLogger and closes the log + // Stop deregisters the sink from the InterceptLogger and closes the log // channels. This returns a count of the number of log messages that were // dropped during streaming. Stop() int diff --git a/website/pages/api-docs/query.mdx b/website/pages/api-docs/query.mdx index 57006557e5..02d7bf8f3e 100644 --- a/website/pages/api-docs/query.mdx +++ b/website/pages/api-docs/query.mdx @@ -203,7 +203,7 @@ The table below shows this endpoint's support for should be ignored when filtering unhealthy instances. This is mostly useful in an emergency or as a temporary measure when a health check is found to be unreliable. Being able to ignore it in centrally-defined queries can be - simpler than de-registering the check as an interim solution until the check + simpler than deregistering the check as an interim solution until the check can be fixed. - `OnlyPassing` `(bool: false)` - Specifies the behavior of the query's health diff --git a/website/pages/docs/agent/telemetry.mdx b/website/pages/docs/agent/telemetry.mdx index 4969adb082..9a84a15fd5 100644 --- a/website/pages/docs/agent/telemetry.mdx +++ b/website/pages/docs/agent/telemetry.mdx @@ -147,9 +147,9 @@ This is a full list of metrics emitted by Consul. | `consul.client.api.catalog_register.` | This increments whenever a Consul agent receives a catalog register request. | requests | counter | | `consul.client.api.success.catalog_register.` | This increments whenever a Consul agent successfully responds to a catalog register request. | requests | counter | | `consul.client.rpc.error.catalog_register.` | This increments whenever a Consul agent receives an RPC error for a catalog register request. | errors | counter | -| `consul.client.api.catalog_deregister.` | This increments whenever a Consul agent receives a catalog de-register request. | requests | counter | -| `consul.client.api.success.catalog_deregister.` | This increments whenever a Consul agent successfully responds to a catalog de-register request. | requests | counter | -| `consul.client.rpc.error.catalog_deregister.` | This increments whenever a Consul agent receives an RPC error for a catalog de-register request. | errors | counter | +| `consul.client.api.catalog_deregister.` | This increments whenever a Consul agent receives a catalog deregister request. | requests | counter | +| `consul.client.api.success.catalog_deregister.` | This increments whenever a Consul agent successfully responds to a catalog deregister request. | requests | counter | +| `consul.client.rpc.error.catalog_deregister.` | This increments whenever a Consul agent receives an RPC error for a catalog deregister request. | errors | counter | | `consul.client.api.catalog_datacenters.` | This increments whenever a Consul agent receives a request to list datacenters in the catalog. | requests | counter | | `consul.client.api.success.catalog_datacenters.` | This increments whenever a Consul agent successfully responds to a request to list datacenters. | requests | counter | | `consul.client.rpc.error.catalog_datacenters.` | This increments whenever a Consul agent receives an RPC error for a request to list datacenters. | errors | counter | diff --git a/website/pages/docs/connect/registration/sidecar-service.mdx b/website/pages/docs/connect/registration/sidecar-service.mdx index 5d4483a2a7..6565a7bfa7 100644 --- a/website/pages/docs/connect/registration/sidecar-service.mdx +++ b/website/pages/docs/connect/registration/sidecar-service.mdx @@ -150,7 +150,7 @@ Almost all fields in a [service definition](/docs/agent/services) may be set on the `connect.sidecar_service` except for the following: - `id` - Sidecar services get an ID assigned and it is an error to override - this. This ensures the agent can correctly de-register the sidecar service + this. This ensures the agent can correctly deregister the sidecar service later when the parent service is removed. - `kind` - Kind defaults to `connect-proxy` and there is currently no way to unset this to make the registration be for a regular non-connect-proxy diff --git a/website/pages/docs/guides/production-acls.mdx b/website/pages/docs/guides/production-acls.mdx index f20b629aef..7d62a97008 100644 --- a/website/pages/docs/guides/production-acls.mdx +++ b/website/pages/docs/guides/production-acls.mdx @@ -190,8 +190,8 @@ rolling restart. After applying the token. The token creation and application process for services is similar to agents. Create a policy. Use that policy to create a token. Add the token to the service. Service tokens are necessary for -agent anti-entropy, registering and de-registering the service, and -registering and de-registering the service's checks. +agent anti-entropy, registering and deregistering the service, and +registering and deregistering the service's checks. Review the [service rules](/docs/agent/acl-rules#service-rules) before