From 9f00be3c0bbf145dee7cc97c7d0f110e0b83232b Mon Sep 17 00:00:00 2001 From: sh2 Date: Mon, 15 Apr 2024 15:40:28 +0800 Subject: [PATCH] fix merge race caused by #3185 (#3197) fix merge race Signed-off-by: shawnh2 --- site/content/en/latest/api/extension_types.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/site/content/en/latest/api/extension_types.md b/site/content/en/latest/api/extension_types.md index e45d3ca0a9e..7c9b355fefb 100644 --- a/site/content/en/latest/api/extension_types.md +++ b/site/content/en/latest/api/extension_types.md @@ -64,12 +64,12 @@ _Appears in:_ | Field | Type | Required | Description | | --- | --- | --- | --- | - | `backendRefs` | _[BackendRef](#backendref) array_ | true | BackendRefs references a Kubernetes object that represents the gRPC service to which
the access logs will be sent. Currently only Service is supported. | | `logName` | _string_ | false | LogName defines the friendly name of the access log to be returned in
StreamAccessLogsMessage.Identifier. This allows the access log server
to differentiate between different access logs coming from the same Envoy. | | `type` | _[ALSEnvoyProxyAccessLogType](#alsenvoyproxyaccesslogtype)_ | true | Type defines the type of accesslog. Supported types are "HTTP" and "TCP". | | `http` | _[ALSEnvoyProxyHTTPAccessLogConfig](#alsenvoyproxyhttpaccesslogconfig)_ | false | HTTP defines additional configuration specific to HTTP access logs. | + #### ALSEnvoyProxyAccessLogType _Underlying type:_ _string_ @@ -79,6 +79,10 @@ _Underlying type:_ _string_ _Appears in:_ - [ALSEnvoyProxyAccessLog](#alsenvoyproxyaccesslog) +| Value | Description | +| ----- | ----------- | +| `HTTP` | ALSEnvoyProxyAccessLogTypeHTTP defines the HTTP access log type and will populate StreamAccessLogsMessage.http_logs.
| +| `TCP` | ALSEnvoyProxyAccessLogTypeTCP defines the TCP access log type and will populate StreamAccessLogsMessage.tcp_logs.
| #### ALSEnvoyProxyHTTPAccessLogConfig @@ -92,11 +96,11 @@ _Appears in:_ | Field | Type | Required | Description | | --- | --- | --- | --- | - | `requestHeaders` | _string array_ | false | RequestHeaders defines request headers to include in log entries sent to the access log service. | | `responseHeaders` | _string array_ | false | ResponseHeaders defines response headers to include in log entries sent to the access log service. | | `responseTrailers` | _string array_ | false | ResponseTrailers defines response trailers to include in log entries sent to the access log service. | + #### ActiveHealthCheck @@ -2194,6 +2198,7 @@ _Appears in:_ | Value | Description | | ----- | ----------- | +| `ALS` | ProxyAccessLogSinkTypeALS defines the gRPC Access Log Service (ALS) sink.
The service must implement the Envoy gRPC Access Log Service streaming API:
https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/accesslog/v3/als.proto
| | `File` | ProxyAccessLogSinkTypeFile defines the file accesslog sink.
| | `OpenTelemetry` | ProxyAccessLogSinkTypeOpenTelemetry defines the OpenTelemetry accesslog sink.
When the provider is Kubernetes, EnvoyGateway always sends `k8s.namespace.name`
and `k8s.pod.name` as additional attributes.
|