pingcap · ti-chi-bot · Jul 30, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/en/deploy-on-aws-eks.md b/en/deploy-on-aws-eks.md
@@ -721,3 +721,15 @@ Depending on the EKS cluster status, use different commands:
 Finally, execute `kubectl -n tidb-cluster apply -f tidb-cluster.yaml` to update the TiDB cluster configuration.
 
 For detailed CR configuration, refer to [API references](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md) and [Configure a TiDB Cluster](configure-a-tidb-cluster.md).
+
+## Configure TiDB monitor
+
+Please see [Deploy Monitoring and Alerts for a TiDB Cluster](monitor-a-tidb-cluster.md).
+
+> **Note：**
+>
+> TiDB monitor don't persist data by default，it is recommended to [persist monitoring data](monitor-a-tidb-cluster.md#persist-monitoring-data). TiDB monitor don't have POD's CPU, memory, disk metrics, also don't have alert manager, it is recommended to [Set kube-prometheus and AlertManager](monitor-a-tidb-cluster.md#set-kube-prometheus-and-alertmanager).
+
+## Log Collection
+
+The system and application logs can be useful for troubleshooting issues and automating operations, The TiDB components output the logs in the stdout and stderr of the container by default, and be auto rotated accord to container runtime, when POD restarted log will lost, it is recommended to [Collect logs of TiDB and related components](logs-collection.md).
diff --git a/en/deploy-on-azure-aks.md b/en/deploy-on-azure-aks.md
@@ -584,3 +584,15 @@ For instance types that provide local disks, refer to [Lsv2-series](https://docs
     Add the `tikv.storageClassName` field to the `tidb-cluster.yaml` file and set the value of the field to `local-storage`.
 
     For more information, refer to [Deploy TiDB cluster and its monitoring components](#deploy)
+
+## Configure TiDB monitor
+
+Please see [Deploy Monitoring and Alerts for a TiDB Cluster](monitor-a-tidb-cluster.md).
+
+> **Note：**
+>
+> TiDB monitor don't persist data by default，it is recommended to [persist monitoring data](monitor-a-tidb-cluster.md#persist-monitoring-data). TiDB monitor don't have POD's CPU, memory, disk metrics, also don't have alert manager, it is recommended to [Set kube-prometheus and AlertManager](monitor-a-tidb-cluster.md#set-kube-prometheus-and-alertmanager).
+
+## Log Collection
+
+The system and application logs can be useful for troubleshooting issues and automating operations, The TiDB components output the logs in the stdout and stderr of the container by default, and be auto rotated accord to container runtime, when POD restarted log will lost, it is recommended to [Collect logs of TiDB and related components](logs-collection.md).
diff --git a/en/deploy-on-gcp-gke.md b/en/deploy-on-gcp-gke.md
@@ -469,3 +469,15 @@ The two components are *not required* in the deployment. This section shows a qu
 Finally, execute `kubectl -n tidb-cluster apply -f tidb-cluster.yaml` to update the TiDB cluster configuration.
 
 For detailed CR configuration, refer to [API references](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md) and [Configure a TiDB Cluster](configure-a-tidb-cluster.md).
+
+## Configure TiDB monitor
+
+Please see [Deploy Monitoring and Alerts for a TiDB Cluster](monitor-a-tidb-cluster.md).
+
+> **Note：**
+>
+> TiDB monitor don't persist data by default，it is recommended to [persist monitoring data](monitor-a-tidb-cluster.md#persist-monitoring-data). TiDB monitor don't have POD's CPU, memory, disk metrics, also don't have alert manager, it is recommended to [Set kube-prometheus and AlertManager](monitor-a-tidb-cluster.md#set-kube-prometheus-and-alertmanager).
+
+## Log Collection
+
+The system and application logs can be useful for troubleshooting issues and automating operations, The TiDB components output the logs in the stdout and stderr of the container by default, and be auto rotated accord to container runtime, when POD restarted log will lost, it is recommended to [Collect logs of TiDB and related components](logs-collection.md).
diff --git a/en/deploy-on-general-kubernetes.md b/en/deploy-on-general-kubernetes.md
@@ -133,3 +133,15 @@ If you want to initialize your cluster after deployment, refer to [Initialize a
 > **Note:**
 >
 > By default, TiDB (versions starting from v4.0.2 and released before February 20, 2023) 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). Starting from February 20, 2023, the telemetry feature is disabled by default in newly released TiDB versions. See [TiDB Release Timeline](https://docs.pingcap.com/tidb/stable/release-timeline) for details.
+
+## Configure TiDB monitor
+
+Please see [Deploy Monitoring and Alerts for a TiDB Cluster](monitor-a-tidb-cluster.md).
+
+> **Note：**
+>
+> TiDB monitor don't persist data by default，it is recommended to [persist monitoring data](monitor-a-tidb-cluster.md#persist-monitoring-data). TiDB monitor don't have POD's CPU, memory, disk metrics, also don't have alert manager, it is recommended to [Set kube-prometheus and AlertManager](monitor-a-tidb-cluster.md#set-kube-prometheus-and-alertmanager).
+
+## Log Collection
+
+The system and application logs can be useful for troubleshooting issues and automating operations, The TiDB components output the logs in the stdout and stderr of the container by default, and be auto rotated accord to container runtime, when POD restarted log will lost, it is recommended to [Collect logs of TiDB and related components](logs-collection.md).
diff --git a/zh/deploy-on-aws-eks.md b/zh/deploy-on-aws-eks.md
@@ -703,3 +703,15 @@ spec:
 最后使用 `kubectl -n tidb-cluster apply -f tidb-cluster.yaml` 更新 TiDB 集群配置。
 
 更多可参考 [API 文档](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md)和[集群配置文档](configure-a-tidb-cluster.md)完成 CR 文件配置。
+
+## 配置 TiDB 监控
+
+请参阅[部署 TiDB 集群监控与告警](monitor-a-tidb-cluster.md)。
+
+> **注意：**
+>
+> TiDB 监控默认不会持久化数据，建议[持久化监控数据](monitor-a-tidb-cluster.md#持久化监控数据)。 TiDB 监控不包含 POD 的 CPU、内存、磁盘监控，也没有报警系统，建议[设置 kube-prometheus 与 AlertManager](monitor-a-tidb-cluster.md#设置-kube-prometheus-与-alertmanager)。
+
+## 日志收集
+
+系统与程序的运行日志对排查问题以及实现一些自动化操作可能非常有用，TiDB 各组件默认将日志输出在容器的 `stdout` 和 `stderr` 中，并依据容器运行时环境自动进行日志的滚动清理，当 POD 发生重启时容器日志会丢失，建议[收集 TiDB 及相关组件日志](logs-collection.md)。
diff --git a/zh/deploy-on-azure-aks.md b/zh/deploy-on-azure-aks.md
@@ -569,3 +569,15 @@ Azure Disk 支持多种磁盘类型。若需要低延迟、高吞吐，可以选
 3. 使用本地存储。
 
     完成前面步骤后，local-volume-provisioner 即可发现集群内所有本地 NVMe SSD 盘。在 tidb-cluster.yaml 中添加 `tikv.storageClassName` 字段并设置为 `local-storage` 即可，可以参考前文[部署 TiDB 集群和监控](#部署-tidb-集群和监控)部分。
+
+## 配置 TiDB 监控
+
+请参阅[部署 TiDB 集群监控与告警](monitor-a-tidb-cluster.md)。
+
+> **注意：**
+>
+> TiDB 监控默认不会持久化数据，建议[持久化监控数据](monitor-a-tidb-cluster.md#持久化监控数据)。 TiDB 监控不包含 POD 的 CPU、内存、磁盘监控，也没有报警系统，建议[设置 kube-prometheus 与 AlertManager](monitor-a-tidb-cluster.md#设置-kube-prometheus-与-alertmanager)。
+
+## 日志收集
+
+系统与程序的运行日志对排查问题以及实现一些自动化操作可能非常有用，TiDB 各组件默认将日志输出在容器的 `stdout` 和 `stderr` 中，并依据容器运行时环境自动进行日志的滚动清理，当 POD 发生重启时容器日志会丢失，建议[收集 TiDB 及相关组件日志](logs-collection.md)。
diff --git a/zh/deploy-on-gcp-gke.md b/zh/deploy-on-gcp-gke.md
@@ -448,3 +448,15 @@ spec:
 最后使用 `kubectl -n tidb-cluster apply -f tidb-cluster.yaml` 更新 TiDB 集群配置。
 
 更多可参考 [API 文档](https://github.com/pingcap/tidb-operator/blob/v1.6.0/docs/api-references/docs.md)和[集群配置文档](configure-a-tidb-cluster.md)完成 CR 文件配置。
+
+## 配置 TiDB 监控
+
+请参阅[部署 TiDB 集群监控与告警](monitor-a-tidb-cluster.md)。
+
+> **注意：**
+>
+> TiDB 监控默认不会持久化数据，建议[持久化监控数据](monitor-a-tidb-cluster.md#持久化监控数据)。 TiDB 监控不包含 POD 的 CPU、内存、磁盘监控，也没有报警系统，建议[设置 kube-prometheus 与 AlertManager](monitor-a-tidb-cluster.md#设置-kube-prometheus-与-alertmanager)。
+
+## 日志收集
+
+系统与程序的运行日志对排查问题以及实现一些自动化操作可能非常有用，TiDB 各组件默认将日志输出在容器的 `stdout` 和 `stderr` 中，并依据容器运行时环境自动进行日志的滚动清理，当 POD 发生重启时容器日志会丢失，建议[收集 TiDB 及相关组件日志](logs-collection.md)。
diff --git a/zh/deploy-on-general-kubernetes.md b/zh/deploy-on-general-kubernetes.md
@@ -133,3 +133,15 @@ aliases: ['/docs-cn/tidb-in-kubernetes/dev/deploy-on-general-kubernetes/','/zh/t
 > **注意：**
 >
 > TiDB（v4.0.2 起且发布于 2023 年 2 月 20 日前的版本）默认会定期收集使用情况信息，并将这些信息分享给 PingCAP 用于改善产品。若要了解所收集的信息详情及如何禁用该行为，请参见 [TiDB 遥测功能使用文档](https://docs.pingcap.com/zh/tidb/stable/telemetry)。自 2023 年 2 月 20 日起，新发布的 TiDB 版本默认不再收集使用情况信息分享给 PingCAP，参见 [TiDB 版本发布时间线](https://docs.pingcap.com/zh/tidb/stable/release-timeline)。
+
+## 配置 TiDB 监控
+
+请参阅[部署 TiDB 集群监控与告警](monitor-a-tidb-cluster.md)。
+
+> **注意：**
+>
+> TiDB 监控默认不会持久化数据，建议[持久化监控数据](monitor-a-tidb-cluster.md#持久化监控数据)。 TiDB 监控不包含 POD 的 CPU、内存、磁盘监控，也没有报警系统，建议[设置 kube-prometheus 与 AlertManager](monitor-a-tidb-cluster.md#设置-kube-prometheus-与-alertmanager)。
+
+## 日志收集
+
+系统与程序的运行日志对排查问题以及实现一些自动化操作可能非常有用，TiDB 各组件默认将日志输出在容器的 `stdout` 和 `stderr` 中，并依据容器运行时环境自动进行日志的滚动清理，当 POD 发生重启时容器日志会丢失，建议[收集 TiDB 及相关组件日志](logs-collection.md)。