Skip to content

Commit

Permalink
change(error-log-logger): remove deprecated tcp conf (apache#7700)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tzssangglass @Liu-Junlin
tzssangglass authored and Liu-Junlin committed Nov 4, 2022
1 parent e8123df commit d4cd5ec
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 14 deletions.
6 changes: 0 additions & 6 deletions apisix/plugins/error-log-logger.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ local metadata_schema = {
},
required = {"endpoint_addr", "user", "password", "database", "logtable"}
},
host = {schema_def.host_def, description = "Deprecated, use `tcp.host` instead."},
port = {type = "integer", minimum = 0, description = "Deprecated, use `tcp.port` instead."},
tls = {type = "boolean", default = false,
description = "Deprecated, use `tcp.tls` instead."},
tls_server_name = {type = "string",
description = "Deprecated, use `tcp.tls_server_name` instead."},
name = {type = "string", default = plugin_name},
level = {type = "string", default = "WARN", enum = {"STDERR", "EMERG", "ALERT", "CRIT",
"ERR", "ERROR", "WARN", "NOTICE", "INFO", "DEBUG"}},
Expand Down
4 changes: 0 additions & 4 deletions docs/en/latest/plugins/error-log-logger.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ It might take some time to receive the log data. It will be automatically sent a
| clickhouse.password | String | False | | | ClickHouse password. |
| clickhouse.database | String | False | | | Name of the database to store the logs. |
| clickhouse.logtable | String | False | | | Table name to store the logs. |
| host | string | False | | | Deprecated. Use `tcp.host` attribute instead. IP address or the hostname of the TCP server. |
| port | integer | False | | [0,...] | Deprecated. Use `tcp.port` instead. Target Upstream port. |
| tls | boolean | False | false | | Deprecated. Use `tcp.tls` instead. When set to `true` performs SSL verification. |
| tls_server_name | string | False | | | Deprecated. Use `tcp.tls_server_name` instead. Server name for the new TLS extension SNI. |
| timeout | integer | False | 3 | [1,...] | Timeout (in seconds) for the upstream to connect and send data. |
| keepalive | integer | False | 30 | [1,...] | Time in seconds to keep the connection alive after sending data. |
| level | string | False | WARN | ["STDERR", "EMERG", "ALERT", "CRIT", "ERR", "ERROR", "WARN", "NOTICE", "INFO", "DEBUG"] | Log level to filter the error logs. `ERR` is same as `ERROR`. |
Expand Down
4 changes: 0 additions & 4 deletions docs/zh/latest/plugins/error-log-logger.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ title: error-log-logger
| clickhouse.password | String | 可选 | | | clickhouse 的密码 |
| clickhouse.database | String | 可选 | | | clickhouse 的用于接收 log 的数据库 |
| clickhouse.logtable | String | 可选 | | | clickhouse 的用于接收 log 的表 |
| host | string | 可选 | | | (`弃用`，替换成`tcp.host`) TCP 服务的 IP 地址或主机名 |
| port | integer | 可选 | | [0,...] | (`弃用`，替换成`tcp.port`) 目标端口 |
| tls | boolean | 可选 | false | | (`弃用`，替换成`tcp.tls`) 用于控制是否执行 SSL 验证 |
| tls_server_name | string | 可选 | | | (`弃用`，替换成`tcp.tls_server_name`) TLS 服务名称标记 |
| timeout | integer | 可选 | 3 | [1,...] | 连接和发送数据超时间（以秒为单位）|
| keepalive | integer | 可选 | 30 | [1,...] | 复用连接时，连接保持的时间（以秒为单位）|
| level | string | 可选 | WARN | | 进行错误日志筛选的级别，缺省 WARN，取值 ["STDERR", "EMERG", "ALERT", "CRIT", "ERR", "ERROR", "WARN", "NOTICE", "INFO", "DEBUG"]，其中 ERR 与 ERROR 级别一致 |
Expand Down

0 comments on commit d4cd5ec

Please sign in to comment.