diff --git a/.changelog/10404.txt b/.changelog/10404.txt new file mode 100644 index 000000000000..864dc7e1f925 --- /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. +``` + diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 1cd54b3426e9..91f4cf61b9f1 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, } @@ -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, @@ -1133,13 +1131,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/ingress-http-multiple-services.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden index 433441cbc9f5..0ee1474c75aa 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 6603e29677d7..c590ced850ca 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 aa2eec5b7993..9cd2d22219af 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 ea9410a0819d..171fb1bff592 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": { 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 5ac6746c1501..31db7b51b0a1 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 11e4fb3763e0..3568280939a3 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 69b0b6d43582..a069ee434672 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 3d86ab50b389..59821616f9fa 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 882d1f54055e..2515ef21eff6 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 803233d6d5ff..89b07f226506 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 098b015ede09..4351d8f21625 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 aca6d44eaaaa..ac33bab98486 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" } }