diff --git a/website/content/api-docs/catalog.mdx b/website/content/api-docs/catalog.mdx
index c7f715849ccf..7b3a1bb0cd48 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 d24ea55453f3..ad8f7722e2ae 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 48ca7838419f..8d2762d7e661 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": ""
+ }
+ ]
+ }
+ ]
+}
```
@@ -269,7 +275,8 @@ spec:
```
```json
-"Kind": "exported-services",
+{
+ "Kind": "exported-services",
"Name": "default",
"Services": [
{
@@ -277,8 +284,8 @@ spec:
"Consumers": [
{
"Peer": "web-shop"
- },
- ],
+ }
+ ]
},
{
"Name": "refunds",
@@ -289,6 +296,7 @@ spec:
]
}
]
+}
```
@@ -345,18 +353,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",
@@ -368,6 +377,7 @@ spec:
]
}
]
+}
```
@@ -391,7 +401,7 @@ Services = [
Consumers = [
{
Partition = "web-shop"
- },
+ }
]
},
{
@@ -424,18 +434,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",
@@ -447,6 +458,7 @@ spec:
]
}
]
+}
```
@@ -495,12 +507,13 @@ spec:
```
```json
-"Kind": "exported-services",
+{
+ "Kind": "exported-services",
"Name": "default",
"Services": [
{
"Name": "*",
- "Namespace": "*"
+ "Namespace": "*",
"Consumers": [
{
"Peer": "monitoring"
@@ -511,6 +524,7 @@ spec:
]
}
]
+}
```
@@ -558,13 +572,14 @@ spec:
```
```json
-"Kind": "exported-services",
+{
+ "Kind": "exported-services",
"Partition": "finance",
"Name": "finance",
"Services": [
{
"Name": "*",
- "Namespace": "*"
+ "Namespace": "*",
"Consumers": [
{
"Peer": "monitoring"
@@ -575,6 +590,7 @@ spec:
]
}
]
+}
```
@@ -622,13 +638,14 @@ spec:
```
```json
-"Kind": "exported-services",
+{
+ "Kind": "exported-services",
"Partition": "finance",
"Name": "finance",
"Services": [
{
"Name": "*",
- "Namespace": "*"
+ "Namespace": "*",
"Consumers": [
{
"Partition": "monitoring"
@@ -639,6 +656,7 @@ spec:
]
}
]
+}
```
@@ -705,7 +723,6 @@ node_prefix "" {
}
}
}
-
```
@@ -757,29 +774,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"
}
@@ -789,9 +807,9 @@ partition "frontend" {
"policy": "read"
}
}
- }
+ }
}
- }
+ }
}
}
```
@@ -845,17 +863,17 @@ partition "frontend" {
{
"partition": {
"frontend": {
- "namespace": {
+ "namespace": {
## The following could be any namespace
"dev": {
- "service": {
+ "service": {
"web": {
- "policy": "write"
+ "policy": "write"
}
}
- }
+ }
}
- }
+ }
}
}
@@ -864,10 +882,10 @@ partition "frontend" {
{
"partition": {
"frontend": {
- "namespace": {
+ "namespace": {
## The following could be any namespace
"dev": {
- "service_prefix": {
+ "service_prefix": {
"": {
"policy": "read"
}
@@ -877,9 +895,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 cf553af14f1f..6af84751546d 100644
--- a/website/content/docs/connect/config-entries/ingress-gateway.mdx
+++ b/website/content/docs/connect/config-entries/ingress-gateway.mdx
@@ -361,9 +361,9 @@ spec:
"MaxPendingRequests" : ,
"MaxConcurrentRequests": ,
"PassiveHealthCheck" : {
- "interval": ",
+ "interval": "",
"maxFailures": ,
- "enforcingConsecutive5xx":,
+ "enforcingConsecutive5xx": ,
"maxEjectionPercent": ,
"baseEjectionTime": ""
}
@@ -412,11 +412,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 9c0804f9c39d..04a6869a979f 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 5edf02886ba1..a7bc90cbbeb7 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 c393d4648a89..fc82cd2870d1 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.mdx b/website/content/docs/connect/proxies/envoy.mdx
index 557b65e0bdc4..f2c74182bc8a 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -220,6 +220,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/registration/service-registration.mdx b/website/content/docs/connect/registration/service-registration.mdx
index 57050476dcf4..18658b289239 100644
--- a/website/content/docs/connect/registration/service-registration.mdx
+++ b/website/content/docs/connect/registration/service-registration.mdx
@@ -208,7 +208,7 @@ mesh_gateway = {
"mesh_gateway": {
"mode": "local"
}
-},
+}
```
@@ -230,7 +230,7 @@ config = {}
"local_bind_address": "127.0.0.1",
"local_bind_port": 1234,
"config": {}
-},
+}
```
@@ -463,13 +463,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"
+ }
+ ]
+}
```
@@ -502,9 +504,11 @@ services {
```
```json
-"services": {
- "name": "service-2",
- "socket_path": "/tmp/socket_service_2"
+{
+ "services": {
+ "name": "service-2",
+ "socket_path": "/tmp/socket_service_2"
+ }
}
```
@@ -522,7 +526,6 @@ services {
proxy {
name = "service-2"
local_service_socket_path = "/tmp/socket_service_2"
- ...
}
}
}
@@ -530,17 +533,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 cb6ef644808f..7274821b030c 100644
--- a/website/content/docs/dynamic-app-config/watches.mdx
+++ b/website/content/docs/dynamic-app-config/watches.mdx
@@ -681,8 +681,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 ffe7c8058498..f22560e64e61 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 4614be695032..fc96ba30dcab 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 98f466720684..d95ed72456dc 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 390b5c75719a..91f30bfba927 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 280c07750368..6139ddeabbb9 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 068d8efa50e5..e0ad114e5324 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 4614a4b26808..2105637b8ecc 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 e72b219dd0bd..b4fcca2b8b47 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 9da2011681c7..a210d74741be 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.