diff --git a/.changelog/9117.txt b/.changelog/9117.txt deleted file mode 100644 index e3e0091bda..0000000000 --- a/.changelog/9117.txt +++ /dev/null @@ -1,3 +0,0 @@ -```release-note:breaking-change -connect: Update Envoy metrics names and labels for Connect proxy listeners so that attributes like datacenter and namespace can be extracted. -``` \ No newline at end of file diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 931a25a974..64ea872680 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -976,58 +976,38 @@ func (s *Server) makeUpstreamListenerForDiscoveryChain( } useRDS := true - var ( - clusterName string - destination, datacenter, namespace string - ) + clusterName := "" if chain == nil || chain.IsDefault() { - useRDS = false - dc := u.Datacenter if dc == "" { dc = cfgSnap.Datacenter } - destination, datacenter, namespace = u.DestinationName, dc, u.DestinationNamespace - sni := connect.UpstreamSNI(u, "", dc, cfgSnap.Roots.TrustDomain) + + useRDS = false clusterName = CustomizeClusterName(sni, chain) - } else { - destination, datacenter, namespace = chain.ServiceName, chain.Datacenter, chain.Namespace - - if cfg.Protocol == "tcp" { - useRDS = false - - startNode := chain.Nodes[chain.StartNode] - if startNode == nil { - return nil, fmt.Errorf("missing first node in compiled discovery chain for: %s", chain.ServiceName) - } - if startNode.Type != structs.DiscoveryGraphNodeTypeResolver { - return nil, fmt.Errorf("unexpected first node in discovery chain using protocol=%q: %s", cfg.Protocol, startNode.Type) - } - targetID := startNode.Resolver.Target - target := chain.Targets[targetID] - - clusterName = CustomizeClusterName(target.Name, chain) + } else if cfg.Protocol == "tcp" { + startNode := chain.Nodes[chain.StartNode] + if startNode == nil { + return nil, fmt.Errorf("missing first node in compiled discovery chain for: %s", chain.ServiceName) + } else if startNode.Type != structs.DiscoveryGraphNodeTypeResolver { + return nil, fmt.Errorf("unexpected first node in discovery chain using protocol=%q: %s", cfg.Protocol, startNode.Type) } - } - filterName := fmt.Sprintf("%s.%s", destination, datacenter) - if namespace != "" { - filterName += fmt.Sprintf(".%s", namespace) - } - if u.DestinationType == structs.UpstreamDestTypePreparedQuery { - // Avoid encoding dc and namespace for prepared queries. - // Those are defined in the query itself and are not available here. - filterName = upstreamID + targetID := startNode.Resolver.Target + target := chain.Targets[targetID] + + useRDS = false + clusterName = CustomizeClusterName(target.Name, chain) } opts := listenerFilterOpts{ useRDS: useRDS, protocol: cfg.Protocol, - filterName: filterName, + filterName: upstreamID, routeName: upstreamID, cluster: clusterName, - statPrefix: "upstream.", + statPrefix: "upstream_", routePath: "", ingress: false, httpAuthzFilter: nil, @@ -1150,7 +1130,7 @@ func makeStatPrefix(protocol, prefix, filterName string) string { // Replace colons here because Envoy does that in the metrics for the actual // clusters but doesn't in the stat prefix here while dashboards assume they // will match. - return fmt.Sprintf("%s%s.%s", prefix, strings.Replace(filterName, ":", "_", -1), protocol) + return fmt.Sprintf("%s%s_%s", prefix, strings.Replace(filterName, ":", "_", -1), protocol) } func makeHTTPFilter(opts listenerFilterOpts) (*envoylistener.Filter, error) { diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go index f6e1ce6b33..5b08ab6372 100644 --- a/agent/xds/listeners_test.go +++ b/agent/xds/listeners_test.go @@ -577,7 +577,7 @@ func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot) ma "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] @@ -600,7 +600,7 @@ func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot) ma "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -623,7 +623,7 @@ func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot) ma "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-13-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-13-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-14-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-14-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-13-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-14-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-13-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-13-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-14-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-14-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden index f6c5b453ba..e835edf4d1 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-13-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-13-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-14-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-14-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-13-x.golden index 8757f5baf9..11d1ddf64f 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-13-x.golden @@ -30,7 +30,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -58,7 +58,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -112,7 +112,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-14-x.golden index 8757f5baf9..11d1ddf64f 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-14-x.golden @@ -30,7 +30,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -58,7 +58,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -112,7 +112,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden index 8757f5baf9..11d1ddf64f 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden @@ -30,7 +30,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -58,7 +58,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -112,7 +112,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden index 8757f5baf9..11d1ddf64f 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden @@ -30,7 +30,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -58,7 +58,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -112,7 +112,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-13-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-13-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-14-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-14-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-13-x.golden index a695bd86b9..21137f9ebb 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-13-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-14-x.golden index a695bd86b9..21137f9ebb 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-14-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-15-x.golden index a695bd86b9..21137f9ebb 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-15-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden index a695bd86b9..21137f9ebb 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-13-x.golden index 2cd7b30fa3..301330c589 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-13-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-14-x.golden index 2cd7b30fa3..301330c589 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-14-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-15-x.golden index 2cd7b30fa3..301330c589 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-15-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden index 2cd7b30fa3..301330c589 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-13-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-13-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-14-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-14-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-15-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-15-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-13-x.golden index f779fd2957..0743cf8c84 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-13-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-14-x.golden index f779fd2957..0743cf8c84 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-14-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-15-x.golden index f779fd2957..0743cf8c84 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-15-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden index f779fd2957..0743cf8c84 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden @@ -95,7 +95,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -118,7 +118,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-13-x.golden index 3f2d902cfd..e94c7711fc 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-13-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-14-x.golden index 3f2d902cfd..e94c7711fc 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-14-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-15-x.golden index 3f2d902cfd..e94c7711fc 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-15-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden index 3f2d902cfd..e94c7711fc 100644 --- a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-13-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-13-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-14-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-14-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden index 1069b070bb..23cf9572e0 100644 --- a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden @@ -71,7 +71,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-13-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-14-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden index 4a690915b3..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-13-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-13-x.golden index 17f4229d9b..2a10b9b05d 100644 --- a/agent/xds/testdata/listeners/custom-upstream.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream.envoy-1-13-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-14-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-14-x.golden index 17f4229d9b..2a10b9b05d 100644 --- a/agent/xds/testdata/listeners/custom-upstream.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream.envoy-1-14-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden index 17f4229d9b..2a10b9b05d 100644 --- a/agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden index 17f4229d9b..2a10b9b05d 100644 --- a/agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-13-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-13-x.golden index 98039d53c0..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/defaults.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/defaults.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-14-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-14-x.golden index 98039d53c0..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/defaults.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/defaults.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden index 98039d53c0..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden index 98039d53c0..d43380ee1a 100644 --- a/agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-13-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-13-x.golden index 95a20d7648..485f366fe1 100644 --- a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-13-x.golden @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -94,7 +94,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health2_21501.http", + "stat_prefix": "exposed_path_filter_health2_21501_http", "tracing": { "random_sampling": { } @@ -132,7 +132,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-14-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-14-x.golden index 95a20d7648..485f366fe1 100644 --- a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-14-x.golden @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -94,7 +94,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health2_21501.http", + "stat_prefix": "exposed_path_filter_health2_21501_http", "tracing": { "random_sampling": { } @@ -132,7 +132,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden index 95a20d7648..485f366fe1 100644 --- a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -94,7 +94,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health2_21501.http", + "stat_prefix": "exposed_path_filter_health2_21501_http", "tracing": { "random_sampling": { } @@ -132,7 +132,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden index 95a20d7648..485f366fe1 100644 --- a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -94,7 +94,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health2_21501.http", + "stat_prefix": "exposed_path_filter_health2_21501_http", "tracing": { "random_sampling": { } @@ -132,7 +132,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-13-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-13-x.golden index 088af6c041..d16f93c993 100644 --- a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-13-x.golden @@ -44,7 +44,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", + "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http", "tracing": { "random_sampling": { } @@ -96,7 +96,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -134,7 +134,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-14-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-14-x.golden index 088af6c041..d16f93c993 100644 --- a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-14-x.golden @@ -44,7 +44,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", + "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http", "tracing": { "random_sampling": { } @@ -96,7 +96,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -134,7 +134,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden index 088af6c041..d16f93c993 100644 --- a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden @@ -44,7 +44,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", + "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http", "tracing": { "random_sampling": { } @@ -96,7 +96,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -134,7 +134,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden index 088af6c041..d16f93c993 100644 --- a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden @@ -44,7 +44,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", + "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http", "tracing": { "random_sampling": { } @@ -96,7 +96,7 @@ } ] }, - "stat_prefix": "exposed_path_filter_health1_21500.http", + "stat_prefix": "exposed_path_filter_health1_21500_http", "tracing": { "random_sampling": { } @@ -134,7 +134,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-13-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-13-x.golden index edb0fa8e91..f8eb24c538 100644 --- a/agent/xds/testdata/listeners/http-public-listener.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/http-public-listener.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -118,7 +118,7 @@ } ] }, - "stat_prefix": "public_listener.http", + "stat_prefix": "public_listener_http", "tracing": { "random_sampling": { } diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-14-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-14-x.golden index edb0fa8e91..f8eb24c538 100644 --- a/agent/xds/testdata/listeners/http-public-listener.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/http-public-listener.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -118,7 +118,7 @@ } ] }, - "stat_prefix": "public_listener.http", + "stat_prefix": "public_listener_http", "tracing": { "random_sampling": { } diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden index edb0fa8e91..f8eb24c538 100644 --- a/agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -118,7 +118,7 @@ } ] }, - "stat_prefix": "public_listener.http", + "stat_prefix": "public_listener_http", "tracing": { "random_sampling": { } diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden index edb0fa8e91..f8eb24c538 100644 --- a/agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -118,7 +118,7 @@ } ] }, - "stat_prefix": "public_listener.http", + "stat_prefix": "public_listener_http", "tracing": { "random_sampling": { } diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-13-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-13-x.golden index 768a70704c..2acb211dc5 100644 --- a/agent/xds/testdata/listeners/http-upstream.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/http-upstream.envoy-1-13-x.golden @@ -28,7 +28,7 @@ "domains": [ "*" ], - "name": "db.dc1", + "name": "db", "routes": [ { "match": { @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "upstream.db.dc1.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -70,7 +70,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -124,7 +124,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-14-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-14-x.golden index 768a70704c..2acb211dc5 100644 --- a/agent/xds/testdata/listeners/http-upstream.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/http-upstream.envoy-1-14-x.golden @@ -28,7 +28,7 @@ "domains": [ "*" ], - "name": "db.dc1", + "name": "db", "routes": [ { "match": { @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "upstream.db.dc1.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -70,7 +70,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -124,7 +124,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden index 768a70704c..2acb211dc5 100644 --- a/agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden @@ -28,7 +28,7 @@ "domains": [ "*" ], - "name": "db.dc1", + "name": "db", "routes": [ { "match": { @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "upstream.db.dc1.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -70,7 +70,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -124,7 +124,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden index 768a70704c..2acb211dc5 100644 --- a/agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden @@ -28,7 +28,7 @@ "domains": [ "*" ], - "name": "db.dc1", + "name": "db", "routes": [ { "match": { @@ -42,7 +42,7 @@ } ] }, - "stat_prefix": "upstream.db.dc1.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -70,7 +70,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -124,7 +124,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-13-x.golden index 0451ed779d..edf9167e36 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-14-x.golden index 0451ed779d..edf9167e36 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden index 0451ed779d..edf9167e36 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden index 0451ed779d..edf9167e36 100644 --- a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -63,7 +63,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-13-x.golden index 8760578ffc..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-14-x.golden index 8760578ffc..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden index 8760578ffc..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden index 8760578ffc..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-13-x.golden index 8835139f2c..637d583200 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-13-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "443" }, - "stat_prefix": "ingress_upstream_443.http", + "stat_prefix": "ingress_upstream_443_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -67,7 +67,7 @@ }, "route_config_name": "8080" }, - "stat_prefix": "ingress_upstream_8080.http", + "stat_prefix": "ingress_upstream_8080_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-14-x.golden index 8835139f2c..637d583200 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-14-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "443" }, - "stat_prefix": "ingress_upstream_443.http", + "stat_prefix": "ingress_upstream_443_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -67,7 +67,7 @@ }, "route_config_name": "8080" }, - "stat_prefix": "ingress_upstream_8080.http", + "stat_prefix": "ingress_upstream_8080_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden index 8835139f2c..637d583200 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "443" }, - "stat_prefix": "ingress_upstream_443.http", + "stat_prefix": "ingress_upstream_443_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -67,7 +67,7 @@ }, "route_config_name": "8080" }, - "stat_prefix": "ingress_upstream_8080.http", + "stat_prefix": "ingress_upstream_8080_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden index 8835139f2c..637d583200 100644 --- a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "443" }, - "stat_prefix": "ingress_upstream_443.http", + "stat_prefix": "ingress_upstream_443_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -67,7 +67,7 @@ }, "route_config_name": "8080" }, - "stat_prefix": "ingress_upstream_8080.http", + "stat_prefix": "ingress_upstream_8080_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-13-x.golden index 20d8fe8265..a6e98cd85d 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-13-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "9191" }, - "stat_prefix": "ingress_upstream_9191.http", + "stat_prefix": "ingress_upstream_9191_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-14-x.golden index 20d8fe8265..a6e98cd85d 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-14-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "9191" }, - "stat_prefix": "ingress_upstream_9191.http", + "stat_prefix": "ingress_upstream_9191_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden index 20d8fe8265..a6e98cd85d 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "9191" }, - "stat_prefix": "ingress_upstream_9191.http", + "stat_prefix": "ingress_upstream_9191_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden index 20d8fe8265..a6e98cd85d 100644 --- a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "9191" }, - "stat_prefix": "ingress_upstream_9191.http", + "stat_prefix": "ingress_upstream_9191_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-13-x.golden index b30014c1e1..a3965f01ae 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-13-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-14-x.golden index b30014c1e1..a3965f01ae 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-14-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden index b30014c1e1..a3965f01ae 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-16-x.golden index b30014c1e1..a3965f01ae 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-16-x.golden @@ -35,7 +35,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.grpc", + "stat_prefix": "upstream_db_grpc", "tracing": { "operation_name": "EGRESS", "random_sampling": { diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-13-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-14-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-16-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden index 78ed7d2983..c91167dfad 100644 --- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.default.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-13-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-13-x.golden index 7a6f7d6cd1..fcddd66348 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-13-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-14-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-14-x.golden index 7a6f7d6cd1..fcddd66348 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-14-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden index 7a6f7d6cd1..fcddd66348 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-16-x.golden index 7a6f7d6cd1..fcddd66348 100644 --- a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-16-x.golden @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-13-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-13-x.golden index cfca986776..2dbd28ccd2 100644 --- a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-14-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-14-x.golden index cfca986776..2dbd28ccd2 100644 --- a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden index cfca986776..2dbd28ccd2 100644 --- a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-16-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-16-x.golden index cfca986776..2dbd28ccd2 100644 --- a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-13-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-13-x.golden index cdceecdaec..3340f9ca1c 100644 --- a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-14-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-14-x.golden index cdceecdaec..3340f9ca1c 100644 --- a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden index cdceecdaec..3340f9ca1c 100644 --- a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-16-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-16-x.golden index cdceecdaec..3340f9ca1c 100644 --- a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-13-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-13-x.golden index 84a45537d6..ead52f0a5c 100644 --- a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-13-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-14-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-14-x.golden index 84a45537d6..ead52f0a5c 100644 --- a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-14-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden index 84a45537d6..ead52f0a5c 100644 --- a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-16-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-16-x.golden index 84a45537d6..ead52f0a5c 100644 --- a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-16-x.golden @@ -17,7 +17,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.db.dc1.tcp" + "stat_prefix": "upstream_db_tcp" } } ] @@ -40,7 +40,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -94,7 +94,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-13-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-13-x.golden index 0d229ca621..9db1af2fca 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-13-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_bar.tcp" + "stat_prefix": "mesh_gateway_local_bar_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_baz.tcp" + "stat_prefix": "mesh_gateway_local_baz_tcp" } } ] @@ -180,7 +180,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -196,7 +196,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -212,7 +212,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -226,7 +226,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] @@ -259,7 +259,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc2_tcp" } } ] @@ -275,7 +275,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc4_tcp" } } ] @@ -291,7 +291,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc6_tcp" } } ] @@ -305,7 +305,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_foo.tcp" + "stat_prefix": "mesh_gateway_local_foo_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-14-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-14-x.golden index 0d229ca621..9db1af2fca 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-14-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_bar.tcp" + "stat_prefix": "mesh_gateway_local_bar_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_baz.tcp" + "stat_prefix": "mesh_gateway_local_baz_tcp" } } ] @@ -180,7 +180,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -196,7 +196,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -212,7 +212,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -226,7 +226,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] @@ -259,7 +259,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc2_tcp" } } ] @@ -275,7 +275,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc4_tcp" } } ] @@ -291,7 +291,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc6_tcp" } } ] @@ -305,7 +305,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_foo.tcp" + "stat_prefix": "mesh_gateway_local_foo_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden index 0d229ca621..9db1af2fca 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_bar.tcp" + "stat_prefix": "mesh_gateway_local_bar_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_baz.tcp" + "stat_prefix": "mesh_gateway_local_baz_tcp" } } ] @@ -180,7 +180,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -196,7 +196,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -212,7 +212,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -226,7 +226,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] @@ -259,7 +259,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc2_tcp" } } ] @@ -275,7 +275,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc4_tcp" } } ] @@ -291,7 +291,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc6_tcp" } } ] @@ -305,7 +305,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_foo.tcp" + "stat_prefix": "mesh_gateway_local_foo_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-16-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-16-x.golden index 0d229ca621..9db1af2fca 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-16-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_bar_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_bar_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_bar.tcp" + "stat_prefix": "mesh_gateway_local_bar_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_baz_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_baz_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_baz.tcp" + "stat_prefix": "mesh_gateway_local_baz_tcp" } } ] @@ -180,7 +180,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -196,7 +196,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -212,7 +212,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -226,7 +226,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] @@ -259,7 +259,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc2_tcp" } } ] @@ -275,7 +275,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc4_tcp" } } ] @@ -291,7 +291,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_foo_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_foo_dc6_tcp" } } ] @@ -305,7 +305,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_foo.tcp" + "stat_prefix": "mesh_gateway_local_foo_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-13-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-13-x.golden index 98d6eb8f0d..f020c5a2a1 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-13-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-14-x.golden index 98d6eb8f0d..f020c5a2a1 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-14-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden index 98d6eb8f0d..f020c5a2a1 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-16-x.golden index 98d6eb8f0d..f020c5a2a1 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-16-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-13-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-13-x.golden index 3ddf710678..ee5588e97e 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-13-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_lan.tcp" + "stat_prefix": "mesh_gateway_local_lan_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_wan.tcp" + "stat_prefix": "mesh_gateway_local_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-14-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-14-x.golden index 3ddf710678..ee5588e97e 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-14-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_lan.tcp" + "stat_prefix": "mesh_gateway_local_lan_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_wan.tcp" + "stat_prefix": "mesh_gateway_local_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden index 3ddf710678..ee5588e97e 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_lan.tcp" + "stat_prefix": "mesh_gateway_local_lan_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_wan.tcp" + "stat_prefix": "mesh_gateway_local_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-16-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-16-x.golden index 3ddf710678..ee5588e97e 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-16-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_lan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_lan_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_lan.tcp" + "stat_prefix": "mesh_gateway_local_lan_tcp" } } ] @@ -101,7 +101,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc2_tcp" } } ] @@ -117,7 +117,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc4_tcp" } } ] @@ -133,7 +133,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_wan_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_wan_dc6_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_wan.tcp" + "stat_prefix": "mesh_gateway_local_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-13-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-13-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-13-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-14-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-14-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-14-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-16-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-16-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-16-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-13-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-13-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-14-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-14-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-16-x.golden index 9a249037a8..e2250d535b 100644 --- a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-16-x.golden @@ -22,7 +22,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc2.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc2.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc2_tcp" } } ] @@ -38,7 +38,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc4.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc4.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc4_tcp" } } ] @@ -54,7 +54,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "dc6.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "mesh_gateway_remote_default_dc6.tcp" + "stat_prefix": "mesh_gateway_remote_default_dc6_tcp" } } ] @@ -68,7 +68,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "mesh_gateway_local_default.tcp" + "stat_prefix": "mesh_gateway_local_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-13-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-13-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-13-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-14-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-14-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-14-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-16-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-16-x.golden index a3c66e45aa..a2ecc48cd9 100644 --- a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-16-x.golden @@ -28,7 +28,7 @@ }, "route_config_name": "db" }, - "stat_prefix": "upstream.db.dc1.default.http", + "stat_prefix": "upstream_db_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -56,7 +56,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "upstream.prepared_query_geo-cache.tcp" + "stat_prefix": "upstream_prepared_query_geo-cache_tcp" } } ] @@ -110,7 +110,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "local_app", - "stat_prefix": "public_listener.tcp" + "stat_prefix": "public_listener_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-13-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-13-x.golden index 7a05d8a81f..0164fc6359 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-13-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_foo.tcp" + "stat_prefix": "terminating_gateway_default_api_foo_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_foo.tcp" + "stat_prefix": "terminating_gateway_default_cache_foo_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_foo.tcp" + "stat_prefix": "terminating_gateway_default_db_foo_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_foo.tcp" + "stat_prefix": "terminating_gateway_default_web_foo_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_foo.tcp" + "stat_prefix": "terminating_gateway_foo_tcp" } } ] @@ -272,7 +272,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_wan.tcp" + "stat_prefix": "terminating_gateway_default_api_wan_tcp" } } ] @@ -319,7 +319,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_wan.tcp" + "stat_prefix": "terminating_gateway_default_cache_wan_tcp" } } ] @@ -366,7 +366,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_wan.tcp" + "stat_prefix": "terminating_gateway_default_db_wan_tcp" } } ] @@ -413,7 +413,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_wan.tcp" + "stat_prefix": "terminating_gateway_default_web_wan_tcp" } } ] @@ -427,7 +427,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_wan.tcp" + "stat_prefix": "terminating_gateway_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-14-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-14-x.golden index 7a05d8a81f..0164fc6359 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-14-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_foo.tcp" + "stat_prefix": "terminating_gateway_default_api_foo_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_foo.tcp" + "stat_prefix": "terminating_gateway_default_cache_foo_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_foo.tcp" + "stat_prefix": "terminating_gateway_default_db_foo_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_foo.tcp" + "stat_prefix": "terminating_gateway_default_web_foo_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_foo.tcp" + "stat_prefix": "terminating_gateway_foo_tcp" } } ] @@ -272,7 +272,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_wan.tcp" + "stat_prefix": "terminating_gateway_default_api_wan_tcp" } } ] @@ -319,7 +319,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_wan.tcp" + "stat_prefix": "terminating_gateway_default_cache_wan_tcp" } } ] @@ -366,7 +366,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_wan.tcp" + "stat_prefix": "terminating_gateway_default_db_wan_tcp" } } ] @@ -413,7 +413,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_wan.tcp" + "stat_prefix": "terminating_gateway_default_web_wan_tcp" } } ] @@ -427,7 +427,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_wan.tcp" + "stat_prefix": "terminating_gateway_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden index 7a05d8a81f..0164fc6359 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_foo.tcp" + "stat_prefix": "terminating_gateway_default_api_foo_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_foo.tcp" + "stat_prefix": "terminating_gateway_default_cache_foo_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_foo.tcp" + "stat_prefix": "terminating_gateway_default_db_foo_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_foo.tcp" + "stat_prefix": "terminating_gateway_default_web_foo_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_foo.tcp" + "stat_prefix": "terminating_gateway_foo_tcp" } } ] @@ -272,7 +272,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_wan.tcp" + "stat_prefix": "terminating_gateway_default_api_wan_tcp" } } ] @@ -319,7 +319,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_wan.tcp" + "stat_prefix": "terminating_gateway_default_cache_wan_tcp" } } ] @@ -366,7 +366,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_wan.tcp" + "stat_prefix": "terminating_gateway_default_db_wan_tcp" } } ] @@ -413,7 +413,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_wan.tcp" + "stat_prefix": "terminating_gateway_default_web_wan_tcp" } } ] @@ -427,7 +427,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_wan.tcp" + "stat_prefix": "terminating_gateway_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden index 7a05d8a81f..0164fc6359 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_foo.tcp" + "stat_prefix": "terminating_gateway_default_api_foo_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_foo.tcp" + "stat_prefix": "terminating_gateway_default_cache_foo_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_foo.tcp" + "stat_prefix": "terminating_gateway_default_db_foo_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_foo.tcp" + "stat_prefix": "terminating_gateway_default_web_foo_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_foo.tcp" + "stat_prefix": "terminating_gateway_foo_tcp" } } ] @@ -272,7 +272,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_wan.tcp" + "stat_prefix": "terminating_gateway_default_api_wan_tcp" } } ] @@ -319,7 +319,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_wan.tcp" + "stat_prefix": "terminating_gateway_default_cache_wan_tcp" } } ] @@ -366,7 +366,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_wan.tcp" + "stat_prefix": "terminating_gateway_default_db_wan_tcp" } } ] @@ -413,7 +413,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_wan.tcp" + "stat_prefix": "terminating_gateway_default_web_wan_tcp" } } ] @@ -427,7 +427,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_wan.tcp" + "stat_prefix": "terminating_gateway_wan_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-13-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-13-x.golden index 4ef421de97..bfb7ab050a 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-13-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -161,7 +161,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-14-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-14-x.golden index 4ef421de97..bfb7ab050a 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-14-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -161,7 +161,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden index 4ef421de97..bfb7ab050a 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -161,7 +161,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-16-x.golden index 4ef421de97..bfb7ab050a 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-16-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -161,7 +161,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-13-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-13-x.golden index fde4b34e84..47c7d163a6 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-13-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-14-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-14-x.golden index fde4b34e84..47c7d163a6 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-14-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden index fde4b34e84..47c7d163a6 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-16-x.golden index fde4b34e84..47c7d163a6 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-16-x.golden @@ -20,7 +20,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-13-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-13-x.golden index 974336f3f9..9947e4838b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-13-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -204,7 +204,7 @@ }, "route_config_name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -266,7 +266,7 @@ }, "route_config_name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -328,7 +328,7 @@ }, "route_config_name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -347,7 +347,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-14-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-14-x.golden index 974336f3f9..9947e4838b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-14-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -204,7 +204,7 @@ }, "route_config_name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -266,7 +266,7 @@ }, "route_config_name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -328,7 +328,7 @@ }, "route_config_name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -347,7 +347,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden index 974336f3f9..9947e4838b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -204,7 +204,7 @@ }, "route_config_name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -266,7 +266,7 @@ }, "route_config_name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -328,7 +328,7 @@ }, "route_config_name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -347,7 +347,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-16-x.golden index 974336f3f9..9947e4838b 100644 --- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-16-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -204,7 +204,7 @@ }, "route_config_name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -266,7 +266,7 @@ }, "route_config_name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -328,7 +328,7 @@ }, "route_config_name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" }, - "stat_prefix": "terminating_gateway_default_web_default.http", + "stat_prefix": "terminating_gateway_default_web_default_http", "tracing": { "operation_name": "EGRESS", "random_sampling": { @@ -347,7 +347,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-13-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-13-x.golden index 24c9fb3cfe..eba577e6ce 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-13-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-13-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-14-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-14-x.golden index 24c9fb3cfe..eba577e6ce 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-14-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-14-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden index 24c9fb3cfe..eba577e6ce 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-16-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-16-x.golden index 24c9fb3cfe..eba577e6ce 100644 --- a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-16-x.golden +++ b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-16-x.golden @@ -53,7 +53,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_api_default.tcp" + "stat_prefix": "terminating_gateway_default_api_default_tcp" } } ] @@ -100,7 +100,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_cache_default.tcp" + "stat_prefix": "terminating_gateway_default_cache_default_tcp" } } ] @@ -147,7 +147,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_db_default.tcp" + "stat_prefix": "terminating_gateway_default_db_default_tcp" } } ] @@ -194,7 +194,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", - "stat_prefix": "terminating_gateway_default_web_default.tcp" + "stat_prefix": "terminating_gateway_default_web_default_tcp" } } ] @@ -208,7 +208,7 @@ "name": "envoy.tcp_proxy", "config": { "cluster": "", - "stat_prefix": "terminating_gateway_default.tcp" + "stat_prefix": "terminating_gateway_default_tcp" } } ] diff --git a/api/api.go b/api/api.go index a64121104b..38a4e98fbd 100644 --- a/api/api.go +++ b/api/api.go @@ -305,7 +305,7 @@ type Config struct { TokenFile string // Namespace is the name of the namespace to send along for the request - // when no other Namespace is present in the QueryOptions + // when no other Namespace ispresent in the QueryOptions Namespace string TLSConfig TLSConfig diff --git a/command/connect/envoy/bootstrap_config.go b/command/connect/envoy/bootstrap_config.go index 666f0c5009..f2d696e216 100644 --- a/command/connect/envoy/bootstrap_config.go +++ b/command/connect/envoy/bootstrap_config.go @@ -157,8 +157,8 @@ func (c *BootstrapConfig) Template() string { return bootstrapTemplate } -func (c *BootstrapConfig) GenerateJSON(args *BootstrapTplArgs, omitDeprecatedTags bool) ([]byte, error) { - if err := c.ConfigureArgs(args, omitDeprecatedTags); err != nil { +func (c *BootstrapConfig) GenerateJSON(args *BootstrapTplArgs) ([]byte, error) { + if err := c.ConfigureArgs(args); err != nil { return nil, err } t, err := template.New("bootstrap").Parse(c.Template()) @@ -182,7 +182,7 @@ func (c *BootstrapConfig) GenerateJSON(args *BootstrapTplArgs, omitDeprecatedTag // ConfigureArgs takes the basic template arguments generated from the command // arguments and environment and modifies them according to the BootstrapConfig. -func (c *BootstrapConfig) ConfigureArgs(args *BootstrapTplArgs, omitDeprecatedTags bool) error { +func (c *BootstrapConfig) ConfigureArgs(args *BootstrapTplArgs) error { // Attempt to setup sink(s) from high-level config. Note the args are passed // by ref and modified in place. @@ -196,7 +196,7 @@ func (c *BootstrapConfig) ConfigureArgs(args *BootstrapTplArgs, omitDeprecatedTa } else { // Attempt to setup tags from high-level config. Note the args are passed by // ref and modified in place. - if err := c.generateStatsConfig(args, omitDeprecatedTags); err != nil { + if err := c.generateStatsConfig(args); err != nil { return err } } @@ -305,85 +305,36 @@ func (c *BootstrapConfig) generateStatsSinkJSON(name string, addr string) (strin }`, nil } -// consulTagSpecifiers returns patterns used to generate tags from cluster metric names. -func consulTagSpecifiers(omitDeprecatedTags bool) ([]string, error) { +var sniTagJSONs []string + +func init() { + // ......consul + // - cluster.pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 + // - cluster.f8f8f8f8~pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 + // - cluster.v2.pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 + // - cluster.f8f8f8f8~v2.pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 + const PART = `[^.]+` rules := [][]string{ - // Cluster metrics are prefixed by consul.destination - // - // Cluster metric name format: - // ......consul - // - // Examples: - // - cluster.pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 - // - cluster.f8f8f8f8~pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 - // - cluster.v2.pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 - // - cluster.f8f8f8f8~v2.pong.default.dc2.internal.e5b08d03-bfc3-c870-1833-baddb116e648.consul.bind_errors: 0 - {"consul.destination.custom_hash", - `^cluster\.((?:([^.]+)~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.destination.service_subset", - `^cluster\.((?:[^.]+~)?(?:([^.]+)\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.destination.service", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?([^.]+)\.[^.]+\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.destination.namespace", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.([^.]+)\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.destination.datacenter", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.([^.]+)\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.destination.routing_type", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.([^.]+)\.[^.]+\.consul\.)`}, - {"consul.destination.trust_domain", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.([^.]+)\.consul\.)`}, - {"consul.destination.target", - `^cluster\.(((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+)\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.destination.full_target", - `^cluster\.(((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.[^.]+)\.consul\.)`}, - - // Upstream listener metrics are prefixed by consul.upstream - // - // Listener metric name format: - // upstream.... - // - // Examples: - // - tcp.upstream.db.dc1.tcp.downstream_cx_total: 0 - // - http.upstream.web.dc1.default.http.downstream_cx_total: 0 - {"consul.upstream.service", - `^(?:tcp|http)\.upstream\.(([^.]+)\.[^.]+\.(?:[^.]+\.)?[^.]+\.)`}, - {"consul.upstream.datacenter", - `^(?:tcp|http)\.upstream\.([^.]+\.([^.]+)\.(?:[^.]+\.)?[^.]+\.)`}, - {"consul.upstream.namespace", - `^(?:tcp|http)\.upstream\.([^.]+\.[^.]+\.((?:[^.]+\.))?[^.]+\.)`}, - {"consul.upstream.protocol", - `^(?:tcp|http)\.upstream\.([^.]+\.[^.]+\.(?:[^.]+\.)?([^.]+)\.)`}, - {"consul.upstream.full_target", - `^(?:tcp|http)\.upstream\.(([^.]+\.[^.]+\.(?:[^.]+\.)?[^.]+)\.)`}, + {"consul.custom_hash", + fmt.Sprintf(`^cluster\.((?:(%s)~)?(?:%s\.)?%s\.%s\.%s\.%s\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.service_subset", + fmt.Sprintf(`^cluster\.((?:%s~)?(?:(%s)\.)?%s\.%s\.%s\.%s\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.service", + fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?(%s)\.%s\.%s\.%s\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.namespace", + fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.(%s)\.%s\.%s\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.datacenter", + fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.(%s)\.%s\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.routing_type", + fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.%s\.(%s)\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, // internal:true/false would be idea + {"consul.trust_domain", + fmt.Sprintf(`^cluster\.((?:%s~)?(?:%s\.)?%s\.%s\.%s\.%s\.(%s)\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.target", + fmt.Sprintf(`^cluster\.(((?:%s~)?(?:%s\.)?%s\.%s\.%s)\.%s\.%s\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, + {"consul.full_target", + fmt.Sprintf(`^cluster\.(((?:%s~)?(?:%s\.)?%s\.%s\.%s\.%s\.%s)\.consul\.)`, PART, PART, PART, PART, PART, PART, PART)}, } - // These tags were deprecated in Consul 1.9.0 - // We are leaving them enabled by default for backwards compatibility - if !omitDeprecatedTags { - deprecatedRules := [][]string{ - {"consul.custom_hash", - `^cluster\.((?:([^.]+)~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.service_subset", - `^cluster\.((?:[^.]+~)?(?:([^.]+)\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.service", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?([^.]+)\.[^.]+\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.namespace", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.([^.]+)\.[^.]+\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.datacenter", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.([^.]+)\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.routing_type", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.([^.]+)\.[^.]+\.consul\.)`}, // internal:true/false would be idea - {"consul.trust_domain", - `^cluster\.((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.([^.]+)\.consul\.)`}, - {"consul.target", - `^cluster\.(((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+)\.[^.]+\.[^.]+\.consul\.)`}, - {"consul.full_target", - `^cluster\.(((?:[^.]+~)?(?:[^.]+\.)?[^.]+\.[^.]+\.[^.]+\.[^.]+\.[^.]+)\.consul\.)`}, - } - rules = append(rules, deprecatedRules...) - } - - var tags []string for _, rule := range rules { m := map[string]string{ "tag_name": rule[0], @@ -391,50 +342,22 @@ func consulTagSpecifiers(omitDeprecatedTags bool) ([]string, error) { } d, err := json.Marshal(m) if err != nil { - return nil, err + panic("error pregenerating SNI envoy tags: " + err.Error()) } - tags = append(tags, string(d)) + sniTagJSONs = append(sniTagJSONs, string(d)) } - return tags, nil } -func (c *BootstrapConfig) generateStatsConfig(args *BootstrapTplArgs, omitDeprecatedTags bool) error { +func (c *BootstrapConfig) generateStatsConfig(args *BootstrapTplArgs) error { var tagJSONs []string - // Add some default tags if not already overridden. Note this is a slice not a - // map since we need ordering to be deterministic. - defaults := []struct { - name string - val string - }{ - // local_cluster is for backwards compatibility. We originally choose this - // name as it matched a few other Envoy metrics examples given in docs but - // it's a little confusing in context of setting up metrics dashboards. - { - name: "local_cluster", - val: args.ProxyCluster, - }, - { - name: "consul.source.service", - val: args.ProxySourceService, - }, - // Note that this gets stripped out later if Namespace is empty so we don't - // need it to be conditional here. - { - name: "consul.source.namespace", - val: args.Namespace, - }, + // Add some default tags if not already overridden + defaults := map[string]string{ + "local_cluster": args.ProxyCluster, } // Explode SNI portions. - customTags, err := consulTagSpecifiers(omitDeprecatedTags) - if err != nil { - return fmt.Errorf("failed to generate cluster SNI envoy tags: %v", err) - } - tagJSONs = append(tagJSONs, customTags...) - - // Track tags we are setting explicitly to exclude them from defaults - tagNames := make(map[string]struct{}) + tagJSONs = append(tagJSONs, sniTagJSONs...) for _, tag := range c.StatsTags { parts := strings.SplitN(tag, "=", 2) @@ -450,21 +373,19 @@ func (c *BootstrapConfig) generateStatsConfig(args *BootstrapTplArgs, omitDeprec "fixed_value": "` + v + `" }` tagJSONs = append(tagJSONs, tagJSON) - tagNames[k] = struct{}{} + // Remove this in case we override a default + delete(defaults, k) } - for _, kv := range defaults { - if kv.val == "" { - // Skip stuff we just didn't have data for. - continue - } - if _, ok := tagNames[kv.name]; ok { - // Skip anything already set explicitly. + for k, v := range defaults { + if v == "" { + // Skip stuff we just didn't have data for, this is only really the case + // in tests currently. continue } tagJSON := `{ - "tag_name": "` + kv.name + `", - "fixed_value": "` + kv.val + `" + "tag_name": "` + k + `", + "fixed_value": "` + v + `" }` tagJSONs = append(tagJSONs, tagJSON) } diff --git a/command/connect/envoy/bootstrap_config_test.go b/command/connect/envoy/bootstrap_config_test.go index ca0d65ffef..d6d33d13f3 100644 --- a/command/connect/envoy/bootstrap_config_test.go +++ b/command/connect/envoy/bootstrap_config_test.go @@ -197,37 +197,21 @@ const ( ) func TestBootstrapConfig_ConfigureArgs(t *testing.T) { - defaultTags, err := consulTagSpecifiers(false) - require.NoError(t, err) - - defaultTagsJSON := strings.Join(defaultTags, ",\n") + sniTagJSON := strings.Join(sniTagJSONs, ",\n") defaultStatsConfigJSON := `{ "stats_tags": [ - ` + defaultTagsJSON + ` - ], - "use_all_default_tags": true - }` - - // The updated tags exclude the ones deprecated in Consul 1.9 - updatedTags, err := consulTagSpecifiers(true) - require.NoError(t, err) - - updatedTagsJSON := strings.Join(updatedTags, ",\n") - updatedStatsConfigJSON := `{ - "stats_tags": [ - ` + updatedTagsJSON + ` + ` + sniTagJSON + ` ], "use_all_default_tags": true }` tests := []struct { - name string - input BootstrapConfig - env []string - baseArgs BootstrapTplArgs - wantArgs BootstrapTplArgs - omitDeprecatedTags bool - wantErr bool + name string + input BootstrapConfig + env []string + baseArgs BootstrapTplArgs + wantArgs BootstrapTplArgs + wantErr bool }{ { name: "defaults", @@ -419,7 +403,7 @@ func TestBootstrapConfig_ConfigureArgs(t *testing.T) { wantArgs: BootstrapTplArgs{ StatsConfigJSON: `{ "stats_tags": [ - ` + defaultTagsJSON + `, + ` + sniTagJSON + `, { "tag_name": "canary", "fixed_value": "1" @@ -639,31 +623,6 @@ func TestBootstrapConfig_ConfigureArgs(t *testing.T) { }, wantErr: false, }, - { - name: "omit-deprecated-tags", - input: BootstrapConfig{ - ReadyBindAddr: "0.0.0.0:4444", - PrometheusBindAddr: "0.0.0.0:9000", - StatsBindAddr: "0.0.0.0:9000", - }, - baseArgs: BootstrapTplArgs{ - AdminBindAddress: "127.0.0.1", - AdminBindPort: "19000", - }, - omitDeprecatedTags: true, - wantArgs: BootstrapTplArgs{ - AdminBindAddress: "127.0.0.1", - AdminBindPort: "19000", - StaticClustersJSON: expectedSelfAdminCluster, - StaticListenersJSON: strings.Join( - []string{expectedPromListener, expectedStatsListener, expectedReadyListener}, - ", ", - ), - // Should not have default stats config JSON when deprecated tags are omitted - StatsConfigJSON: updatedStatsConfigJSON, - }, - wantErr: false, - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -671,7 +630,7 @@ func TestBootstrapConfig_ConfigureArgs(t *testing.T) { defer testSetAndResetEnv(t, tt.env)() - err := tt.input.ConfigureArgs(&args, tt.omitDeprecatedTags) + err := tt.input.ConfigureArgs(&args) if tt.wantErr { require.Error(t, err) } else { diff --git a/command/connect/envoy/bootstrap_tpl.go b/command/connect/envoy/bootstrap_tpl.go index ddf4b5d115..cc093b96ea 100644 --- a/command/connect/envoy/bootstrap_tpl.go +++ b/command/connect/envoy/bootstrap_tpl.go @@ -14,12 +14,6 @@ type BootstrapTplArgs struct { // the agent to deliver the correct configuration. ProxyID string - // ProxySourceService is the Consul service name to report for this proxy - // instance's source service label. For sidecars it should be the - // Proxy.DestinationServiceName. For gateways and similar it is the service - // name of the proxy service itself. - ProxySourceService string - // AgentCAPEM is the CA to use to verify the local agent gRPC service if // TLS is enabled. AgentCAPEM string @@ -85,8 +79,8 @@ type BootstrapTplArgs struct { // See https://www.envoyproxy.io/docs/envoy/v1.9.0/api-v2/config/trace/v2/trace.proto. TracingConfigJSON string - // Namespace is the Consul Enterprise Namespace of the proxy service instance - // as registered with the Consul agent. + // Namespace is the Consul Enterprise Namespace of the proxy service instance as + // registered with the Consul agent. Namespace string // EnvoyVersion is the envoy version, which is necessary to generate the diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 5aaf22e741..67530f0ec6 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -4,7 +4,6 @@ import ( "errors" "flag" "fmt" - "io" "net" "os" "os/exec" @@ -31,10 +30,7 @@ func New(ui cli.Ui) *cmd { Ui: ui, } - c := &cmd{ - UI: ui, - directOut: os.Stdout, - } + c := &cmd{UI: ui} c.init() return c } @@ -47,9 +43,6 @@ type cmd struct { http *flags.HTTPFlags help string client *api.Client - // DirectOut defaults to os.stdout but is a property to allow capture during - // tests to have more useful output. - directOut io.Writer // flags meshGateway bool @@ -71,7 +64,6 @@ type cmd struct { deregAfterCritical string bindAddresses ServiceAddressMapValue exposeServers bool - omitDeprecatedTags bool gatewaySvcName string gatewayKind api.ServiceKind @@ -160,11 +152,6 @@ func (c *cmd) init() { c.flags.StringVar(&c.deregAfterCritical, "deregister-after-critical", "6h", "The amount of time the gateway services health check can be failing before being deregistered") - c.flags.BoolVar(&c.omitDeprecatedTags, "omit-deprecated-tags", false, - "In Consul 1.9.0 the format of metric tags for Envoy clusters was updated from consul.[service|dc|...] to "+ - "consul.destination.[service|dc|...]. The old tags were preserved for backward compatibility,"+ - "but can be disabled with this flag.") - c.http = &flags.HTTPFlags{} flags.Merge(c.flags, c.http.ClientFlags()) flags.Merge(c.flags, c.http.NamespaceFlags()) @@ -377,7 +364,7 @@ func (c *cmd) run(args []string) int { if c.bootstrap { // Just output it and we are done - c.directOut.Write(bootstrapJson) + os.Stdout.Write(bootstrapJson) return 0 } @@ -444,13 +431,10 @@ func (c *cmd) templateArgs() (*BootstrapTplArgs, error) { // know service name yet, we will after we resolve the proxy's config in a bit // and will update this then. cluster := c.proxyID - proxySourceService := "" if c.sidecarFor != "" { cluster = c.sidecarFor - proxySourceService = c.sidecarFor } else if c.gateway != "" && c.gatewaySvcName != "" { cluster = c.gatewaySvcName - proxySourceService = c.gatewaySvcName } adminAccessLogPath := c.adminAccessLogPath @@ -469,7 +453,6 @@ func (c *cmd) templateArgs() (*BootstrapTplArgs, error) { GRPC: grpcAddr, ProxyCluster: cluster, ProxyID: c.proxyID, - ProxySourceService: proxySourceService, AgentCAPEM: caPEM, AdminAccessLogPath: adminAccessLogPath, AdminBindAddress: adminBindIP.String(), @@ -500,44 +483,29 @@ func (c *cmd) generateConfig() ([]byte, error) { bsCfg.ReadyBindAddr = lanAddr } - // Fetch any customization from the registration - svc, _, err := c.client.Agent().Service(c.proxyID, nil) - if err != nil { - return nil, fmt.Errorf("failed fetch proxy config from local agent: %s", err) - } - if svc.Proxy == nil { - return nil, errors.New("service is not a Connect proxy or gateway") - } - - if svc.Proxy.DestinationServiceName != "" { - // Override cluster now we know the actual service name - args.ProxyCluster = svc.Proxy.DestinationServiceName - args.ProxySourceService = svc.Proxy.DestinationServiceName - } else { - // Set the source service name from the proxy's own registration - args.ProxySourceService = svc.Service - } - if svc.Namespace != "" { - // In most cases where namespaces are enabled this will already be set - // correctly because the http client that fetched this will need to have - // had the namespace set on it which is also how we initially populate - // this. However in the case of "default" namespace being accessed because - // there was no namespace argument, args.Namespace will be empty even - // though Namespaces are actually being used and the request was - // implicitly interpreted as "default" namespace. Overriding it here - // ensure that we always set the Namespace arg if the cluster is using - // namespaces regardless. - args.Namespace = svc.Namespace - } - if !c.disableCentralConfig { + // Fetch any customization from the registration + svc, _, err := c.client.Agent().Service(c.proxyID, nil) + if err != nil { + return nil, fmt.Errorf("failed fetch proxy config from local agent: %s", err) + } + + if svc.Proxy == nil { + return nil, errors.New("service is not a Connect proxy or gateway") + } + // Parse the bootstrap config if err := mapstructure.WeakDecode(svc.Proxy.Config, &bsCfg); err != nil { return nil, fmt.Errorf("failed parsing Proxy.Config: %s", err) } + + if svc.Proxy.DestinationServiceName != "" { + // Override cluster now we know the actual service name + args.ProxyCluster = svc.Proxy.DestinationServiceName + } } - return bsCfg.GenerateJSON(args, c.omitDeprecatedTags) + return bsCfg.GenerateJSON(args) } // TODO: make method a function diff --git a/command/connect/envoy/envoy_oss_test.go b/command/connect/envoy/envoy_oss_test.go deleted file mode 100644 index 3c519cd465..0000000000 --- a/command/connect/envoy/envoy_oss_test.go +++ /dev/null @@ -1,9 +0,0 @@ -// +build !consulent - -package envoy - -// enterpriseGenerateConfigTestCases returns enterprise-only configurations to -// test in TestGenerateConfig. -func enterpriseGenerateConfigTestCases() []generateConfigTestCase { - return nil -} diff --git a/command/connect/envoy/envoy_test.go b/command/connect/envoy/envoy_test.go index 32bd3bb23b..cab2ae9ad9 100644 --- a/command/connect/envoy/envoy_test.go +++ b/command/connect/envoy/envoy_test.go @@ -1,7 +1,6 @@ package envoy import ( - "bytes" "encoding/json" "flag" "io/ioutil" @@ -104,24 +103,21 @@ func testSetAndResetEnv(t *testing.T, env []string) func() { } } -type generateConfigTestCase struct { - Name string - Flags []string - Env []string - Files map[string]string - ProxyConfig map[string]interface{} - NamespacesEnabled bool - GRPCPort int // only used for testing custom-configured grpc port - WantArgs BootstrapTplArgs - WantErr string -} - // This tests the args we use to generate the template directly because they // encapsulate all the argument and default handling code which is where most of // the logic is. We also allow generating golden files but only for cases that // pass the test of having their template args generated as expected. func TestGenerateConfig(t *testing.T) { - cases := []generateConfigTestCase{ + cases := []struct { + Name string + Flags []string + Env []string + Files map[string]string + ProxyConfig map[string]interface{} + GRPCPort int // only used for testing custom-configured grpc port + WantArgs BootstrapTplArgs + WantErr string + }{ { Name: "no-args", Flags: []string{}, @@ -135,9 +131,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", // Note this is the gRPC port @@ -156,9 +149,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", // Note this is the gRPC port @@ -180,9 +170,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", // Note this is the gRPC port @@ -206,9 +193,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", // Note this is the gRPC port @@ -233,9 +217,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", // Note this is the gRPC port @@ -255,9 +236,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -281,9 +259,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -305,9 +280,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentSocket: "/var/run/consul.sock", }, @@ -325,9 +297,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -348,9 +317,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -371,9 +337,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -392,9 +355,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -417,9 +377,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -438,9 +395,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -485,9 +439,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -522,9 +473,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -564,9 +512,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -593,9 +538,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -652,9 +594,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -673,9 +612,6 @@ func TestGenerateConfig(t *testing.T) { EnvoyVersion: defaultEnvoyVersion, ProxyCluster: "test-proxy", ProxyID: "test-proxy", - // We don't know this til after the lookup so it will be empty in the - // initial args call we are testing here. - ProxySourceService: "", // Should resolve IP, note this might not resolve the same way // everywhere which might make this test brittle but not sure what else // to do. @@ -694,10 +630,9 @@ func TestGenerateConfig(t *testing.T) { Name: "ingress-gateway", Flags: []string{"-proxy-id", "ingress-gateway-1", "-gateway", "ingress"}, WantArgs: BootstrapTplArgs{ - EnvoyVersion: defaultEnvoyVersion, - ProxyCluster: "ingress-gateway", - ProxyID: "ingress-gateway-1", - ProxySourceService: "ingress-gateway", + EnvoyVersion: defaultEnvoyVersion, + ProxyCluster: "ingress-gateway", + ProxyID: "ingress-gateway-1", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -712,10 +647,9 @@ func TestGenerateConfig(t *testing.T) { Name: "ingress-gateway-address-specified", Flags: []string{"-proxy-id", "ingress-gateway", "-gateway", "ingress", "-address", "1.2.3.4:7777"}, WantArgs: BootstrapTplArgs{ - EnvoyVersion: defaultEnvoyVersion, - ProxyCluster: "ingress-gateway", - ProxyID: "ingress-gateway", - ProxySourceService: "ingress-gateway", + EnvoyVersion: defaultEnvoyVersion, + ProxyCluster: "ingress-gateway", + ProxyID: "ingress-gateway", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -730,10 +664,9 @@ func TestGenerateConfig(t *testing.T) { Name: "ingress-gateway-register-with-service-without-proxy-id", Flags: []string{"-gateway", "ingress", "-register", "-service", "my-gateway", "-address", "127.0.0.1:7777"}, WantArgs: BootstrapTplArgs{ - EnvoyVersion: defaultEnvoyVersion, - ProxyCluster: "my-gateway", - ProxyID: "my-gateway", - ProxySourceService: "my-gateway", + EnvoyVersion: defaultEnvoyVersion, + ProxyCluster: "my-gateway", + ProxyID: "my-gateway", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -748,10 +681,9 @@ func TestGenerateConfig(t *testing.T) { Name: "ingress-gateway-register-with-service-and-proxy-id", Flags: []string{"-gateway", "ingress", "-register", "-service", "my-gateway", "-proxy-id", "my-gateway-123", "-address", "127.0.0.1:7777"}, WantArgs: BootstrapTplArgs{ - EnvoyVersion: defaultEnvoyVersion, - ProxyCluster: "my-gateway", - ProxyID: "my-gateway-123", - ProxySourceService: "my-gateway", + EnvoyVersion: defaultEnvoyVersion, + ProxyCluster: "my-gateway", + ProxyID: "my-gateway-123", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -766,10 +698,9 @@ func TestGenerateConfig(t *testing.T) { Name: "ingress-gateway-no-auto-register", Flags: []string{"-gateway", "ingress", "-address", "127.0.0.1:7777"}, WantArgs: BootstrapTplArgs{ - EnvoyVersion: defaultEnvoyVersion, - ProxyCluster: "ingress-gateway", - ProxyID: "ingress-gateway", - ProxySourceService: "ingress-gateway", + EnvoyVersion: defaultEnvoyVersion, + ProxyCluster: "ingress-gateway", + ProxyID: "ingress-gateway", GRPC: GRPC{ AgentAddress: "127.0.0.1", AgentPort: "8502", @@ -782,8 +713,6 @@ func TestGenerateConfig(t *testing.T) { }, } - cases = append(cases, enterpriseGenerateConfigTestCases()...) - copyAndReplaceAll := func(s []string, old, new string) []string { out := make([]string, len(s)) for i, v := range s { @@ -807,7 +736,7 @@ func TestGenerateConfig(t *testing.T) { // Run a mock agent API that just always returns the proxy config in the // test. - srv := httptest.NewServer(testMockAgent(tc.ProxyConfig, tc.GRPCPort, tc.NamespacesEnabled)) + srv := httptest.NewServer(testMockAgent(tc.ProxyConfig, tc.GRPCPort)) defer srv.Close() client, err := api.NewClient(&api.Config{Address: srv.URL}) require.NoError(err) @@ -821,11 +750,6 @@ func TestGenerateConfig(t *testing.T) { // explicitly set the client to one which can connect to the httptest.Server c.client = client - var outBuf bytes.Buffer - // Capture output since it clutters test output and we can assert on what - // was actually printed this way. - c.directOut = &outBuf - // Run the command myFlags := copyAndReplaceAll(tc.Flags, "@@TEMPDIR@@", testDirPrefix) args := append([]string{"-bootstrap"}, myFlags...) @@ -846,7 +770,10 @@ func TestGenerateConfig(t *testing.T) { require.NoError(err) // Error cases should have returned above require.Equal(&tc.WantArgs, got) - actual := outBuf.Bytes() + // Actual template output goes to stdout direct to avoid prefix in UI, so + // generate it again here to assert on. + actual, err := c.generateConfig() + require.NoError(err) // If we got the arg handling write, verify output golden := filepath.Join("testdata", tc.Name+".golden") @@ -953,15 +880,15 @@ func TestEnvoy_GatewayRegistration(t *testing.T) { // testMockAgent combines testMockAgentProxyConfig and testMockAgentSelf, // routing /agent/service/... requests to testMockAgentProxyConfig and // routing /agent/self requests to testMockAgentSelf. -func testMockAgent(agentCfg map[string]interface{}, grpcPort int, namespacesEnabled bool) http.HandlerFunc { +func testMockAgent(agentCfg map[string]interface{}, grpcPort int) http.HandlerFunc { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if strings.Contains(r.URL.Path, "/agent/services") { - testMockAgentGatewayConfig(namespacesEnabled)(w, r) + testMockAgentGatewayConfig()(w, r) return } if strings.Contains(r.URL.Path, "/agent/service") { - testMockAgentProxyConfig(agentCfg, namespacesEnabled)(w, r) + testMockAgentProxyConfig(agentCfg)(w, r) return } @@ -974,7 +901,7 @@ func testMockAgent(agentCfg map[string]interface{}, grpcPort int, namespacesEnab }) } -func testMockAgentGatewayConfig(namespacesEnabled bool) http.HandlerFunc { +func testMockAgentGatewayConfig() http.HandlerFunc { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // Parse the proxy-id from the end of the URL (blindly assuming it's correct // format) @@ -997,10 +924,6 @@ func testMockAgentGatewayConfig(namespacesEnabled bool) http.HandlerFunc { }, } - if namespacesEnabled { - svc[string(kind)].Namespace = namespaceFromQuery(r) - } - cfgJSON, err := json.Marshal(svc) if err != nil { w.WriteHeader(500) @@ -1011,16 +934,7 @@ func testMockAgentGatewayConfig(namespacesEnabled bool) http.HandlerFunc { }) } -func namespaceFromQuery(r *http.Request) string { - // Use the namespace in the request if there is one, otherwise - // use-default. - if queryNs := r.URL.Query().Get("ns"); queryNs != "" { - return queryNs - } - return "default" -} - -func testMockAgentProxyConfig(cfg map[string]interface{}, namespacesEnabled bool) http.HandlerFunc { +func testMockAgentProxyConfig(cfg map[string]interface{}) http.HandlerFunc { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // Parse the proxy-id from the end of the URL (blindly assuming it's correct // format) @@ -1038,10 +952,6 @@ func testMockAgentProxyConfig(cfg map[string]interface{}, namespacesEnabled bool }, } - if namespacesEnabled { - svc.Namespace = namespaceFromQuery(r) - } - cfgJSON, err := json.Marshal(svc) if err != nil { w.WriteHeader(500) diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden index 6f94034014..a2fdad2549 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden @@ -45,62 +45,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -140,10 +84,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 33f675abca..c8d20d8900 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 98980f8e79..c577836057 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index cbc7b09a56..761fcc56c8 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -45,62 +45,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -140,10 +84,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index 68ebc12bd1..7aa2057621 100644 --- a/command/connect/envoy/testdata/existing-ca-path.golden +++ b/command/connect/envoy/testdata/existing-ca-path.golden @@ -45,62 +45,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -140,10 +84,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 74443b7c21..0b432401d5 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -58,62 +58,6 @@ ], "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -153,10 +97,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 1486a9ed19..97b0568c1e 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -49,62 +49,6 @@ ], "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -144,10 +88,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index 0edfcc3012..c438f4bf76 100644 --- a/command/connect/envoy/testdata/grpc-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-addr-config.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 0edfcc3012..c438f4bf76 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 0edfcc3012..c438f4bf76 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index a588dbe0b4..11413cf4ae 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -35,62 +35,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -130,10 +74,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index 6cc3edffb2..efb6232c33 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -109,62 +109,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -204,10 +148,6 @@ { "tag_name": "local_cluster", "fixed_value": "ingress-gateway" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "ingress-gateway" } ], "use_all_default_tags": true 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 d9af7b49b8..de1912ec98 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -109,62 +109,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -204,10 +148,6 @@ { "tag_name": "local_cluster", "fixed_value": "ingress-gateway" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "ingress-gateway" } ], "use_all_default_tags": true 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 2998b59dd3..0d1239e903 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 @@ -109,62 +109,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -204,10 +148,6 @@ { "tag_name": "local_cluster", "fixed_value": "my-gateway-123" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "my-gateway-123" } ], "use_all_default_tags": true 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 4b536479c1..93720d2b84 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 @@ -109,62 +109,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -204,10 +148,6 @@ { "tag_name": "local_cluster", "fixed_value": "my-gateway" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "my-gateway" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 386c2fa86b..ba56e634f1 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -109,62 +109,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -204,10 +148,6 @@ { "tag_name": "local_cluster", "fixed_value": "ingress-gateway-1" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "ingress-gateway-1" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index bec2816a30..62e3a58f68 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index bec2816a30..62e3a58f68 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index bec2816a30..62e3a58f68 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index bec2816a30..62e3a58f68 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -36,62 +36,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -131,10 +75,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index b3b8bf049f..811910f02a 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -60,62 +60,6 @@ }, "stats_config": { "stats_tags": [ - { - "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.custom_hash" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service_subset" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.service" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.namespace" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.datacenter" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.routing_type" - }, - { - "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)", - "tag_name": "consul.destination.trust_domain" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)", - "tag_name": "consul.destination.target" - }, - { - "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)", - "tag_name": "consul.destination.full_target" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+)\\.[^.]+\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.service" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.([^.]+)\\.(?:[^.]+\\.)?[^.]+\\.)", - "tag_name": "consul.upstream.datacenter" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.((?:[^.]+\\.))?[^.]+\\.)", - "tag_name": "consul.upstream.namespace" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.([^.]+\\.[^.]+\\.(?:[^.]+\\.)?([^.]+)\\.)", - "tag_name": "consul.upstream.protocol" - }, - { - "regex": "^(?:tcp|http)\\.upstream\\.(([^.]+\\.[^.]+\\.(?:[^.]+\\.)?[^.]+)\\.)", - "tag_name": "consul.upstream.full_target" - }, { "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)", "tag_name": "consul.custom_hash" @@ -155,10 +99,6 @@ { "tag_name": "local_cluster", "fixed_value": "test-proxy" - }, - { - "tag_name": "consul.source.service", - "fixed_value": "test-proxy" } ], "use_all_default_tags": true diff --git a/test/integration/connect/envoy/Dockerfile-bats b/test/integration/connect/envoy/Dockerfile-bats index 7fab985681..16c4c1e45d 100644 --- a/test/integration/connect/envoy/Dockerfile-bats +++ b/test/integration/connect/envoy/Dockerfile-bats @@ -1,6 +1,6 @@ -FROM hashicorp.jfrog.io/docker/fortio/fortio AS fortio +FROM docker.mirror.hashicorp.services/fortio/fortio AS fortio -FROM hashicorp.jfrog.io/docker/bats/bats:latest +FROM docker.mirror.hashicorp.services/bats/bats:latest RUN apk add curl RUN apk add openssl diff --git a/test/integration/connect/envoy/Dockerfile-consul-envoy b/test/integration/connect/envoy/Dockerfile-consul-envoy index af119df94e..b6d5b3e8e2 100644 --- a/test/integration/connect/envoy/Dockerfile-consul-envoy +++ b/test/integration/connect/envoy/Dockerfile-consul-envoy @@ -3,5 +3,5 @@ ARG ENVOY_VERSION FROM consul-dev as consul -FROM hashicorp.jfrog.io/docker/envoyproxy/envoy:v${ENVOY_VERSION} +FROM docker.mirror.hashicorp.services/envoyproxy/envoy:v${ENVOY_VERSION} COPY --from=consul /bin/consul /bin/consul diff --git a/test/integration/connect/envoy/case-centralconf/capture.sh b/test/integration/connect/envoy/case-centralconf/capture.sh deleted file mode 100644 index 7f0c582f89..0000000000 --- a/test/integration/connect/envoy/case-centralconf/capture.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -snapshot_envoy_admin localhost:19000 s1 primary || true diff --git a/test/integration/connect/envoy/case-centralconf/verify.bats b/test/integration/connect/envoy/case-centralconf/verify.bats index 0f4221ab5f..e25fe56460 100644 --- a/test/integration/connect/envoy/case-centralconf/verify.bats +++ b/test/integration/connect/envoy/case-centralconf/verify.bats @@ -42,15 +42,15 @@ load helpers # Should be labelling with local_cluster. retry_default \ must_match_in_prometheus_response localhost:1234 \ - '[\{,]consul_source_service="s1"[,}] ' + '[\{,]local_cluster="s1"[,}] ' # Ensure we have http metrics for public listener retry_default \ must_match_in_prometheus_response localhost:1234 \ - '[\{,]envoy_http_conn_manager_prefix="public_listener"[,}]' + '[\{,]envoy_http_conn_manager_prefix="public_listener_http"[,}]' # Ensure we have http metrics for s2 upstream retry_default \ must_match_in_prometheus_response localhost:1234 \ - '[\{,]consul_upstream_service="s2"[,}]' + '[\{,]envoy_http_conn_manager_prefix="upstream_s2_http"[,}]' } diff --git a/test/integration/connect/envoy/case-prometheus/capture.sh b/test/integration/connect/envoy/case-prometheus/capture.sh deleted file mode 100644 index 7f0c582f89..0000000000 --- a/test/integration/connect/envoy/case-prometheus/capture.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -snapshot_envoy_admin localhost:19000 s1 primary || true diff --git a/test/integration/connect/envoy/case-prometheus/verify.bats b/test/integration/connect/envoy/case-prometheus/verify.bats index 3d886b60bd..9c4606169d 100644 --- a/test/integration/connect/envoy/case-prometheus/verify.bats +++ b/test/integration/connect/envoy/case-prometheus/verify.bats @@ -40,13 +40,13 @@ load helpers must_match_in_prometheus_response localhost:1234 \ '^envoy_http_downstream_rq_active' - # Should be labelling with consul_source_service. + # Should be labelling with local_cluster. retry_default \ must_match_in_prometheus_response localhost:1234 \ - '[\{,]consul_source_service="s1"[,}] ' + '[\{,]local_cluster="s1"[,}] ' # Should be labelling with http listener prefix. retry_default \ must_match_in_prometheus_response localhost:1234 \ - '[\{,]envoy_http_conn_manager_prefix="public_listener"[,}]' + '[\{,]envoy_http_conn_manager_prefix="public_listener_http"[,}]' } diff --git a/test/integration/connect/envoy/case-stats-proxy/verify.bats b/test/integration/connect/envoy/case-stats-proxy/verify.bats index 55c71a989f..af89d47aaa 100644 --- a/test/integration/connect/envoy/case-stats-proxy/verify.bats +++ b/test/integration/connect/envoy/case-stats-proxy/verify.bats @@ -48,12 +48,12 @@ load helpers # Response should include the http public listener. retry_default \ must_match_in_stats_proxy_response localhost:1239 \ - 'stats' 'http.public_listener.http' + 'stats' 'http.public_listener_http' # /stats/prometheus should also be reachable and labelling the local cluster. retry_default \ must_match_in_stats_proxy_response localhost:1239 \ - 'stats/prometheus' '[\{,]consul_source_service="s1"[,}]' + 'stats/prometheus' '[\{,]local_cluster="s1"[,}]' # /stats/prometheus should also be reachable and exposing metrics. retry_default \ diff --git a/test/integration/connect/envoy/helpers.bash b/test/integration/connect/envoy/helpers.bash index acfe1c1566..7c514fb4a3 100755 --- a/test/integration/connect/envoy/helpers.bash +++ b/test/integration/connect/envoy/helpers.bash @@ -229,7 +229,6 @@ function snapshot_envoy_admin { docker_wget "$DC" "http://${HOSTPORT}/config_dump" -q -O - > "${OUTDIR}/config_dump.json" docker_wget "$DC" "http://${HOSTPORT}/clusters?format=json" -q -O - > "${OUTDIR}/clusters.json" docker_wget "$DC" "http://${HOSTPORT}/stats" -q -O - > "${OUTDIR}/stats.txt" - docker_wget "$DC" "http://${HOSTPORT}/stats/prometheus" -q -O - > "${OUTDIR}/stats_prometheus.txt" } function reset_envoy_metrics {