Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ingress/terminating gateway stats labeling #10404

Merged
merged 6 commits into from
Jun 15, 2021
+60 −55
Merged

Update ingress/terminating gateway stats labeling #10404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f8c604
Update terminating gateway stats labeling
freddygv Jun 15, 2021
0aec676
Update ingress gateway stats labeling
freddygv Jun 15, 2021
f3e4705
Remove unused param
freddygv Jun 15, 2021
0a38c8f
Update agent/xds/listeners.go
freddygv Jun 15, 2021
fb97497
Add changelog entry
freddygv Jun 15, 2021
924a5ba
Regen golden files
freddygv Jun 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changelog/10404.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
```release-note:feature
connect: generate upstream service labels for terminating gateway listener stats.
```

```release-note:breaking-change
connect: avoid encoding listener info in ingress and terminating gateway listener stats names.
```

11 changes: 4 additions & 7 deletions agent/xds/listeners.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ func (s *ResourceGenerator) makeIngressGatewayListeners(address string, cfgSnap
filterName: listenerKey.RouteName(),
routeName: listenerKey.RouteName(),
cluster: "",
statPrefix: "ingress_upstream.",
statPrefix: "ingress_upstream_",
routePath: "",
httpAuthzFilter: nil,
}
Expand Down Expand Up @@ -1033,7 +1033,6 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(

clusterChain, err := s.makeFilterChainTerminatingGateway(
cfgSnap,
name,
clusterName,
svc,
intentions,
Expand All @@ -1052,7 +1051,6 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(

subsetClusterChain, err := s.makeFilterChainTerminatingGateway(
cfgSnap,
name,
subsetClusterName,
svc,
intentions,
Expand Down Expand Up @@ -1095,7 +1093,7 @@ func (s *ResourceGenerator) makeTerminatingGatewayListener(

func (s *ResourceGenerator) makeFilterChainTerminatingGateway(
cfgSnap *proxycfg.ConfigSnapshot,
listener, cluster string,
cluster string,
service structs.ServiceName,
intentions structs.Intentions,
protocol string,
Expand Down Expand Up @@ -1133,13 +1131,12 @@ func (s *ResourceGenerator) makeFilterChainTerminatingGateway(
// Lastly we setup the actual proxying component. For L4 this is a straight
// tcp proxy. For L7 this is a very hands-off HTTP proxy just to inject an
// HTTP filter to do intention checks here instead.
statPrefix := fmt.Sprintf("terminating_gateway.%s.%s.", service.NamespaceOrDefault(), service.Name)
opts := listenerFilterOpts{
protocol: protocol,
filterName: listener,
filterName: fmt.Sprintf("%s.%s.%s", service.Name, service.NamespaceOrDefault(), cfgSnap.Datacenter),
routeName: cluster, // Set cluster name for route config since each will have its own
cluster: cluster,
statPrefix: statPrefix,
statPrefix: "upstream.",
routePath: "",
}

Expand Down
4 changes: 2 additions & 2 deletions agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "ingress_upstream.443",
"statPrefix": "ingress_upstream_443",
"rds": {
"configSource": {
"ads": {
Expand Down Expand Up @@ -60,7 +60,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "ingress_upstream.8080",
"statPrefix": "ingress_upstream_8080",
"rds": {
"configSource": {
"ads": {
Expand Down
4 changes: 2 additions & 2 deletions agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager",
"statPrefix": "ingress_upstream.443",
"statPrefix": "ingress_upstream_443",
"rds": {
"configSource": {
"ads": {
Expand Down Expand Up @@ -60,7 +60,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager",
"statPrefix": "ingress_upstream.8080",
"statPrefix": "ingress_upstream_8080",
"rds": {
"configSource": {
"ads": {
Expand Down
2 changes: 1 addition & 1 deletion agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "ingress_upstream.9191",
"statPrefix": "ingress_upstream_9191",
"rds": {
"configSource": {
"ads": {
Expand Down
2 changes: 1 addition & 1 deletion ...s/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager",
"statPrefix": "ingress_upstream.9191",
"statPrefix": "ingress_upstream_9191",
"rds": {
"configSource": {
"ads": {
Expand Down
16 changes: 8 additions & 8 deletions ...ds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.api.foo",
"statPrefix": "upstream.api.default.dc1",
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -86,7 +86,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.foo",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.db.foo",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -194,7 +194,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.web.foo",
"statPrefix": "upstream.web.default.dc1",
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -281,7 +281,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.api.wan",
"statPrefix": "upstream.api.default.dc1",
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -335,7 +335,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.wan",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -389,7 +389,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.db.wan",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -443,7 +443,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.web.wan",
"statPrefix": "upstream.web.default.dc1",
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down
16 changes: 8 additions & 8 deletions ...ta/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.api.foo",
"statPrefix": "upstream.api.default.dc1",
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -86,7 +86,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.foo",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.db.foo",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -194,7 +194,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.web.foo",
"statPrefix": "upstream.web.default.dc1",
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -281,7 +281,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.api.wan",
"statPrefix": "upstream.api.default.dc1",
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -335,7 +335,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.wan",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -389,7 +389,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.db.wan",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -443,7 +443,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.web.wan",
"statPrefix": "upstream.web.default.dc1",
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down
6 changes: 3 additions & 3 deletions agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.default",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -86,7 +86,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.db.default",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.web.default",
"statPrefix": "upstream.web.default.dc1",
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down
6 changes: 3 additions & 3 deletions agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.default",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -86,7 +86,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.db.default",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
"statPrefix": "terminating_gateway.default.web.default",
"statPrefix": "upstream.web.default.dc1",
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down
12 changes: 6 additions & 6 deletions agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.api.default",
"statPrefix": "upstream.api.default.dc1",
"cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -86,7 +86,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.cache.default",
"statPrefix": "upstream.cache.default.dc1",
"cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -140,7 +140,7 @@
"name": "envoy.filters.network.tcp_proxy",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
"statPrefix": "terminating_gateway.default.db.default",
"statPrefix": "upstream.db.default.dc1",
"cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
}
}
Expand Down Expand Up @@ -184,7 +184,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "terminating_gateway.default.web.default",
"statPrefix": "upstream.web.default.dc1",
"rds": {
"configSource": {
"ads": {
Expand Down Expand Up @@ -255,7 +255,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "terminating_gateway.default.web.default",
"statPrefix": "upstream.web.default.dc1",
"rds": {
"configSource": {
"ads": {
Expand Down Expand Up @@ -326,7 +326,7 @@
"name": "envoy.filters.network.http_connection_manager",
"typedConfig": {
"@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
"statPrefix": "terminating_gateway.default.web.default",
"statPrefix": "upstream.web.default.dc1",
"rds": {
"configSource": {
"ads": {
Expand Down
Loading