Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into alert-rules-TiKV_…
Browse files Browse the repository at this point in the history
…thread_apply_worker_cpu_seconds
  • Loading branch information
hfxsd committed Dec 29, 2021
2 parents 81f5167 + b58e96b commit 80551aa
Show file tree
Hide file tree
Showing 223 changed files with 13,114 additions and 667 deletions.
19 changes: 19 additions & 0 deletions .github/exclude-links.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
http://example.com:8033/dashboard/
https://charts.pingcap.org
https://download.pingcap.org
http:/192.168.0.16:2379
http:/192.168.0.15:2379
http:/192.168.0.14:2379
http://spark-master-hostname:8080/
http:/pd_ip:pd_port
http:/ip:status_port/config
http://grafana_ip:3000/
http://ip:2379/dashboard/
http://ip:2379/pd/api/v1/members
http://\$ip:10080/
http://__tidb_ip__:10080/metrics
http://__grafana_ip__:3000
http://9.9.9.9:2379/
http:/DASHBOARD_IP:PORT/dashboard
http:/\$%7Btidb-server-ip%7D:\$%7Btidb-server-status-port%7D/
https://kms.us-west-2.amazonaws.com
1 change: 1 addition & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ By default, **CHOOSE MASTER ONLY** so your changes will be applied to the next T
For details, see [tips for choosing the affected versions (in Chinese)](https://github.com/pingcap/docs-cn/blob/master/CONTRIBUTING.md#版本选择指南).

- [ ] master (the latest development version)
- [ ] v5.4 (TiDB 5.4 versions)
- [ ] v5.3 (TiDB 5.3 versions)
- [ ] v5.2 (TiDB 5.2 versions)
- [ ] v5.1 (TiDB 5.1 versions)
Expand Down
27 changes: 12 additions & 15 deletions .github/workflows/dispatch.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
name: Repsitory dispatch workflow from docs-cn-release-master
name: Trigger docs site update

on:
push:
branches:
- master
- release-*

jobs:
build:
trigger:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Extract branch, repo and sha
- name: Extract sha
id: extract
shell: bash
id: extract_info
run: |
echo "::set-output name=branch::${GITHUB_REF#refs/heads/}"
echo "::set-output name=repo::$(cut -d'/' -f2 <<< ${{ github.repository }})"
echo "::set-output name=sha::$(sha=${{ github.sha }}; echo ${sha:0:6})"
# - name: Repository Dispatch
# uses: peter-evans/repository-dispatch@v1.1.1
# with:
# token: ${{ secrets.PR_TRIGGER_BUILD_TOKEN }}
# repository: pingcap/website-docs/
# event-type: ${{ steps.extract_info.outputs.repo }}/${{ steps.extract_info.outputs.branch }}-${{ steps.extract_info.outputs.sha }}
# client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}", "repo": "${{ github.repository }}"}'
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.PR_TRIGGER_BUILD_TOKEN }}
repository: pingcap/website-docs
event-type: ${{ github.repository }}/${{ github.ref_name }}-${{ steps.extract.outputs.sha }}
client-payload: '{ "repo": "${{ github.repository }}", "ref": "${{ github.ref_name }}", "sha": "${{ github.sha }}" }'
31 changes: 0 additions & 31 deletions .github/workflows/link-check.yaml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/link.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Links

on:
repository_dispatch:
workflow_dispatch:
schedule:
- cron: "0 0 * * 1"

