Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Grafana and Kafka versions (#9861) #11052

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config-templates/complex-tidb-binlog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions deploy-monitoring-services.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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" >}}
Expand All @@ -39,7 +39,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
Expand Down Expand Up @@ -134,7 +134,7 @@ Edit the Grafana configuration file:
{{< copyable "shell-regular" >}}

```ini
cd grafana-6.1.6 &&
cd grafana-7.5.11 &&
vi conf/grafana.ini

...
Expand Down
2 changes: 1 addition & 1 deletion ticdc/manage-ticdc.md
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,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. |
Expand Down
4 changes: 2 additions & 2 deletions ticdc/ticdc-canal-json.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tidb-binlog/binlog-consumer-client.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,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
Expand Down