diff --git a/config-templates/complex-tidb-binlog.yaml b/config-templates/complex-tidb-binlog.yaml index 345156b17e0a5..6981030e2b69f 100644 --- a/config-templates/complex-tidb-binlog.yaml +++ b/config-templates/complex-tidb-binlog.yaml @@ -149,7 +149,7 @@ drainer_servers: - db1 - db2 syncer.to.kafka-addrs: "10.0.1.20:9092,10.0.1.21:9092,10.0.1.22:9092" - syncer.to.kafka-version: "0.10.0.0" + syncer.to.kafka-version: "2.4.0" syncer.to.topic-name: "asyouwish" monitoring_servers: diff --git a/deploy-monitoring-services.md b/deploy-monitoring-services.md index 19054cbb472d3..0a7ada09ece5a 100644 --- a/deploy-monitoring-services.md +++ b/deploy-monitoring-services.md @@ -31,7 +31,7 @@ Assume that the TiDB cluster topology is as follows: # Downloads the package. wget https://download.pingcap.org/prometheus-2.27.1.linux-amd64.tar.gz wget https://download.pingcap.org/node_exporter-v1.3.1-linux-amd64.tar.gz -wget https://download.pingcap.org/grafana-6.1.6.linux-amd64.tar.gz +wget https://download.pingcap.org/grafana-7.5.11.linux-amd64.tar.gz ``` {{< copyable "shell-regular" >}} @@ -40,7 +40,7 @@ wget https://download.pingcap.org/grafana-6.1.6.linux-amd64.tar.gz # Extracts the package. tar -xzf prometheus-2.27.1.linux-amd64.tar.gz tar -xzf node_exporter-v1.3.1-linux-amd64.tar.gz -tar -xzf grafana-6.1.6.linux-amd64.tar.gz +tar -xzf grafana-7.5.11.linux-amd64.tar.gz ``` ### Step 2: Start `node_exporter` on Node1, Node2, Node3, and Node4 @@ -135,7 +135,7 @@ Edit the Grafana configuration file: {{< copyable "shell-regular" >}} ```ini -cd grafana-6.1.6 && +cd grafana-7.5.11 && vi conf/grafana.ini ... diff --git a/ticdc/manage-ticdc.md b/ticdc/manage-ticdc.md index 94a390a9aff78..ae9dd9579e913 100644 --- a/ticdc/manage-ticdc.md +++ b/ticdc/manage-ticdc.md @@ -206,7 +206,7 @@ The following are descriptions of parameters and parameter values that can be co | `127.0.0.1` | The IP address of the downstream Kafka services | | `9092` | The port for the downstream Kafka | | `topic-name` | Variable. The name of the Kafka topic | -| `kafka-version` | The version of the downstream Kafka (optional, `2.4.0` by default. Currently, the earliest supported Kafka version is `0.11.0.2` and the latest one is `2.7.0`. This value needs to be consistent with the actual version of the downstream Kafka) | +| `kafka-version` | The version of the downstream Kafka (optional, `2.4.0` by default. Currently, the earliest supported Kafka version is `0.11.0.2` and the latest one is `3.1.0`. This value needs to be consistent with the actual version of the downstream Kafka) | | `kafka-client-id` | Specifies the Kafka client ID of the replication task (optional. `TiCDC_sarama_producer_replication ID` by default) | | `partition-num` | The number of the downstream Kafka partitions (optional. The value must be **no greater than** the actual number of partitions; otherwise, the replication task cannot be created successfully. `3` by default) | | `max-message-bytes` | The maximum size of data that is sent to Kafka broker each time (optional, `10MB` by default). From v5.0.6 and v4.0.6, the default value has changed from 64MB and 256MB to 10MB. | diff --git a/ticdc/ticdc-canal-json.md b/ticdc/ticdc-canal-json.md index 5c5388d1c70ce..1bb9a5db69a1a 100644 --- a/ticdc/ticdc-canal-json.md +++ b/ticdc/ticdc-canal-json.md @@ -22,7 +22,7 @@ The following is an example of using `Canal-JSON`: {{< copyable "shell-regular" >}} ```shell -cdc cli changefeed create --pd=http://127.0.0.1:2379 --changefeed-id="kafka-canal-json" --sink-uri="kafka://127.0.0.1:9092/topic-name?kafka-version=2.6.0&protocol=canal-json" +cdc cli changefeed create --pd=http://127.0.0.1:2379 --changefeed-id="kafka-canal-json" --sink-uri="kafka://127.0.0.1:9092/topic-name?kafka-version=2.4.0&protocol=canal-json" ``` ## TiDB extension field @@ -37,7 +37,7 @@ The following is an example: {{< copyable "shell-regular" >}} ```shell -cdc cli changefeed create --pd=http://127.0.0.1:2379 --changefeed-id="kafka-canal-json-enable-tidb-extension" --sink-uri="kafka://127.0.0.1:9092/topic-name?kafka-version=2.6.0&protocol=canal-json&enable-tidb-extension=true" +cdc cli changefeed create --pd=http://127.0.0.1:2379 --changefeed-id="kafka-canal-json-enable-tidb-extension" --sink-uri="kafka://127.0.0.1:9092/topic-name?kafka-version=2.4.0&protocol=canal-json&enable-tidb-extension=true" ``` ## Definitions of message formats diff --git a/tidb-binlog/binlog-consumer-client.md b/tidb-binlog/binlog-consumer-client.md index 37f1914e3f9d5..55c0e19b020f0 100644 --- a/tidb-binlog/binlog-consumer-client.md +++ b/tidb-binlog/binlog-consumer-client.md @@ -20,7 +20,7 @@ db-type = "kafka" # the Kafka address kafka-addrs = "127.0.0.1:9092" # the Kafka version -kafka-version = "0.8.2.0" +kafka-version = "2.4.0" ``` ## Customized development