github
/
consul
mirror of https://github.com/hashicorp/consul
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Add namespace support for metrics (OSS) (#9117)" (#9124) 

This reverts commit 06b3b017d3.
pull/9125/head
R.B. Boyer 2020-11-06 10:24:32 -06:00 committed by GitHub
parent cf537ac2f5
commit 8baf158ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
215 changed files with 707 additions and 2254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/9117.txt
View File

@ -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.
```

54
agent/xds/listeners.go
View File

@ -976,58 +976,38 @@ func (s *Server) makeUpstreamListenerForDiscoveryChain(
} }
useRDS := true useRDS := true
var ( clusterName := ""
clusterName string
destination, datacenter, namespace string
)
if chain == nil || chain.IsDefault() { if chain == nil || chain.IsDefault() {
useRDS = false
dc := u.Datacenter dc := u.Datacenter
if dc == "" { if dc == "" {
dc = cfgSnap.Datacenter dc = cfgSnap.Datacenter
} }
destination, datacenter, namespace = u.DestinationName, dc, u.DestinationNamespace
sni := connect.UpstreamSNI(u, "", dc, cfgSnap.Roots.TrustDomain) sni := connect.UpstreamSNI(u, "", dc, cfgSnap.Roots.TrustDomain)
useRDS = false
clusterName = CustomizeClusterName(sni, chain) clusterName = CustomizeClusterName(sni, chain)
} else { } else if cfg.Protocol == "tcp" {
destination, datacenter, namespace = chain.ServiceName, chain.Datacenter, chain.Namespace startNode := chain.Nodes[chain.StartNode]
if startNode == nil {
if cfg.Protocol == "tcp" { return nil, fmt.Errorf("missing first node in compiled discovery chain for: %s", chain.ServiceName)
useRDS = false } else if startNode.Type != structs.DiscoveryGraphNodeTypeResolver {
return nil, fmt.Errorf("unexpected first node in discovery chain using protocol=%q: %s", cfg.Protocol, startNode.Type)
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)
} }
} targetID := startNode.Resolver.Target
filterName := fmt.Sprintf("%s.%s", destination, datacenter) target := chain.Targets[targetID]
if namespace != "" {
filterName += fmt.Sprintf(".%s", namespace) useRDS = false
} clusterName = CustomizeClusterName(target.Name, chain)
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
} }
opts := listenerFilterOpts{ opts := listenerFilterOpts{
useRDS: useRDS, useRDS: useRDS,
protocol: cfg.Protocol, protocol: cfg.Protocol,
filterName: filterName, filterName: upstreamID,
routeName: upstreamID, routeName: upstreamID,
cluster: clusterName, cluster: clusterName,
statPrefix: "upstream.", statPrefix: "upstream_",
routePath: "", routePath: "",
ingress: false, ingress: false,
httpAuthzFilter: nil, 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 // 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 // clusters but doesn't in the stat prefix here while dashboards assume they
// will match. // 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) { func makeHTTPFilter(opts listenerFilterOpts) (*envoylistener.Filter, error) {

6
agent/xds/listeners_test.go
View File

@ -577,7 +577,7 @@ func expectListenerJSONResources(t *testing.T, snap *proxycfg.ConfigSnapshot) ma
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-13-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-14-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-13-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-14-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden vendored
View File

@ -35,7 +35,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.grpc", "stat_prefix": "upstream_db_grpc",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -63,7 +63,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-13-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -56,7 +56,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-14-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -56,7 +56,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -56,7 +56,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -56,7 +56,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-13-x.golden vendored
View File

@ -30,7 +30,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -58,7 +58,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-14-x.golden vendored
View File

@ -30,7 +30,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -58,7 +58,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden vendored
View File

@ -30,7 +30,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -58,7 +58,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden vendored
View File

@ -30,7 +30,7 @@
}, },
"route_config_name": "db" "route_config_name": "db"
}, },
"stat_prefix": "upstream.db.dc1.default.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -58,7 +58,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-13-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-14-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-15-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-13-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-14-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-15-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-13-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-14-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-15-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-13-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-14-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-15-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden vendored
View File

@ -95,7 +95,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-13-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-14-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-15-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden vendored
View File

@ -94,7 +94,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener.envoy-1-13-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener.envoy-1-14-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden vendored
View File

@ -71,7 +71,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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"
} }
} }
] ]

6
agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-upstream.envoy-1-13-x.golden vendored
View File

@ -40,7 +40,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-upstream.envoy-1-14-x.golden vendored
View File

@ -40,7 +40,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden vendored
View File

@ -40,7 +40,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

4
agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden vendored
View File

@ -40,7 +40,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/defaults.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/defaults.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-13-x.golden vendored
View File

@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -94,7 +94,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health2_21501.http", "stat_prefix": "exposed_path_filter_health2_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -132,7 +132,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-14-x.golden vendored
View File

@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -94,7 +94,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health2_21501.http", "stat_prefix": "exposed_path_filter_health2_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -132,7 +132,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden vendored
View File

@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -94,7 +94,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health2_21501.http", "stat_prefix": "exposed_path_filter_health2_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -132,7 +132,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden vendored
View File

@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -94,7 +94,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health2_21501.http", "stat_prefix": "exposed_path_filter_health2_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -132,7 +132,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-13-x.golden vendored
View File

@ -44,7 +44,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -96,7 +96,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -134,7 +134,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-14-x.golden vendored
View File

@ -44,7 +44,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -96,7 +96,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -134,7 +134,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden vendored
View File

@ -44,7 +44,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -96,7 +96,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -134,7 +134,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden vendored
View File

@ -44,7 +44,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501.http", "stat_prefix": "exposed_path_filter_grpchealthv1HealthCheck_21501_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -96,7 +96,7 @@
} }
] ]
}, },
"stat_prefix": "exposed_path_filter_health1_21500.http", "stat_prefix": "exposed_path_filter_health1_21500_http",
"tracing": { "tracing": {
"random_sampling": { "random_sampling": {
} }
@ -134,7 +134,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/http-public-listener.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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": { "tracing": {
"random_sampling": { "random_sampling": {
} }

6
agent/xds/testdata/listeners/http-public-listener.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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": { "tracing": {
"random_sampling": { "random_sampling": {
} }

6
agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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": { "tracing": {
"random_sampling": { "random_sampling": {
} }

6
agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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": { "tracing": {
"random_sampling": { "random_sampling": {
} }

8
agent/xds/testdata/listeners/http-upstream.envoy-1-13-x.golden vendored
View File

@ -28,7 +28,7 @@
"domains": [ "domains": [
"*" "*"
], ],
"name": "db.dc1", "name": "db",
"routes": [ "routes": [
{ {
"match": { "match": {
@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "upstream.db.dc1.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -70,7 +70,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

8
agent/xds/testdata/listeners/http-upstream.envoy-1-14-x.golden vendored
View File

@ -28,7 +28,7 @@
"domains": [ "domains": [
"*" "*"
], ],
"name": "db.dc1", "name": "db",
"routes": [ "routes": [
{ {
"match": { "match": {
@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "upstream.db.dc1.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -70,7 +70,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

8
agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden vendored
View File

@ -28,7 +28,7 @@
"domains": [ "domains": [
"*" "*"
], ],
"name": "db.dc1", "name": "db",
"routes": [ "routes": [
{ {
"match": { "match": {
@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "upstream.db.dc1.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -70,7 +70,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

8
agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden vendored
View File

@ -28,7 +28,7 @@
"domains": [ "domains": [
"*" "*"
], ],
"name": "db.dc1", "name": "db",
"routes": [ "routes": [
{ {
"match": { "match": {
@ -42,7 +42,7 @@
} }
] ]
}, },
"stat_prefix": "upstream.db.dc1.http", "stat_prefix": "upstream_db_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -70,7 +70,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "local_app", "cluster": "local_app",
"stat_prefix": "public_listener.tcp" "stat_prefix": "public_listener_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

6
agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "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", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

2
agent/xds/testdata/listeners/ingress-gateway.envoy-1-13-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

2
agent/xds/testdata/listeners/ingress-gateway.envoy-1-14-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

2
agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

2
agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden vendored
View File

@ -17,7 +17,7 @@
"name": "envoy.tcp_proxy", "name": "envoy.tcp_proxy",
"config": { "config": {
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"stat_prefix": "upstream.db.dc1.tcp" "stat_prefix": "upstream_db_tcp"
} }
} }
] ]

4
agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-13-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "443" "route_config_name": "443"
}, },
"stat_prefix": "ingress_upstream_443.http", "stat_prefix": "ingress_upstream_443_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -67,7 +67,7 @@
}, },
"route_config_name": "8080" "route_config_name": "8080"
}, },
"stat_prefix": "ingress_upstream_8080.http", "stat_prefix": "ingress_upstream_8080_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {

4
agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-14-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "443" "route_config_name": "443"
}, },
"stat_prefix": "ingress_upstream_443.http", "stat_prefix": "ingress_upstream_443_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -67,7 +67,7 @@
}, },
"route_config_name": "8080" "route_config_name": "8080"
}, },
"stat_prefix": "ingress_upstream_8080.http", "stat_prefix": "ingress_upstream_8080_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {

4
agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "443" "route_config_name": "443"
}, },
"stat_prefix": "ingress_upstream_443.http", "stat_prefix": "ingress_upstream_443_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -67,7 +67,7 @@
}, },
"route_config_name": "8080" "route_config_name": "8080"
}, },
"stat_prefix": "ingress_upstream_8080.http", "stat_prefix": "ingress_upstream_8080_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {

4
agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "443" "route_config_name": "443"
}, },
"stat_prefix": "ingress_upstream_443.http", "stat_prefix": "ingress_upstream_443_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {
@ -67,7 +67,7 @@
}, },
"route_config_name": "8080" "route_config_name": "8080"
}, },
"stat_prefix": "ingress_upstream_8080.http", "stat_prefix": "ingress_upstream_8080_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {

2
agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-13-x.golden vendored
View File

@ -28,7 +28,7 @@
}, },
"route_config_name": "9191" "route_config_name": "9191"
}, },
"stat_prefix": "ingress_upstream_9191.http", "stat_prefix": "ingress_upstream_9191_http",
"tracing": { "tracing": {
"operation_name": "EGRESS", "operation_name": "EGRESS",
"random_sampling": { "random_sampling": {

Some files were not shown because too many files have changed in this diff Show More