jobs:
linkChecker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Link Checker
uses: lycheeverse/[email protected]
with:
# For parameter description, see https://github.com/lycheeverse/lychee#commandline-parameters
args: -E --exclude-mail -v -i -n -a 429 -t 45 --exclude-file ./.github/exclude-links.txt -- **/*.md *.md
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

- name: Create Issue From File
uses: peter-evans/create-issue-from-file@v3
with:
title: Broken Link Detected
content-filepath: ./lychee/out.md
assignees: TomShawn

# - name: Fail if there were link errors
# run: exit ${{ steps.lychee.outputs.exit_code }}
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ TiDB 中文文档的日常更新特别活跃,相应地,[TiDB 英文文档](h
- [常用 bot 命令](#常用-bot-命令)
- [PingCAP 中文文档风格指南](/resources/pingcap-style-guide-zh.pdf)
- [PingCAP 中英术语表](https://shimo.im/sheets/tTRyydP8Xkdv8yxq/MODOC)
- [TiDB 中文用户文档模板](/resources/tidb-docs-template-zh-v1.0.pdf)
- [TiDB 中文用户文档模板](/resources/doc-templates)
- [必须遵循的 Markdown 规范](#必须遵循的-markdown-规范)
- [代码注释规范](https://github.com/pingcap/community/blob/master/contributors/code-comment-style.md)
- 图片风格:[Figma 快速上手教程](/resources/figma-quick-start-guide.md)
Expand Down Expand Up @@ -142,7 +142,7 @@ git add <file> ... # 如果你想提交所有的文档修改,可直接使用 `
git commit -m "commit-message: update the xx"
```
参考[如何写 commit message](https://github.com/pingcap/community/blob/master/commit-message-pr-style.md#how-to-write-a-good-commit-message)。
参考[如何写 commit message](https://github.com/pingcap/community/blob/master/contributors/commit-message-pr-style.md#how-to-write-a-good-commit-message)。
### 第 6 步:保持新建 branch 与 upstream/master 一致
Expand Down
127 changes: 109 additions & 18 deletions TOC.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
- [混合部署拓扑结构](/hybrid-deployment-topology.md)
- 安装与启动
- [使用 TiUP 部署(推荐)](/production-deployment-using-tiup.md)
- [在 Kubernetes 上部署](https://docs.pingcap.com/zh/tidb-in-kubernetes/stable)
- [在 Kubernetes 上部署](/tidb-in-kubernetes.md)
- [验证集群状态](/post-installation-check.md)
- 测试集群性能
- [用 Sysbench 测试 TiDB](/benchmark/benchmark-tidb-using-sysbench.md)
Expand Down Expand Up @@ -160,10 +160,26 @@
- [Placement Rules 使用文档](/configure-placement-rules.md)
- [Load Base Split 使用文档](/configure-load-base-split.md)
- [Store Limit 使用文档](/configure-store-limit.md)
- TiDB 生态工具
- TiDB 工具
- [功能概览](/ecosystem-tool-user-guide.md)
- [适用场景](/ecosystem-tool-user-case.md)
- [工具下载](/download-ecosystem-tools.md)
- TiUP
- [文档地图](/tiup/tiup-documentation-guide.md)
- [概览](/tiup/tiup-overview.md)
- [术语及核心概念](/tiup/tiup-terminology-and-concepts.md)
- [TiUP 组件管理](/tiup/tiup-component-management.md)
- [FAQ](/tiup/tiup-faq.md)
- [故障排查](/tiup/tiup-troubleshooting-guide.md)
- [参考手册](/tiup/tiup-reference.md)
- [TiDB 集群拓扑文件配置](/tiup/tiup-cluster-topology-reference.md)
- [TiUP 镜像参考指南](/tiup/tiup-mirror-reference.md)
- TiUP 组件文档
- [tiup-playground 运行本地测试集群](/tiup/tiup-playground.md)
- [tiup-cluster 部署运维生产集群](/tiup/tiup-cluster.md)
- [tiup-mirror 定制离线镜像](/tiup/tiup-mirror.md)
- [tiup-bench 进行 TPCC/TPCH 压力测试](/tiup/tiup-bench.md)
- [TiDB Operator](/tidb-operator-overview.md)
- [Dumpling](/dumpling-overview.md)
- TiDB Lightning
- [概述](/tidb-lightning/tidb-lightning-overview.md)
Expand All @@ -175,12 +191,98 @@
- [并行导入](/tidb-lightning/tidb-lightning-distributed-import.md)
- [Web 界面](/tidb-lightning/tidb-lightning-web-interface.md)
- [快速上手教程](/get-started-with-tidb-lightning.md)
- [执行任务前的检查项](/tidb-lightning/tidb-lightning-prechecks.md)
- [前置检查](/tidb-lightning/tidb-lightning-prechecks.md)
- [部署执行](/tidb-lightning/deploy-tidb-lightning.md)
- [参数说明](/tidb-lightning/tidb-lightning-configuration.md)
- [监控告警](/tidb-lightning/monitor-tidb-lightning.md)
- [FAQ](/tidb-lightning/tidb-lightning-faq.md)
- [术语表](/tidb-lightning/tidb-lightning-glossary.md)
- TiDB Data Migration
- 关于 TiDB Data Migration
- [TiDB Data Migration 简介](/dm/dm-overview.md)
- 基本功能
- [Table routing](/dm/dm-key-features.md#table-routing)
- [Block & Allow Lists](/dm/dm-key-features.md#block--allow-table-lists)
- [Binlog Event Filter](/dm/dm-key-features.md#binlog-event-filter)
- 高级功能
- 分库分表合并迁移
- [概述](/dm/feature-shard-merge.md)
- [悲观模式](/dm/feature-shard-merge-pessimistic.md)
- [乐观模式](/dm/feature-shard-merge-optimistic.md)
- [迁移使用 GH-ost/PT-osc 的源数据库](/dm/feature-online-ddl.md)
- [使用 SQL 表达式过滤某些行变更](/dm/feature-expression-filter.md)
- [DM 架构](/dm/dm-arch.md)
- [性能数据](/dm/dm-benchmark-v5.3.0.md)
- 快速上手
- [快速上手试用](/dm/quick-start-with-dm.md)
- [使用 TiUP 部署 DM 集群](/dm/deploy-a-dm-cluster-using-tiup.md)
- [创建数据源](/dm/quick-start-create-source.md)
- 数据迁移场景
- [数据迁移场景概述](/dm/quick-create-migration-task.md)
- [多数据源合并迁移到 TiDB](/dm/usage-scenario-simple-migration.md)
- [分表合并迁移到 TiDB](/dm/usage-scenario-shard-merge.md)
- [增量迁移数据到 TiDB](/dm/usage-scenario-incremental-migration.md)
- [下游 TiDB 表结构存在更多列的数据迁移](/dm/usage-scenario-downstream-more-columns.md)
- 部署使用
- [软硬件要求](/dm/dm-hardware-and-software-requirements.md)
- 部署 DM 集群
- [使用 TiUP(推荐)](/dm/deploy-a-dm-cluster-using-tiup.md)
- [使用 TiUP 离线镜像](/dm/deploy-a-dm-cluster-using-tiup-offline.md)
- [使用 Binary](/dm/deploy-a-dm-cluster-using-binary.md)
- [使用 Kubernetes](https://docs.pingcap.com/zh/tidb-in-kubernetes/dev/deploy-tidb-dm)
- [使用 DM 迁移数据](/dm/migrate-data-using-dm.md)
- [测试 DM 性能](/dm/dm-performance-test.md)
- 运维操作
- 集群运维工具
- [使用 TiUP 运维集群(推荐)](/dm/maintain-dm-using-tiup.md)
- [使用 dmctl 运维集群](/dm/dmctl-introduction.md)
- [使用 OpenAPI 运维集群](/dm/dm-open-api.md)
- 升级版本
- [1.0.x 到 2.0+ 手动升级](/dm/manually-upgrade-dm-1.0-to-2.0.md)
- [管理数据源](/dm/dm-manage-source.md)
- 管理迁移任务
- [任务配置向导](/dm/dm-task-configuration-guide.md)
- [任务前置检查](/dm/dm-precheck.md)
- [创建任务](/dm/dm-create-task.md)
- [查询状态](/dm/dm-query-status.md)
- [暂停任务](/dm/dm-pause-task.md)
- [恢复任务](/dm/dm-resume-task.md)
- [停止任务](/dm/dm-stop-task.md)
- [导出和导入集群的数据源和任务配置](/dm/dm-export-import-config.md)
- [处理出错的 DDL 语句](/dm/handle-failed-ddl-statements.md)
- [手动处理 Sharding DDL Lock](/dm/manually-handling-sharding-ddl-locks.md)
- [管理迁移表的表结构](/dm/dm-manage-schema.md)
- [处理告警](/dm/dm-handle-alerts.md)
- [日常巡检](/dm/dm-daily-check.md)
- 使用场景
- [从 Aurora 迁移数据到 TiDB](/dm/migrate-from-mysql-aurora.md)
- [TiDB 表结构存在更多列的迁移场景](/dm/usage-scenario-downstream-more-columns.md)
- [变更同步的 MySQL 实例](/dm/usage-scenario-master-slave-switch.md)
- 故障处理
- [故障及处理方法](/dm/dm-error-handling.md)
- [性能问题及处理方法](/dm/dm-handle-performance-issues.md)
- 性能调优
- [配置调优](/dm/dm-tune-configuration.md)
- 参考指南
- 架构
- [DM 架构简介](/dm/dm-arch.md)
- [DM-worker 简介](/dm/dm-worker-intro.md)
- [DM 命令行参数](/dm/dm-command-line-flags.md)
- 配置
- [概述](/dm/dm-config-overview.md)
- [DM-master 配置](/dm/dm-master-configuration-file.md)
- [DM-worker 配置](/dm/dm-worker-configuration-file.md)
- [上游数据库配置](/dm/dm-source-configuration-file.md)
- [数据迁移任务配置向导](/dm/dm-task-configuration-guide.md)
- 安全
- [为 DM 的连接开启加密传输](/dm/dm-enable-tls.md)
- [生成自签名证书](/dm/dm-generate-self-signed-certificates.md)
- [监控指标](/dm/monitor-a-dm-cluster.md)
- [告警信息](/dm/dm-alert-rules.md)
- [错误码](/dm/dm-error-handling.md#常见故障处理方法)
- [常见问题](/dm/dm-faq.md)
- [术语表](/dm/dm-glossary.md)
- [版本发布历史](/dm/dm-release-notes.md)
- Backup & Restore (BR)
- [BR 工具简介](/br/backup-and-restore-tool.md)
- [使用 BR 命令行备份恢复](/br/use-br-command-line-tool.md)
Expand Down Expand Up @@ -544,21 +646,6 @@
- TiFlash
- [TiFlash 简介](/tiflash/tiflash-overview.md)
- [使用 TiFlash](/tiflash/use-tiflash.md)
- TiUP
- [文档地图](/tiup/tiup-documentation-guide.md)
- [概览](/tiup/tiup-overview.md)
- [术语及核心概念](/tiup/tiup-terminology-and-concepts.md)
- [TiUP 组件管理](/tiup/tiup-component-management.md)
- [FAQ](/tiup/tiup-faq.md)
- [故障排查](/tiup/tiup-troubleshooting-guide.md)
- [参考手册](/tiup/tiup-reference.md)
- [TiDB 集群拓扑文件配置](/tiup/tiup-cluster-topology-reference.md)
- [TiUP 镜像参考指南](/tiup/tiup-mirror-reference.md)
- TiUP 组件文档
- [tiup-playground 运行本地测试集群](/tiup/tiup-playground.md)
- [tiup-cluster 部署运维生产集群](/tiup/tiup-cluster.md)
- [tiup-mirror 定制离线镜像](/tiup/tiup-mirror.md)
- [tiup-bench 进行 TPCC/TPCH 压力测试](/tiup/tiup-bench.md)
- [遥测](/telemetry.md)
- [错误码](/error-codes.md)
- [通过拓扑 label 进行副本调度](/schedule-replicas-by-topology-labels.md)
Expand All @@ -577,21 +664,25 @@
- v5.3
- [5.3.0](/releases/release-5.3.0.md)
- v5.2
- [5.2.3](/releases/release-5.2.3.md)
- [5.2.2](/releases/release-5.2.2.md)
- [5.2.1](/releases/release-5.2.1.md)
- [5.2.0](/releases/release-5.2.0.md)
- v5.1
- [5.1.3](/releases/release-5.1.3.md)
- [5.1.2](/releases/release-5.1.2.md)
- [5.1.1](/releases/release-5.1.1.md)
- [5.1.0](/releases/release-5.1.0.md)
- v5.0
- [5.0.5](/releases/release-5.0.5.md)
- [5.0.4](/releases/release-5.0.4.md)
- [5.0.3](/releases/release-5.0.3.md)
- [5.0.2](/releases/release-5.0.2.md)
- [5.0.1](/releases/release-5.0.1.md)
- [5.0 GA](/releases/release-5.0.0.md)
- [5.0.0-rc](/releases/release-5.0.0-rc.md)
- v4.0
- [4.0.16](/releases/release-4.0.16.md)
- [4.0.15](/releases/release-4.0.15.md)
- [4.0.14](/releases/release-4.0.14.md)
- [4.0.13](/releases/release-4.0.13.md)
Expand Down
Loading

0 comments on commit 80551aa

Please sign in to comment.