This is an automated email from the ASF dual-hosted git repository.
liuyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new bd1db1b [Doc] Add descriptions for HAProxy (#9759)
bd1db1b is described below
commit bd1db1b708d76ba2afbdeb6c23ef55481f838941
Author: Yu Liu <[email protected]>
AuthorDate: Tue Mar 2 08:08:31 2021 +0800
[Doc] Add descriptions for HAProxy (#9759)
Co-authored-by: Anonymitaet <anonymitaet_hotmail.com>
---
site2/docs/reference-configuration.md | 9 +++------
.../versioned_docs/version-2.6.3/reference-configuration.md | 10 +++-------
.../versioned_docs/version-2.7.0/reference-configuration.md | 9 +++------
.../versioned_docs/version-2.7.1/reference-configuration.md | 6 +++---
4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/site2/docs/reference-configuration.md
b/site2/docs/reference-configuration.md
index f5d9281..b1c1e7d 100644
--- a/site2/docs/reference-configuration.md
+++ b/site2/docs/reference-configuration.md
@@ -344,7 +344,7 @@ subscriptionExpirationTimeMinutes | How long to delete
inactive subscriptions fr
| maxMessageSize | Set the maximum size of a message. | 5242880 |
| preciseTopicPublishRateLimiterEnable | Enable precise topic publish rate
limiting. | false |
| lazyCursorRecovery | Whether to recover cursors lazily when trying to
recover a managed ledger backing a persistent topic. It can improve write
availability of topics. The caveat is now when recovered ledger is ready to
write we're not sure if all old consumers' last mark delete position(ack
position) can be recovered or not. So user can make the trade off or have
custom logic in application to checkpoint consumer state.| false |
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## Client
@@ -656,10 +656,7 @@ The value of 0 disables message-byte
dispatch-throttling.|0|
|defaultRetentionTimeInMinutes| |0|
|defaultRetentionSizeInMB| |0|
|keepAliveIntervalSeconds| |30|
-
-
-
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## WebSocket
@@ -688,7 +685,6 @@ The value of 0 disables message-byte dispatch-throttling.|0|
|tlsKeyFilePath |||
|tlsTrustCertsFilePath|||
-
## Pulsar proxy
The [Pulsar proxy](concepts-architecture-overview.md#pulsar-proxy) can be
configured in the `conf/proxy.conf` file.
@@ -751,6 +747,7 @@ The [Pulsar
proxy](concepts-architecture-overview.md#pulsar-proxy) can be config
|tokenAudienceClaim| The token audience "claim" name, e.g. "aud". It is used
to get the audience from token. If it is not set, the audience is not verified.
||
| tokenAudience | The token audience stands for this broker. The field
`tokenAudienceClaim` of a valid token need contains this parameter.| |
| proxyLogLevel | Set the Pulsar Proxy log level. <li> If the value is set to
0, no TCP channel information is logged. <li> If the value is set to 1, only
the TCP channel information and command information (without message body) are
parsed and logged. <li> If the value is set to 2, all TCP channel information,
command information, and message body are parsed and logged. | 0 |
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## ZooKeeper
diff --git
a/site2/website/versioned_docs/version-2.6.3/reference-configuration.md
b/site2/website/versioned_docs/version-2.6.3/reference-configuration.md
index e647e0c..195077b 100644
--- a/site2/website/versioned_docs/version-2.6.3/reference-configuration.md
+++ b/site2/website/versioned_docs/version-2.6.3/reference-configuration.md
@@ -271,9 +271,7 @@ subscriptionExpirationTimeMinutes | How long to delete
inactive subscriptions fr
|s3ManagedLedgerOffloadRoleSessionName| For Amazon S3 ledger offload, provide
a role session name when using a role |pulsar-s3-offload|
| acknowledgmentAtBatchIndexLevelEnabled | Enable or disable the batch index
acknowledgement. | false |
| maxMessageSize | Set the maximum size of a message. | 5 MB |
-
-
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## Client
@@ -447,10 +445,7 @@ The
[`pulsar-client`](reference-cli-tools.md#pulsar-client) CLI tool can be used
|defaultRetentionTimeInMinutes| |0|
|defaultRetentionSizeInMB| |0|
|keepAliveIntervalSeconds| |30|
-
-
-
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## WebSocket
@@ -520,6 +515,7 @@ The [Pulsar
proxy](concepts-architecture-overview.md#pulsar-proxy) can be config
|tokenPublicKey| Configure the public key to be used to validate auth tokens.
The key can be specified like: `tokenPublicKey=data:;base64,xxxxxxxxx` or
`tokenPublicKey=file:///my/secret.key`||
|tokenPublicAlg| Configure the algorithm to be used to validate auth tokens.
This can be any of the asymettric algorithms supported by Java JWT
(https://github.com/jwtk/jjwt#signature-algorithms-keys) |RS256|
|tokenAuthClaim| Specify the token claim that will be used as the
authentication "principal" or "role". The "subject" field will be used if this
is left blank ||
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## ZooKeeper
diff --git
a/site2/website/versioned_docs/version-2.7.0/reference-configuration.md
b/site2/website/versioned_docs/version-2.7.0/reference-configuration.md
index 6acdf71..5964e3c 100644
--- a/site2/website/versioned_docs/version-2.7.0/reference-configuration.md
+++ b/site2/website/versioned_docs/version-2.7.0/reference-configuration.md
@@ -345,8 +345,7 @@ subscriptionExpirationTimeMinutes | How long to delete
inactive subscriptions fr
| maxMessageSize | Set the maximum size of a message. | 5242880 |
| preciseTopicPublishRateLimiterEnable | Enable precise topic publish rate
limiting. | false |
| lazyCursorRecovery | Whether to recover cursors lazily when trying to
recover a managed ledger backing a persistent topic. It can improve write
availability of topics. The caveat is now when recovered ledger is ready to
write we're not sure if all old consumers' last mark delete position(ack
position) can be recovered or not. So user can make the trade off or have
custom logic in application to checkpoint consumer state.| false |
-
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## Client
@@ -651,10 +650,7 @@ The value of 0 disables message-byte
dispatch-throttling.|0|
|defaultRetentionTimeInMinutes| |0|
|defaultRetentionSizeInMB| |0|
|keepAliveIntervalSeconds| |30|
-
-
-
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## WebSocket
@@ -746,6 +742,7 @@ The [Pulsar
proxy](concepts-architecture-overview.md#pulsar-proxy) can be config
|tokenAudienceClaim| The token audience "claim" name, e.g. "aud". It is used
to get the audience from token. If it is not set, the audience is not verified.
||
| tokenAudience | The token audience stands for this broker. The field
`tokenAudienceClaim` of a valid token need contains this parameter.| |
| proxyLogLevel | Set the Pulsar Proxy log level. <li> If the value is set to
0, no TCP channel information is logged. <li> If the value is set to 1, only
the TCP channel information and command information (without message body) are
parsed and logged. <li> If the value is set to 2, all TCP channel information,
command information, and message body are parsed and logged. | 0 |
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## ZooKeeper
diff --git
a/site2/website/versioned_docs/version-2.7.1/reference-configuration.md
b/site2/website/versioned_docs/version-2.7.1/reference-configuration.md
index e2e8a52..ac8c863 100644
--- a/site2/website/versioned_docs/version-2.7.1/reference-configuration.md
+++ b/site2/website/versioned_docs/version-2.7.1/reference-configuration.md
@@ -345,8 +345,7 @@ subscriptionExpirationTimeMinutes | How long to delete
inactive subscriptions fr
| maxMessageSize | Set the maximum size of a message. | 5242880 |
| preciseTopicPublishRateLimiterEnable | Enable precise topic publish rate
limiting. | false |
| lazyCursorRecovery | Whether to recover cursors lazily when trying to
recover a managed ledger backing a persistent topic. It can improve write
availability of topics. The caveat is now when recovered ledger is ready to
write we're not sure if all old consumers' last mark delete position(ack
position) can be recovered or not. So user can make the trade off or have
custom logic in application to checkpoint consumer state.| false |
-
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## Client
@@ -651,7 +650,7 @@ The value of 0 disables message-byte dispatch-throttling.|0|
|defaultRetentionTimeInMinutes| |0|
|defaultRetentionSizeInMB| |0|
|keepAliveIntervalSeconds| |30|
-
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
@@ -746,6 +745,7 @@ The [Pulsar
proxy](concepts-architecture-overview.md#pulsar-proxy) can be config
|tokenAudienceClaim| The token audience "claim" name, e.g. "aud". It is used
to get the audience from token. If it is not set, the audience is not verified.
||
| tokenAudience | The token audience stands for this broker. The field
`tokenAudienceClaim` of a valid token need contains this parameter.| |
| proxyLogLevel | Set the Pulsar Proxy log level. <li> If the value is set to
0, no TCP channel information is logged. <li> If the value is set to 1, only
the TCP channel information and command information (without message body) are
parsed and logged. <li> If the value is set to 2, all TCP channel information,
command information, and message body are parsed and logged. | 0 |
+haProxyProtocolEnabled | Enable or disable the
[HAProxy](http://www.haproxy.org/) protocol. |false|
## ZooKeeper
