From 5d7188e290a6bb6f40bf8a2271d7a46695b2b51d Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 15 Jun 2021 08:12:02 -0600 Subject: [PATCH 1/6] Update terminating gateway stats labeling This change makes it so that the stat prefix for terminating gateways matches that of connect proxies. By using the structure of "upstream.svc.ns.dc" we can extract labels for the destination service, namespace, and datacenter. --- agent/xds/listeners.go | 5 ++--- ...stom-and-tagged-addresses.envoy-1-18-x.golden | 16 ++++++++-------- ...tagged-addresses.v2compat.envoy-1-16-x.golden | 16 ++++++++-------- ...ating-gateway-no-api-cert.envoy-1-18-x.golden | 6 +++--- ...eway-no-api-cert.v2compat.envoy-1-16-x.golden | 6 +++--- ...g-gateway-service-subsets.envoy-1-18-x.golden | 12 ++++++------ ...-service-subsets.v2compat.envoy-1-16-x.golden | 12 ++++++------ .../terminating-gateway.envoy-1-18-x.golden | 8 ++++---- ...minating-gateway.v2compat.envoy-1-16-x.golden | 8 ++++---- 9 files changed, 44 insertions(+), 45 deletions(-) diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 1cd54b342..e2050bf44 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -1133,13 +1133,12 @@ func (s *ResourceGenerator) makeFilterChainTerminatingGateway( // Lastly we setup the actual proxying component. For L4 this is a straight // tcp proxy. For L7 this is a very hands-off HTTP proxy just to inject an // HTTP filter to do intention checks here instead. - statPrefix := fmt.Sprintf("terminating_gateway.%s.%s.", service.NamespaceOrDefault(), service.Name) opts := listenerFilterOpts{ protocol: protocol, - filterName: listener, + filterName: fmt.Sprintf("%s.%s.%s.", service.Name, service.NamespaceOrDefault(), cfgSnap.Datacenter), routeName: cluster, // Set cluster name for route config since each will have its own cluster: cluster, - statPrefix: statPrefix, + statPrefix: "upstream.", routePath: "", } diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden index 5ac6746c1..dff56531b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.api.foo", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.foo", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.db.foo", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.web.foo", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -281,7 +281,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.api.wan", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -335,7 +335,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.wan", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -389,7 +389,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.db.wan", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -443,7 +443,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.web.wan", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden index 11e4fb376..f6d1a1ab2 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.api.foo", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.foo", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.db.foo", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.web.foo", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -281,7 +281,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.api.wan", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -335,7 +335,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.wan", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -389,7 +389,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.db.wan", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -443,7 +443,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.web.wan", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden index 69b0b6d43..856256340 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.default", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.db.default", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden index 3d86ab50b..522dbf701 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.default", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.db.default", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden index 882d1f540..0116baa90 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.api.default", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.default", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.db.default", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -184,7 +184,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "rds": { "configSource": { "ads": { @@ -255,7 +255,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "rds": { "configSource": { "ads": { @@ -326,7 +326,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden index 803233d6d..9f537846c 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.api.default", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.default", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.db.default", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -184,7 +184,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "rds": { "configSource": { "ads": { @@ -255,7 +255,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "rds": { "configSource": { "ads": { @@ -326,7 +326,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden index 098b015ed..6acb1c46d 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.api.default", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.default", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.db.default", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden index aca6d44ea..39e30e8c9 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.api.default", + "statPrefix": "upstream.api.default.dc1.", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.cache.default", + "statPrefix": "upstream.cache.default.dc1.", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.db.default", + "statPrefix": "upstream.db.default.dc1.", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "terminating_gateway.default.web.default", + "statPrefix": "upstream.web.default.dc1.", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } From 450ac4412660b5a746b0c648b03a2e9eb5dba26c Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 15 Jun 2021 08:17:23 -0600 Subject: [PATCH 2/6] Update ingress gateway stats labeling In the absence of stats_tags to handle this pattern, when we pass "ingress_upstream.$port" as the stat_prefix, Envoy splits up that prefix and makes the port a part of the metric name. For example: - stat_prefix: ingress_upstream.8080 This leads to metric names like envoy_http_8080_no_route. Changing the stat_prefix to ingress_upstream_80880 yields the expected metric names such as envoy_http_no_route. Note that we don't encode the destination's name/ns/dc in this stat_prefix because for HTTP services ingress gateways use a single filter chain. Only cluster metrics are available on a per-upstream basis. --- agent/xds/listeners.go | 2 +- .../ingress-http-multiple-services.envoy-1-18-x.golden | 4 ++-- ...ngress-http-multiple-services.v2compat.envoy-1-16-x.golden | 4 ++-- ...ngress-splitter-with-resolver-redirect.envoy-1-18-x.golden | 2 +- ...litter-with-resolver-redirect.v2compat.envoy-1-16-x.golden | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index e2050bf44..467ed8a4c 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -536,7 +536,7 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap filterName: listenerKey.RouteName(), routeName: listenerKey.RouteName(), cluster: "", - statPrefix: "ingress_upstream.", + statPrefix: "ingress_upstream_", routePath: "", httpAuthzFilter: nil, } diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden index 433441cbc..0ee1474c7 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden @@ -17,7 +17,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream.443", + "statPrefix": "ingress_upstream_443", "rds": { "configSource": { "ads": { @@ -60,7 +60,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream.8080", + "statPrefix": "ingress_upstream_8080", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden index 6603e2967..c590ced85 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream.443", + "statPrefix": "ingress_upstream_443", "rds": { "configSource": { "ads": { @@ -60,7 +60,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream.8080", + "statPrefix": "ingress_upstream_8080", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden index aa2eec5b7..9cd2d2221 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden @@ -17,7 +17,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream.9191", + "statPrefix": "ingress_upstream_9191", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden index ea9410a08..171fb1bff 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream.9191", + "statPrefix": "ingress_upstream_9191", "rds": { "configSource": { "ads": { From e07542211a81cccb459785c966ed88a084f1a5bf Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 15 Jun 2021 11:19:45 -0600 Subject: [PATCH 3/6] Remove unused param --- agent/xds/listeners.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 467ed8a4c..c05416e5c 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -1033,7 +1033,6 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener( clusterChain, err := s.makeFilterChainTerminatingGateway( cfgSnap, - name, clusterName, svc, intentions, @@ -1052,7 +1051,6 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener( subsetClusterChain, err := s.makeFilterChainTerminatingGateway( cfgSnap, - name, subsetClusterName, svc, intentions, @@ -1095,7 +1093,7 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener( func (s *ResourceGenerator) makeFilterChainTerminatingGateway( cfgSnap *proxycfg.ConfigSnapshot, - listener, cluster string, + cluster string, service structs.ServiceName, intentions structs.Intentions, protocol string, From 0d05cbb1055507076f7fb7311c477cd632117da2 Mon Sep 17 00:00:00 2001 From: Freddy Date: Tue, 15 Jun 2021 14:09:26 -0600 Subject: [PATCH 4/6] Update agent/xds/listeners.go Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> --- agent/xds/listeners.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index c05416e5c..91f4cf61b 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -1133,7 +1133,7 @@ func (s *ResourceGenerator) makeFilterChainTerminatingGateway( // HTTP filter to do intention checks here instead. opts := listenerFilterOpts{ protocol: protocol, - filterName: fmt.Sprintf("%s.%s.%s.", service.Name, service.NamespaceOrDefault(), cfgSnap.Datacenter), + filterName: fmt.Sprintf("%s.%s.%s", service.Name, service.NamespaceOrDefault(), cfgSnap.Datacenter), routeName: cluster, // Set cluster name for route config since each will have its own cluster: cluster, statPrefix: "upstream.", From 62353557c08be43e2b8524dc6bd4f6b1ded980dc Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 15 Jun 2021 14:15:30 -0600 Subject: [PATCH 5/6] Add changelog entry --- .changelog/10404.txt | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .changelog/10404.txt diff --git a/.changelog/10404.txt b/.changelog/10404.txt new file mode 100644 index 000000000..864dc7e1f --- /dev/null +++ b/.changelog/10404.txt @@ -0,0 +1,8 @@ +```release-note:feature +connect: generate upstream service labels for terminating gateway listener stats. +``` + +```release-note:breaking-change +connect: avoid encoding listener info in ingress and terminating gateway listener stats names. +``` + From bdb3af918c2713e70985f5499e8b89f15b959bf9 Mon Sep 17 00:00:00 2001 From: freddygv Date: Tue, 15 Jun 2021 14:18:25 -0600 Subject: [PATCH 6/6] Regen golden files --- ...stom-and-tagged-addresses.envoy-1-18-x.golden | 16 ++++++++-------- ...tagged-addresses.v2compat.envoy-1-16-x.golden | 16 ++++++++-------- ...ating-gateway-no-api-cert.envoy-1-18-x.golden | 6 +++--- ...eway-no-api-cert.v2compat.envoy-1-16-x.golden | 6 +++--- ...g-gateway-service-subsets.envoy-1-18-x.golden | 12 ++++++------ ...-service-subsets.v2compat.envoy-1-16-x.golden | 12 ++++++------ .../terminating-gateway.envoy-1-18-x.golden | 8 ++++---- ...minating-gateway.v2compat.envoy-1-16-x.golden | 8 ++++---- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden index dff56531b..31db7b51b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -281,7 +281,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -335,7 +335,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -389,7 +389,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -443,7 +443,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden index f6d1a1ab2..356828093 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -281,7 +281,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -335,7 +335,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -389,7 +389,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -443,7 +443,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden index 856256340..a069ee434 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden index 522dbf701..59821616f 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden index 0116baa90..2515ef21e 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -184,7 +184,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -255,7 +255,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -326,7 +326,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden index 9f537846c..89b07f226 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -184,7 +184,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -255,7 +255,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { @@ -326,7 +326,7 @@ "name": "envoy.filters.network.http_connection_manager", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "rds": { "configSource": { "ads": { diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden index 6acb1c46d..4351d8f21 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } diff --git a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden index 39e30e8c9..ac33bab98 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden @@ -32,7 +32,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.api.default.dc1.", + "statPrefix": "upstream.api.default.dc1", "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -86,7 +86,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.cache.default.dc1.", + "statPrefix": "upstream.cache.default.dc1", "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -140,7 +140,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1.", + "statPrefix": "upstream.db.default.dc1", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } } @@ -194,7 +194,7 @@ "name": "envoy.filters.network.tcp_proxy", "typedConfig": { "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.web.default.dc1.", + "statPrefix": "upstream.web.default.dc1", "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" } }