Skip to content

Commit

Permalink
en, zh: Add telemetry notes (#511)
Browse files Browse the repository at this point in the history
* Add telemetry notes

* 理解和改善产品 -> 改善产品

* Add EN doc

* Fix some links

* Address comments

* Sync changes from CN doc

* Sync changes from docs

Co-authored-by: DanielZhangQD <[email protected]>
  • Loading branch information
breezewish and DanielZhangQD authored Jun 30, 2020
1 parent e1097d4 commit c8ecf56
Show file tree
Hide file tree
Showing 16 changed files with 62 additions and 7 deletions.
2 changes: 1 addition & 1 deletion en/access-dashboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ aliases: ['/docs/tidb-in-kubernetes/dev/access-dashboard/']

# Access TiDB Dashboard

TiDB Dashboard is a visualized tool in TiDB 4.0 used to monitor and diagnose the TiDB cluster. For details, see [TiDB Dashboard](https://github.com/pingcap-incubator/tidb-dashboard).
TiDB Dashboard is a visualized tool in TiDB 4.0 used to monitor and diagnose the TiDB cluster. For details, see [TiDB Dashboard](https://docs.pingcap.com/tidb/stable/dashboard-intro).

This document describes how to access TiDB Dashboard in Kubernetes.

Expand Down
4 changes: 4 additions & 0 deletions en/deploy-on-alibaba-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,10 @@ mysql -h ${tidb_lb_ip} -P 4000 -u root

`tidb_lb_ip` is the LoadBalancer IP of the TiDB service.

> **Note:**
>
> By default, TiDB (starting from v4.0.2) periodically shares usage details with PingCAP to help understand how to improve the product. For details about what is shared and how to disable the sharing, see [Telemetry](https://docs.pingcap.com/tidb/stable/telemetry).

## Monitor

Visit `<monitor-lb>:3000` to view the Grafana dashboards. `monitor-lb` is the LoadBalancer IP of the Monitor service.
Expand Down
4 changes: 4 additions & 0 deletions en/deploy-on-aws-eks.md
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,10 @@ You can interact with the EKS cluster using `kubectl` and `helm` with the kubeco
helm ls
```

> **Note:**
>
> By default, TiDB (starting from v4.0.2) periodically shares usage details with PingCAP to help understand how to improve the product. For details about what is shared and how to disable the sharing, see [Telemetry](https://docs.pingcap.com/tidb/stable/telemetry).

## Monitor

You can access the `<monitor-lb>:3000` address (printed in outputs) using your web browser to view monitoring metrics.
Expand Down
4 changes: 4 additions & 0 deletions en/deploy-on-gcp-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ This section describes how to deploy a TiDB cluster.
kubectl --kubeconfig credentials/kubeconfig_${gke_name} create -f db-monitor.yaml -n ${namespace}
```
> **Note:**
>
> By default, TiDB (starting from v4.0.2) periodically shares usage details with PingCAP to help understand how to improve the product. For details about what is shared and how to disable the sharing, see [Telemetry](https://docs.pingcap.com/tidb/stable/telemetry).
## Access the TiDB database
After `terraform apply` is successful executed, perform the following steps to access the TiDB cluster. Replace the `${}` section with the output of running `terraform apply` above.
Expand Down
4 changes: 4 additions & 0 deletions en/deploy-on-general-kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,7 @@ Different clusters can be in the same or different `namespace`, which is based o
## Initialize TiDB cluster

If you want to initialize your cluster after deployment, refer to [Initialize a TiDB Cluster in Kubernetes](initialize-a-cluster.md).

> **Note:**
>
> By default, TiDB (starting from v4.0.2) periodically shares usage details with PingCAP to help understand how to improve the product. For details about what is shared and how to disable the sharing, see [Telemetry](https://docs.pingcap.com/tidb/stable/telemetry).
4 changes: 4 additions & 0 deletions en/deploy-tidb-from-kubernetes-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,10 @@ SET PASSWORD FOR 'root'@'%' = '<change-to-your-password>';
Congratulations, you are now up and running with a distributed TiDB database compatible with MySQL!
> **Note:**
>
> By default, TiDB (starting from v4.0.2) periodically shares usage details with PingCAP to help understand how to improve the product. For details about what is shared and how to disable the sharing, see [Telemetry](https://docs.pingcap.com/tidb/stable/telemetry).
## Scale out the TiDB cluster
To scale out the TiDB cluster, modify `spec.pd.replicas`, `spec.tidb.replicas`, and `spec.tikv.replicas` in the `TidbCluster` object of the cluster to your desired value using kubectl.
Expand Down
4 changes: 4 additions & 0 deletions en/upgrade-tidb-operator.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,7 @@ This document describes how to upgrade TiDB Operator and Kubernetes.
## Upgrade TiDB Operator from v1.0 to v1.1 or later releases

Since TiDB Operator v1.1.0, PingCAP no longer updates or maintains the tidb-cluster chart. The components and features that have been managed using the tidb-cluster chart will be managed by CR (Custom Resource) or dedicated charts in v1.1. For more details, refer to [TiDB Operator v1.1 Notes](notes-tidb-operator-v1.1.md).

> **Note:**
>
> By default, TiDB (starting from v4.0.2) periodically shares usage details with PingCAP to help understand how to improve the product. For details about what is shared and how to disable the sharing, see [Telemetry](https://docs.pingcap.com/tidb/stable/telemetry).
5 changes: 2 additions & 3 deletions zh/access-dashboard.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ category: how-to

# TiDB Dashboard 指南

TiDB Dashboard 是 TiDB 4.0 专门用来帮助观察与诊断整个 TiDB 集群的可视化面板,你可以在 [TiDB Dashboard](https://github.com/pingcap-incubator/tidb-dashboard) 了解详情。本篇文章将介绍如何在 Kubernetes 环境下访问 TiDB Dashboard。
TiDB Dashboard 是 TiDB 4.0 专门用来帮助观察与诊断整个 TiDB 集群的可视化面板,你可以在 [TiDB Dashboard](https://docs.pingcap.com/zh/tidb/stable/dashboard-intro) 了解详情。本篇文章将介绍如何在 Kubernetes 环境下访问 TiDB Dashboard。

## 前置条件

Expand All @@ -26,7 +26,7 @@ spec:
> **注意:**
>
> 以下教程仅为演示如何快速访问 TiDB Dashboard,请勿在生产环境中直接使用以下方法。
> 以下教程仅为演示如何快速访问 TiDB Dashboard,请勿在生产环境中直接使用以下方法。
`TiDB Dashboard` 目前在 4.0.0 版本及以上中已经内嵌在了 PD 组件中,你可以通过以下的例子在 Kubernetes 环境下快速部署一个 4.0.1 版本的 TiDB 集群。运行 `kubectl apply -f` 命令,将以下 yaml 文件部署到 Kubernetes 集群中。

Expand Down Expand Up @@ -58,7 +58,6 @@ spec:
service:
type: ClusterIP
config: {}
```

当集群创建完毕时,你可以通过以下指令将 `TiDB Dashboard` 暴露在本地机器:
Expand Down
4 changes: 4 additions & 0 deletions zh/deploy-on-alibaba-cloud.md
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ mysql -h ${tidb_lb_ip} -P 4000 -u root

`tidb_lb_ip` 为 TiDB Service 的 LoadBalancer IP。

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。

## 监控

你可以通过浏览器访问 `<monitor-lb>:3000` 地址查看 Grafana 监控指标。
Expand Down
8 changes: 6 additions & 2 deletions zh/deploy-on-aws-eks.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
title: 在 AWS EKS 上部署 TiDB
title: 在 AWS EKS 上部署 TiDB
summary: 介绍如何在 AWS EKS (Elastic Kubernetes Service) 上部署 TiDB 集群。
category: how-to
---
Expand Down Expand Up @@ -494,6 +494,10 @@ mysql -h ${tidb_lb} -P 4000 -u root
helm ls
```

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。

## Grafana 监控

你可以通过浏览器访问 `<monitor-lb>:3000` 地址查看 Grafana 监控指标。
Expand Down Expand Up @@ -692,7 +696,7 @@ module "tidb-cluster-b" {
providers = {
helm = "helm.eks"
}
cluster_name = "tidb-cluster-b"
eks = module.tidb-operator.eks
ssh_key_name = module.key-pair.key_name
Expand Down
4 changes: 4 additions & 0 deletions zh/deploy-on-gcp-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ Terraform 自动加载和填充匹配 `terraform.tfvars` 或 `*.auto.tfvars` 文
kubectl --kubeconfig credentials/kubeconfig_${gke_name} create -f db-monitor.yaml -n ${namespace}
```

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。

## 访问 TiDB 数据库

`terraform apply` 运行完成后,可执行以下步骤来访问 TiDB 数据库。注意用[部署 TiDB 集群](#部署-tidb-集群)小节的输出信息替换 `${}` 部分的内容。
Expand Down
4 changes: 4 additions & 0 deletions zh/deploy-on-general-kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,7 @@ TiDB Operator 部署并配置完成后,可以通过下面命令部署 TiDB 集
### 初始化 TiDB 集群

如果要在部署完 TiDB 集群后做一些初始化工作,参考 [Kubernetes 上的集群初始化配置](initialize-a-cluster.md)进行配置。

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。
4 changes: 4 additions & 0 deletions zh/deploy-tidb-from-kubernetes-gke.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@ SET PASSWORD FOR 'root'@'%' = '<change-to-your-password>';
恭喜,你已经启动并运行一个兼容 MySQL 的分布式 TiDB 数据库!
> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。
## 扩容 TiDB 集群
使用 kubectl 修改集群所对应的 `TidbCluster` 对象中的 `spec.pd.replicas``spec.tidb.replicas``spec.tikv.replicas` 至期望值进行水平扩容。
Expand Down
6 changes: 5 additions & 1 deletion zh/deploy-tidb-from-kubernetes-kind.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ chmod +x ./kind
测试集群是否创建成功:

```
kubectl cluster-info
kubectl cluster-info
```

## 第 2 步:部署 TiDB Operator
Expand Down Expand Up @@ -184,6 +184,10 @@ kubectl -n pingcap get pods
>
> 然后,在浏览器中打开 `http://<远程主机 IP>:3000` 访问 Grafana 监控面板。

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。

## 删除 TiDB 集群 与 Kubernetes 集群

要删除 TiDB 集群,执行以下命令:
Expand Down
4 changes: 4 additions & 0 deletions zh/deploy-tidb-from-kubernetes-minikube.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ kubectl get svc -n demo --watch
mysql -h 127.0.0.1 -P 4000 -uroot -e 'select tidb_version();'
```

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。

## 监控 TiDB 集群

按照以下步骤监控 TiDB 集群状态:
Expand Down
4 changes: 4 additions & 0 deletions zh/upgrade-a-tidb-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,7 @@ helm upgrade ${release_name} pingcap/tidb-cluster -f values.yaml --version=${cha
> ```shell
> kubectl annotate tc ${release_name} -n ${namespace} tidb.pingcap.com/force-upgrade-
> ```

> **注意:**
>
> TiDB(v4.0.2 起)默认会定期收集使用情况信息,并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为,请参见[遥测](https://docs.pingcap.com/zh/tidb/stable/telemetry)。

0 comments on commit c8ecf56

Please sign in to comment.