diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx index b60759465f..91d1fe7f7e 100644 --- a/website/content/api-docs/catalog.mdx +++ b/website/content/api-docs/catalog.mdx @@ -947,7 +947,7 @@ $ curl \ "Port": 8000, "Namespace": "default" } - } + ] } ``` diff --git a/website/content/docs/architecture/coordinates.mdx b/website/content/docs/architecture/coordinates.mdx index d24ea55453..ad8f7722e2 100644 --- a/website/content/docs/architecture/coordinates.mdx +++ b/website/content/docs/architecture/coordinates.mdx @@ -52,14 +52,18 @@ once you have their coordinates. Here's a sample coordinate, as returned from th ```json -... - "Coord": { - "Adjustment": 0.1, - "Error": 1.5, - "Height": 0.02, - "Vec": [0.34,0.68,0.003,0.01,0.05,0.1,0.34,0.06] +[ + { + "Node": "agent-one", + "Segment": "", + "Coord": { + "Adjustment": 0.1, + "Error": 1.5, + "Height": 0.02, + "Vec": [0.34,0.68,0.003,0.01,0.05,0.1,0.34,0.06] + } } -... +] ``` diff --git a/website/content/docs/connect/config-entries/exported-services.mdx b/website/content/docs/connect/config-entries/exported-services.mdx index c2c1bdd452..31a8d2e9f4 100644 --- a/website/content/docs/connect/config-entries/exported-services.mdx +++ b/website/content/docs/connect/config-entries/exported-services.mdx @@ -62,18 +62,20 @@ spec: ``` ```json -"Kind": "exported-services", -"Name": "default", -"Services": [ - { - "Name": "", - "Consumers": [ - { - "Peer": "" - } - ] - } -] +{ + "Kind": "exported-services", + "Name": "default", + "Services": [ + { + "Name": "", + "Consumers": [ + { + "Peer": "" + } + ] + } + ] +} ``` @@ -113,20 +115,22 @@ spec: ``` ```json -"Kind": "exported-services", -"Partition": "", -"Name": "", -"Services": [ - { - "Name": "", - "Namespace": "" - "Consumers": [ - { - "Peer": "" - } - ] - } -] +{ + "Kind": "exported-services", + "Partition": "", + "Name": "", + "Services": [ + { + "Name": "", + "Namespace": "", + "Consumers": [ + { + "Peer": "" + } + ] + } + ] +} ``` @@ -166,20 +170,22 @@ spec: ``` ```json -"Kind": "exported-services", -"Partition": "", -"Name": "", -"Services": [ - { - "Name": "", - "Namespace": "" - "Consumers": [ - { - "Partition": "" - } - ] - } -] +{ + "Kind": "exported-services", + "Partition": "", + "Name": "", + "Services": [ + { + "Name": "", + "Namespace": "", + "Consumers": [ + { + "Partition": "" + } + ] + } + ] +} ``` @@ -220,20 +226,22 @@ spec: ``` ```json -"Kind": "exported-services", -"Partition": "", -"Name": "", -"Services": [ - { - "Name": "", - "Namespace": "" - "Consumers": [ - { - "SamenessGroup": "" - } - ] - } -] +{ + "Kind": "exported-services", + "Partition": "", + "Name": "", + "Services": [ + { + "Name": "", + "Namespace": "", + "Consumers": [ + { + "SamenessGroup": "" + } + ] + } + ] +} ``` @@ -326,7 +334,8 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Name": "default", "Services": [ { @@ -334,8 +343,8 @@ spec: "Consumers": [ { "Peer": "web-shop" - }, - ], + } + ] }, { "Name": "refunds", @@ -346,6 +355,7 @@ spec: ] } ] +} ``` @@ -402,18 +412,19 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Partition": "finance", "Name": "finance", "Services": [ { "Name": "payments", - "Namespace": "billing" + "Namespace": "billing", "Consumers": [ { "Peer": "web-shop" - }, - ], + } + ] }, { "Name": "refunds", @@ -425,6 +436,7 @@ spec: ] } ] +} ``` @@ -448,7 +460,7 @@ Services = [ Consumers = [ { Partition = "web-shop" - }, + } ] }, { @@ -481,18 +493,19 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Partition": "finance", "Name": "finance", "Services": [ { "Name": "payments", - "Namespace": "billing" + "Namespace": "billing", "Consumers": [ { "Partition": "web-shop" - }, - ], + } + ] }, { "Name": "refunds", @@ -504,6 +517,7 @@ spec: ] } ] +} ``` @@ -545,7 +559,8 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Name": "default", "Services": [ { @@ -557,6 +572,7 @@ spec: ] } ] +} ``` @@ -603,12 +619,13 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Name": "default", "Services": [ { "Name": "*", - "Namespace": "*" + "Namespace": "*", "Consumers": [ { "Peer": "monitoring" @@ -619,6 +636,7 @@ spec: ] } ] +} ``` @@ -666,13 +684,14 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Partition": "finance", "Name": "finance", "Services": [ { "Name": "*", - "Namespace": "*" + "Namespace": "*", "Consumers": [ { "Peer": "monitoring" @@ -683,6 +702,7 @@ spec: ] } ] +} ``` @@ -730,13 +750,14 @@ spec: ``` ```json -"Kind": "exported-services", +{ + "Kind": "exported-services", "Partition": "finance", "Name": "finance", "Services": [ { "Name": "*", - "Namespace": "*" + "Namespace": "*", "Consumers": [ { "Partition": "monitoring" @@ -747,6 +768,7 @@ spec: ] } ] +} ``` @@ -813,7 +835,6 @@ node_prefix "" { } } } - ``` @@ -865,29 +886,30 @@ partition "frontend" { { "partition": { "frontend": { - "namespace": { + "namespace": { ## The following could be any namespace "dev": { - "service": { + "service": { "web": { - "policy": "write" + "policy": "write" } } - } + } } - } + } } } + ## OR { "partition": { "frontend": { - "namespace": { + "namespace": { ## The following could be any namespace "dev": { - "service_prefix": { + "service_prefix": { "": { "policy": "read" } @@ -897,9 +919,9 @@ partition "frontend" { "policy": "read" } } - } + } } - } + } } } ``` @@ -953,17 +975,17 @@ partition "frontend" { { "partition": { "frontend": { - "namespace": { + "namespace": { ## The following could be any namespace "dev": { - "service": { + "service": { "web": { - "policy": "write" + "policy": "write" } } - } + } } - } + } } } @@ -972,10 +994,10 @@ partition "frontend" { { "partition": { "frontend": { - "namespace": { + "namespace": { ## The following could be any namespace "dev": { - "service_prefix": { + "service_prefix": { "": { "policy": "read" } @@ -985,9 +1007,9 @@ partition "frontend" { "policy": "read" } } - } + } } - } + } } } ``` diff --git a/website/content/docs/connect/config-entries/ingress-gateway.mdx b/website/content/docs/connect/config-entries/ingress-gateway.mdx index dc41f134c4..920603c48e 100644 --- a/website/content/docs/connect/config-entries/ingress-gateway.mdx +++ b/website/content/docs/connect/config-entries/ingress-gateway.mdx @@ -369,9 +369,9 @@ spec: "MaxPendingRequests" : , "MaxConcurrentRequests": , "PassiveHealthCheck" : { - "interval": ", + "interval": "", "maxFailures": , - "enforcingConsecutive5xx":, + "enforcingConsecutive5xx": , "maxEjectionPercent": , "baseEjectionTime": "" } @@ -420,11 +420,12 @@ spec: "MaxPendingRequests" : , "MaxConcurrentRequests" : , "PassiveHealthCheck" : { - "interval": ", + "interval": "", "maxFailures": , "enforcingConsecutive5xx":, "maxEjectionPercent": , "baseEjectionTime": "" + } } ], "TLS" : { diff --git a/website/content/docs/connect/config-entries/terminating-gateway.mdx b/website/content/docs/connect/config-entries/terminating-gateway.mdx index 9c0804f9c3..04a6869a97 100644 --- a/website/content/docs/connect/config-entries/terminating-gateway.mdx +++ b/website/content/docs/connect/config-entries/terminating-gateway.mdx @@ -187,7 +187,7 @@ spec: "Services": [ { "Name": "billing", - "CAFile": "/etc/certs/ca-chain.cert.pem" + "CAFile": "/etc/certs/ca-chain.cert.pem", "SNI": "billing.service.com" } ] diff --git a/website/content/docs/connect/configuration.mdx b/website/content/docs/connect/configuration.mdx index 0ce7230ab2..dd1e8e156d 100644 --- a/website/content/docs/connect/configuration.mdx +++ b/website/content/docs/connect/configuration.mdx @@ -34,8 +34,10 @@ connect { ``` ```json -"connect": { - "enabled": true +{ + "connect": { + "enabled": true + } } ``` diff --git a/website/content/docs/connect/proxies/built-in.mdx b/website/content/docs/connect/proxies/built-in.mdx index 1bfd943db7..284bfa9035 100644 --- a/website/content/docs/connect/proxies/built-in.mdx +++ b/website/content/docs/connect/proxies/built-in.mdx @@ -22,7 +22,7 @@ for the built-in proxy. ```json { "service": { - ... + "name": "example-service", "connect": { "proxy": { "config": { @@ -31,11 +31,11 @@ for the built-in proxy. "local_service_address": "127.0.0.1:1234", "local_connect_timeout_ms": 1000, "handshake_timeout_ms": 10000, - "upstreams": [...] + "upstreams": [] }, "upstreams": [ { - ... + "destination_name": "example-upstream", "config": { "connect_timeout_ms": 1000 } diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx index 058f6dd988..34b4d844ac 100644 --- a/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx +++ b/website/content/docs/connect/proxies/envoy-extensions/usage/otel-access-logging.mdx @@ -12,7 +12,7 @@ This topic describes how to use the OpenTelemetry Access Logging Envoy extension Complete the following steps to use the OpenTelemetry Access Logging extension: -1. Configure an `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry. +1. Configure an `EnvoyExtensions` block in a service defaults or proxy defaults configuration entry. 1. Apply the configuration entry. ## Add the `EnvoyExtensions` @@ -57,23 +57,25 @@ EnvoyExtensions = [ ```json -"Kind": "service-defaults", -"Name": "api", -"EnvoyExtensions": [{ - "Name": "builtin/otel-access-logging", - "Arguments": { - "ProxyType": "connect-proxy", - "Config": { - "GrpcService": { - "Target": { - "Service": { - "Name": "otel-collector" +{ + "Kind": "service-defaults", + "Name": "api", + "EnvoyExtensions": [{ + "Name": "builtin/otel-access-logging", + "Arguments": { + "ProxyType": "connect-proxy", + "Config": { + "GrpcService": { + "Target": { + "Service": { + "Name": "otel-collector" + } } } } } - } -}] + }] +} ``` diff --git a/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx b/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx index 84cf621930..3c82d3c7c2 100644 --- a/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx +++ b/website/content/docs/connect/proxies/envoy-extensions/usage/property-override.mdx @@ -72,25 +72,27 @@ EnvoyExtensions = [ ```json -"kind": "service-defaults", -"name": "api", -"protocol": "http", -"envoyExtensions": [{ - "name": "builtin/property-override", - "arguments": { - "proxyType": "connect-proxy", - "patches": [{ - "resourceFilter": { - "resourceType": "cluster", - "trafficDirection": "outbound", - "services": [{ "name": "other-svc" }] - }, - "op": "add", - "path": "/respect_dns_ttl", - "value": true - }] - } -}] +{ + "kind": "service-defaults", + "name": "api", + "protocol": "http", + "envoyExtensions": [{ + "name": "builtin/property-override", + "arguments": { + "proxyType": "connect-proxy", + "patches": [{ + "resourceFilter": { + "resourceType": "cluster", + "trafficDirection": "outbound", + "services": [{ "name": "other-svc" }] + }, + "op": "add", + "path": "/respect_dns_ttl", + "value": true + }] + } + }] +} ``` diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 1f3ea797b9..f82a996d3a 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -221,6 +221,7 @@ Then, open `bootstrap.json` and update the following sections with your ACL toke ```json +{ "admin": { "access_log_path": "/dev/null", "address": { diff --git a/website/content/docs/connect/proxies/proxy-config-reference.mdx b/website/content/docs/connect/proxies/proxy-config-reference.mdx index 8c2b5fb5c8..f6796b143d 100644 --- a/website/content/docs/connect/proxies/proxy-config-reference.mdx +++ b/website/content/docs/connect/proxies/proxy-config-reference.mdx @@ -207,7 +207,7 @@ mesh_gateway = { "mesh_gateway": { "mode": "local" } -}, +} ``` @@ -229,7 +229,7 @@ config = {} "local_bind_address": "127.0.0.1", "local_bind_port": 1234, "config": {} -}, +} ``` @@ -462,13 +462,15 @@ upstreams = [ ``` ```json -"upstreams": [ - { - "destination_name": "service-1", - "local_bind_socket_path": "/tmp/socket_service_1", - "local_bind_socket_mode": "0700" - } -] +{ + "upstreams": [ + { + "destination_name": "service-1", + "local_bind_socket_path": "/tmp/socket_service_1", + "local_bind_socket_mode": "0700" + } + ] +} ``` @@ -499,9 +501,11 @@ services { ``` ```json -"services": { - "name": "service-2", - "socket_path": "/tmp/socket_service_2" +{ + "services": { + "name": "service-2", + "socket_path": "/tmp/socket_service_2" + } } ``` @@ -519,7 +523,6 @@ services { proxy { name = "service-2" local_service_socket_path = "/tmp/socket_service_2" - ... } } } @@ -527,17 +530,20 @@ services { ``` ```json -"services": { - "name": "socket_service_2", - "connect": { - "sidecar_service": { - "proxy": { - "name": "service-2", - "local_service_socket_path": "/tmp/socket_service_2" - ... +{ + "services": [ + { + "name": "socket_service_2", + "connect": { + "sidecar_service": { + "proxy": { + "name": "service-2", + "local_service_socket_path": "/tmp/socket_service_2" + } + } } } - } + ] } ``` diff --git a/website/content/docs/dynamic-app-config/watches.mdx b/website/content/docs/dynamic-app-config/watches.mdx index 64b52be358..8eac588862 100644 --- a/website/content/docs/dynamic-app-config/watches.mdx +++ b/website/content/docs/dynamic-app-config/watches.mdx @@ -682,8 +682,7 @@ An example of the output of this command: "TagFilter": "", "Version": 1, "LTime": 18 - }, - ... + } ] ``` diff --git a/website/content/docs/ecs/manual/install.mdx b/website/content/docs/ecs/manual/install.mdx index ffe7c80584..f22560e64e 100644 --- a/website/content/docs/ecs/manual/install.mdx +++ b/website/content/docs/ecs/manual/install.mdx @@ -48,7 +48,7 @@ during task startup. "name": "consul_binary" } ], - "containerDefinitions": [...] + "containerDefinitions": [...], "tags": [ { "key": "consul.hashicorp.com/mesh", diff --git a/website/content/docs/lambda/registration/automate.mdx b/website/content/docs/lambda/registration/automate.mdx index 8a118aa860..135dddcf93 100644 --- a/website/content/docs/lambda/registration/automate.mdx +++ b/website/content/docs/lambda/registration/automate.mdx @@ -111,7 +111,7 @@ The registrator also requires the following IAM permissions to access the parame "Effect": "Allow", "Action": ["ssm:PutParameter","ssm:DeleteParameter"], "Resource": "arn:aws:ssm:us-east-2:123456789012:parameter/${var.consul_extension_data_prefix}/*" - }, + } ] } ``` diff --git a/website/content/docs/nia/api/status.mdx b/website/content/docs/nia/api/status.mdx index 98f4667206..d95ed72456 100644 --- a/website/content/docs/nia/api/status.mdx +++ b/website/content/docs/nia/api/status.mdx @@ -182,7 +182,7 @@ Response: "null" ], "services": [ - "web", + "web" ], "events_url": "/v1/status/tasks/task_b?include=events", "events": [ @@ -217,7 +217,7 @@ Response: "null" ], "services": [ - "web", + "web" ], "module": "../modules/test_task" } diff --git a/website/content/docs/security/acl/acl-federated-datacenters.mdx b/website/content/docs/security/acl/acl-federated-datacenters.mdx index cdb8a3aaee..80a5ad3b93 100644 --- a/website/content/docs/security/acl/acl-federated-datacenters.mdx +++ b/website/content/docs/security/acl/acl-federated-datacenters.mdx @@ -47,7 +47,7 @@ acl = { ```json { - "bootstrap_expect": N, + "bootstrap_expect": 3, "primary_datacenter": "PRIMARY_DATACENTER_VALUE", "acl": { "enabled": true, diff --git a/website/content/docs/security/acl/acl-rules.mdx b/website/content/docs/security/acl/acl-rules.mdx index 280c077503..6139ddeabb 100644 --- a/website/content/docs/security/acl/acl-rules.mdx +++ b/website/content/docs/security/acl/acl-rules.mdx @@ -554,7 +554,7 @@ node "admin" { "node_prefix": { "": { "policy": "read" - }, + } }, "node": { "app": { diff --git a/website/content/docs/security/acl/tokens/index.mdx b/website/content/docs/security/acl/tokens/index.mdx index 068d8efa50..e0ad114e53 100644 --- a/website/content/docs/security/acl/tokens/index.mdx +++ b/website/content/docs/security/acl/tokens/index.mdx @@ -35,29 +35,27 @@ Specify the value of the `SecretID` attribute with the `token` parameter when co - + ```hcl service = { id = "redis" name = "redis" - ... namespace = "foo" token = "233b604b-b92e-48c8-a253-5f11514e4b50" } ``` - + ```json { "service": { "id": "redis", "name": "redis", - ... - "token": "233b604b-b92e-48c8-a253-5f11514e4b50", - "namespace": "foo" + "namespace": "foo", + "token": "233b604b-b92e-48c8-a253-5f11514e4b50" } } ``` diff --git a/website/content/docs/services/configuration/services-configuration-reference.mdx b/website/content/docs/services/configuration/services-configuration-reference.mdx index 7c6a522df5..1626a02da5 100644 --- a/website/content/docs/services/configuration/services-configuration-reference.mdx +++ b/website/content/docs/services/configuration/services-configuration-reference.mdx @@ -96,12 +96,14 @@ In the following example, the `env` key is set to `prod`: ```hcl meta = { env = "prod" -} +} ``` ```json -"meta" : { +{ + "meta" : { "env" : "prod" + } } ``` @@ -362,25 +364,29 @@ In the following example, service instances in a `passing` state respond to DNS ```hcl service { - ## ... + name = "redis" + address = "192.0.2.10" + port = 6379 weights = { passing = 3 warning = 2 critical = 1 } - ## ... } ``` ```json -"service": { - ## ... - "weights": { - "passing": 3, - "warning": 2, - "critical": 1 - }, - ## ... +{ + "service": { + "name": "redis", + "address": "192.0.2.10", + "port": 6379, + "weights": { + "passing": 3, + "warning": 2, + "critical": 1 + } + } } ``` @@ -585,7 +591,7 @@ service { "tagged_addresses": { "lan": { "address": "192.168.0.55", - "port": 8000, + "port": 8000 }, "wan": { "address": "198.18.0.23", @@ -632,7 +638,7 @@ service { }, "connect": { "native": false, - "sidecar_service": {} + "sidecar_service": {}, "proxy": { // Deprecated "command": [], "config": {} diff --git a/website/content/docs/services/usage/checks.mdx b/website/content/docs/services/usage/checks.mdx index e72b219dd0..b4fcca2b8b 100644 --- a/website/content/docs/services/usage/checks.mdx +++ b/website/content/docs/services/usage/checks.mdx @@ -57,8 +57,7 @@ checks = [ name = "cpu" args = ["/bin/check_cpu"] interval = "10s" - }, - ... + } ] ``` @@ -82,8 +81,7 @@ checks = [ "name": "cpu", "args": ["/bin/check_cpu"], "interval": "10s" - }, - ... + } ] } ``` diff --git a/website/content/docs/services/usage/define-services.mdx b/website/content/docs/services/usage/define-services.mdx index 5b1450fe1a..fdd30fb15c 100644 --- a/website/content/docs/services/usage/define-services.mdx +++ b/website/content/docs/services/usage/define-services.mdx @@ -380,8 +380,7 @@ services { "timeout": "60s" } ] - }, - ... + } ] } ``` @@ -397,25 +396,32 @@ Add the `enable_tag_override` option to the `service` block and set the value to + ```hcl service { - ## ... + name = "redis" + port = 6379 enable_tag_override = true - ## ... } ``` + + + + ```json { "service": { - ## ... - "enable_tag_override": true, - ## ... + "name": "redis", + "port": 6379, + "enable_tag_override": true } } ``` + + This configuration only applies to the locally registered service. Nodes that register the same service apply the `enable_tag_override` and other service configurations independently. The tags for a service registered on one node update are not affected by operations performed on services with the same name registered on other nodes.