Skip to content

Commit

Permalink
fix merge race caused by envoyproxy#3185 (envoyproxy#3197)
Browse files Browse the repository at this point in the history
fix merge race

Signed-off-by: shawnh2 <shawnhxh@outlook.com>
  • Loading branch information
shawnh2 authored Apr 15, 2024
1 parent 2b24e9b commit 9f00be3
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions site/content/en/latest/api/extension_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -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<br />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<br />StreamAccessLogsMessage.Identifier. This allows the access log server<br />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_
Expand All @@ -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.<br /> |
| `TCP` | ALSEnvoyProxyAccessLogTypeTCP defines the TCP access log type and will populate StreamAccessLogsMessage.tcp_logs.<br /> |


#### ALSEnvoyProxyHTTPAccessLogConfig
Expand All @@ -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


Expand Down Expand Up @@ -2194,6 +2198,7 @@ _Appears in:_

| Value | Description |
| ----- | ----------- |
| `ALS` | ProxyAccessLogSinkTypeALS defines the gRPC Access Log Service (ALS) sink.<br />The service must implement the Envoy gRPC Access Log Service streaming API:<br />https://www.envoyproxy.io/docs/envoy/latest/api-v3/service/accesslog/v3/als.proto<br /> |
| `File` | ProxyAccessLogSinkTypeFile defines the file accesslog sink.<br /> |
| `OpenTelemetry` | ProxyAccessLogSinkTypeOpenTelemetry defines the OpenTelemetry accesslog sink.<br />When the provider is Kubernetes, EnvoyGateway always sends `k8s.namespace.name`<br />and `k8s.pod.name` as additional attributes.<br /> |

Expand Down

0 comments on commit 9f00be3

Please sign in to comment.