Skip to content

Commit

Permalink
Update Grafana and Kafka versions (#8975) (#9965)
Browse files Browse the repository at this point in the history
  • Loading branch information
ti-chi-bot authored Jun 22, 2022
1 parent 41f1900 commit 8921897
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
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 @@ -28,7 +28,7 @@ title: 集群监控部署
```bash
wget https://download.pingcap.org/prometheus-2.27.1.linux-amd64.tar.gz
wget https://download.pingcap.org/node_exporter-0.17.0.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
```

解压二进制包:
Expand All @@ -38,7 +38,7 @@ wget https://download.pingcap.org/grafana-6.1.6.linux-amd64.tar.gz
```bash
tar -xzf prometheus-2.27.1.linux-amd64.tar.gz
tar -xzf node_exporter-0.17.0.linux-amd64.tar.gz
tar -xzf grafana-6.1.6.linux-amd64.tar.gz
tar -xzf grafana-7.5.11.linux-amd64.tar.gz
```

### 第 2 步:在 Node1,Node2,Node3,Node4 上启动 `node_exporter`
Expand Down Expand Up @@ -137,7 +137,7 @@ scrape_configs:
编辑 Grafana 的配置文件:

```bash
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 @@ -202,7 +202,7 @@ URI 中可配置的的参数如下:
| `127.0.0.1` | 下游 Kafka 对外提供服务的 IP |
| `9092` | 下游 Kafka 的连接端口 |
| `topic-name` | 变量,使用的 Kafka topic 名字 |
| `kafka-version` | 下游 Kafka 版本号(可选,默认值 `2.4.0`,目前支持的最低版本为 `0.11.0.2`,最高版本为 `2.7.0`。该值需要与下游 Kafka 的实际版本保持一致) |
| `kafka-version` | 下游 Kafka 版本号(可选,默认值 `2.4.0`,目前支持的最低版本为 `0.11.0.2`,最高版本为 `3.1.0`。该值需要与下游 Kafka 的实际版本保持一致) |
| `kafka-client-id` | 指定同步任务的 Kafka 客户端的 ID(可选,默认值为 `TiCDC_sarama_producer_同步任务的 ID`|
| `partition-num` | 下游 Kafka partition 数量(可选,不能大于实际 partition 数量,否则创建同步任务会失败,默认值 `3`|
| `max-message-bytes` | 每次向 Kafka broker 发送消息的最大数据量(可选,默认值 `10MB`)。从 v5.0.6 和 v4.0.6 开始,默认值分别从 64MB 和 256MB 调整至 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 @@ Event 分为三类:
{{< 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 扩展字段
Expand All @@ -37,7 +37,7 @@ Canal-JSON 协议本是为 MySQL 设计的,其中并不包含 TiDB 专有的 C
{{< 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"
```

`enable-tidb-extension` 默认为 `false`,仅当使用 Canal-JSON 时生效。
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 @@ -18,7 +18,7 @@ db-type = "kafka"
# Kafka 地址
kafka-addrs = "127.0.0.1:9092"
# Kafka 版本号
kafka-version = "0.8.2.0"
kafka-version = "2.4.0"
```

## 自定义开发
Expand Down

0 comments on commit 8921897

Please sign in to comment.