From c5c35ec92414cc171898e9be5bf1dbe82bf7b3c8 Mon Sep 17 00:00:00 2001 From: Freddy Date: Wed, 26 Apr 2023 10:04:57 -0600 Subject: [PATCH] [CC-4519] Include Consul NodeID in Envoy bootstrap metadata (#17139) This is being added so that metrics sent to HCP can be augmented with the source node's ID. Opting not to add this to stats_tag out of caution, since it would increase the cardinality of metrics emitted by Envoy for all users. There is no functional impact to Envoy expected from this change. --- command/connect/envoy/bootstrap_tpl.go | 4 ++++ command/connect/envoy/envoy.go | 6 ++++++ command/connect/envoy/envoy_test.go | 1 + .../CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden | 1 + ...P_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden | 1 + command/connect/envoy/testdata/access-log-path.golden | 1 + .../envoy/testdata/access-logs-enabled-custom.golden | 1 + command/connect/envoy/testdata/access-logs-enabled.golden | 1 + command/connect/envoy/testdata/acl-enabled-and-token.golden | 1 + .../connect/envoy/testdata/acl-enabled-but-no-token.golden | 1 + ...L_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden | 1 + ...HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden | 1 + command/connect/envoy/testdata/defaults-nodemeta.golden | 1 + command/connect/envoy/testdata/defaults.golden | 1 + .../envoy/testdata/deprecated-grpc-addr-config.golden | 1 + command/connect/envoy/testdata/envoy-readiness-probe.golden | 1 + command/connect/envoy/testdata/existing-ca-file.golden | 1 + command/connect/envoy/testdata/existing-ca-path.golden | 1 + command/connect/envoy/testdata/extra_-multiple.golden | 1 + command/connect/envoy/testdata/extra_-single.golden | 1 + command/connect/envoy/testdata/grpc-addr-env.golden | 1 + command/connect/envoy/testdata/grpc-addr-flag.golden | 1 + .../connect/envoy/testdata/grpc-addr-unix-with-tls.golden | 1 + command/connect/envoy/testdata/grpc-addr-unix.golden | 1 + command/connect/envoy/testdata/grpc-tls-addr-config.golden | 1 + command/connect/envoy/testdata/hcp-metrics.golden | 1 + .../envoy/testdata/ingress-gateway-address-specified.golden | 1 + .../envoy/testdata/ingress-gateway-no-auto-register.golden | 1 + .../connect/envoy/testdata/ingress-gateway-nodemeta.golden | 1 + ...ngress-gateway-register-with-service-and-proxy-id.golden | 1 + ...ss-gateway-register-with-service-without-proxy-id.golden | 1 + command/connect/envoy/testdata/ingress-gateway.golden | 1 + .../envoy/testdata/prometheus-metrics-tls-ca-file.golden | 1 + .../envoy/testdata/prometheus-metrics-tls-ca-path.golden | 1 + command/connect/envoy/testdata/prometheus-metrics.golden | 1 + command/connect/envoy/testdata/stats-config-override.golden | 1 + command/connect/envoy/testdata/token-arg.golden | 1 + command/connect/envoy/testdata/token-env.golden | 1 + command/connect/envoy/testdata/token-file-arg.golden | 1 + command/connect/envoy/testdata/token-file-env.golden | 1 + command/connect/envoy/testdata/xds-addr-config.golden | 1 + command/connect/envoy/testdata/zipkin-tracing-config.golden | 1 + 42 files changed, 50 insertions(+) diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index 78d88f9b1d11..9cce86c6b9b5 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -17,6 +17,9 @@ type BootstrapTplArgs struct { // the agent to deliver the correct configuration. ProxyID string + // NodeID is the ID of the node on which the proxy service instance is registered. + NodeID string + // NodeName is the name of the node on which the proxy service instance is registered. NodeName string @@ -184,6 +187,7 @@ const bootstrapTemplate = `{ {{- if .NodeName }} "node_name": "{{ .NodeName }}", {{- end }} + "node_id": "{{ .NodeID }}", "namespace": "{{if ne .Namespace ""}}{{ .Namespace }}{{else}}default{{end}}", "partition": "{{if ne .Partition ""}}{{ .Partition }}{{else}}default{{end}}" } diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 4c1ff6b80a19..06f5963e098f 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -722,6 +722,12 @@ func (c *cmd) generateConfig() ([]byte, error) { args.Datacenter = datacenter } + info, err := c.client.Agent().Self() + if err != nil { + return nil, err + } + args.NodeID, _ = info["Config"]["NodeID"].(string) + if err := generateAccessLogs(c, args); err != nil { return nil, err } diff --git a/command/connect/envoy/envoy_test.go b/command/connect/envoy/envoy_test.go index ebfc30631173..f655a2e906c1 100644 --- a/command/connect/envoy/envoy_test.go +++ b/command/connect/envoy/envoy_test.go @@ -1691,6 +1691,7 @@ func testMockAgentSelf( resp := agent.Self{ Config: map[string]interface{}{ "Datacenter": "dc1", + "NodeID": "7cbef9fc-4fb1-4c84-b100-689db9755449", }, } diff --git a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden index a8ba4704f5e3..22680a5eb78e 100644 --- a/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_GRPC_ADDR-with-https-scheme-enables-tls.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden index 5485256b4f99..bac5b1d0f6af 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-does-not-affect-grpc-tls.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 18a28a491e86..f25ab92cf50e 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/access-logs-enabled-custom.golden b/command/connect/envoy/testdata/access-logs-enabled-custom.golden index 6af720bdaccb..1f42d1450ece 100644 --- a/command/connect/envoy/testdata/access-logs-enabled-custom.golden +++ b/command/connect/envoy/testdata/access-logs-enabled-custom.golden @@ -25,6 +25,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/access-logs-enabled.golden b/command/connect/envoy/testdata/access-logs-enabled.golden index 892cf46324b4..2a1a40947dd0 100644 --- a/command/connect/envoy/testdata/access-logs-enabled.golden +++ b/command/connect/envoy/testdata/access-logs-enabled.golden @@ -47,6 +47,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/acl-enabled-and-token.golden b/command/connect/envoy/testdata/acl-enabled-and-token.golden index 3342f0390471..5694e08e1efa 100644 --- a/command/connect/envoy/testdata/acl-enabled-and-token.golden +++ b/command/connect/envoy/testdata/acl-enabled-and-token.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden index 5485256b4f99..bac5b1d0f6af 100644 --- a/command/connect/envoy/testdata/acl-enabled-but-no-token.golden +++ b/command/connect/envoy/testdata/acl-enabled-but-no-token.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden index a8ba4704f5e3..22680a5eb78e 100644 --- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden +++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-PLAIN-and-CONSUL_GRPC_ADDR-TLS-is-tls.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden index 5485256b4f99..bac5b1d0f6af 100644 --- a/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden +++ b/command/connect/envoy/testdata/both-CONSUL_HTTP_ADDR-TLS-and-CONSUL_GRPC_ADDR-PLAIN-is-plain.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/defaults-nodemeta.golden b/command/connect/envoy/testdata/defaults-nodemeta.golden index 41788c3c42e4..3371495e81b0 100644 --- a/command/connect/envoy/testdata/defaults-nodemeta.golden +++ b/command/connect/envoy/testdata/defaults-nodemeta.golden @@ -13,6 +13,7 @@ "id": "test-proxy", "metadata": { "node_name": "test-node", + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 5485256b4f99..bac5b1d0f6af 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden index ab87aa9b438f..303950c696db 100644 --- a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden +++ b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/envoy-readiness-probe.golden b/command/connect/envoy/testdata/envoy-readiness-probe.golden index 444528e8808e..799d93afb0ec 100644 --- a/command/connect/envoy/testdata/envoy-readiness-probe.golden +++ b/command/connect/envoy/testdata/envoy-readiness-probe.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index a8ba4704f5e3..22680a5eb78e 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index e246dbb324eb..b82331d4e765 100644 --- a/command/connect/envoy/testdata/existing-ca-path.golden +++ b/command/connect/envoy/testdata/existing-ca-path.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 038e65d8d9fb..84306e6ce715 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 14b8f0820500..84dcb8081c7c 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index ab87aa9b438f..303950c696db 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index ab87aa9b438f..303950c696db 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden index 89764c310a47..118a98d1167c 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix-with-tls.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index eb8841ae993f..41e515b69d01 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/grpc-tls-addr-config.golden b/command/connect/envoy/testdata/grpc-tls-addr-config.golden index e79cf0455d2b..1de20dd5d215 100644 --- a/command/connect/envoy/testdata/grpc-tls-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-tls-addr-config.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/hcp-metrics.golden b/command/connect/envoy/testdata/hcp-metrics.golden index 563d662e4436..dbae64eecf67 100644 --- a/command/connect/envoy/testdata/hcp-metrics.golden +++ b/command/connect/envoy/testdata/hcp-metrics.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index cc2e504eaf95..ecbf44d3fa70 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -12,6 +12,7 @@ "cluster": "ingress-gateway", "id": "ingress-gateway", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden index cddaa490dd2c..d0a9bfe53945 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -12,6 +12,7 @@ "cluster": "ingress-gateway", "id": "ingress-gateway", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden index d79739ed7280..484d926982ff 100644 --- a/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden +++ b/command/connect/envoy/testdata/ingress-gateway-nodemeta.golden @@ -13,6 +13,7 @@ "id": "ingress-gateway-1", "metadata": { "node_name": "test-node", + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden index 3149fc4b33a5..72b6bdae73ae 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden @@ -12,6 +12,7 @@ "cluster": "my-gateway-123", "id": "my-gateway-123", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden index f8eb44754117..a2dd34310f6f 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden @@ -12,6 +12,7 @@ "cluster": "my-gateway", "id": "my-gateway", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index c4fba520ed99..102a1dfaaeb3 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -12,6 +12,7 @@ "cluster": "ingress-gateway-1", "id": "ingress-gateway-1", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden index 71b82250e30d..077745bf5333 100644 --- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden +++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-file.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden index 07e56ae878a7..f1683a870a49 100644 --- a/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden +++ b/command/connect/envoy/testdata/prometheus-metrics-tls-ca-path.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden index 5adc8a9485ee..4276c54ca563 100644 --- a/command/connect/envoy/testdata/prometheus-metrics.golden +++ b/command/connect/envoy/testdata/prometheus-metrics.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index d2a2371f20ea..0409b321b8e8 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index ac057e9a60b1..7f83eff98424 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index ac057e9a60b1..7f83eff98424 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index ac057e9a60b1..7f83eff98424 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index ac057e9a60b1..7f83eff98424 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/xds-addr-config.golden b/command/connect/envoy/testdata/xds-addr-config.golden index ab87aa9b438f..303950c696db 100644 --- a/command/connect/envoy/testdata/xds-addr-config.golden +++ b/command/connect/envoy/testdata/xds-addr-config.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" } diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index fd52f5ae3f57..7fa56c330157 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -12,6 +12,7 @@ "cluster": "test", "id": "test-proxy", "metadata": { + "node_id": "7cbef9fc-4fb1-4c84-b100-689db9755449", "namespace": "default", "partition": "default" }