From a9f7d430e78df338293172e2ae4eb12457a8d091 Mon Sep 17 00:00:00 2001 From: liubo Date: Mon, 21 Oct 2019 17:50:16 +0800 Subject: [PATCH 1/5] update manual deploy monitor --- dev/how-to/monitor/monitor-a-cluster.md | 2 +- v3.0/how-to/monitor/monitor-a-cluster.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/how-to/monitor/monitor-a-cluster.md b/dev/how-to/monitor/monitor-a-cluster.md index 3b4c1af035cc..8ceea58fd003 100644 --- a/dev/how-to/monitor/monitor-a-cluster.md +++ b/dev/how-to/monitor/monitor-a-cluster.md @@ -314,7 +314,7 @@ url = https://grafana.net 3. 点击 **Upload .json File** 上传对应的 JSON 文件（下载 [TiDB Grafana 配置文件](https://github.com/pingcap/tidb-ansible/tree/master/scripts))。 - > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_pull.json`，`pd.json`，`tidb.json`。 + > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tidb_summary.json`，`tikv_details.json`，`tikv_summary.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 4. 点击 **Load**。 diff --git a/v3.0/how-to/monitor/monitor-a-cluster.md b/v3.0/how-to/monitor/monitor-a-cluster.md index 2f4e4d9d85b5..1ba1675c81fb 100644 --- a/v3.0/how-to/monitor/monitor-a-cluster.md +++ b/v3.0/how-to/monitor/monitor-a-cluster.md @@ -315,7 +315,7 @@ url = https://grafana.net 3. 点击 **Upload .json File** 上传对应的 JSON 文件（下载 [TiDB Grafana 配置文件](https://github.com/pingcap/tidb-ansible/tree/master/scripts))。 - > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_pull.json`，`pd.json`，`tidb.json`。 + > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tidb_summary.json`，`tikv_details.json`，`tikv_summary.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 4. 点击 **Load**。 From d292f1181c082b8a45bd3f73346b4b88b88aa6a8 Mon Sep 17 00:00:00 2001 From: liubo Date: Tue, 22 Oct 2019 10:46:36 +0800 Subject: [PATCH 2/5] Update dev/how-to/monitor/monitor-a-cluster.md Co-Authored-By: Lilian Lee --- dev/how-to/monitor/monitor-a-cluster.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/how-to/monitor/monitor-a-cluster.md b/dev/how-to/monitor/monitor-a-cluster.md index 8ceea58fd003..2998955e63c1 100644 --- a/dev/how-to/monitor/monitor-a-cluster.md +++ b/dev/how-to/monitor/monitor-a-cluster.md @@ -314,7 +314,7 @@ url = https://grafana.net 3. 点击 **Upload .json File** 上传对应的 JSON 文件（下载 [TiDB Grafana 配置文件](https://github.com/pingcap/tidb-ansible/tree/master/scripts))。 - > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tidb_summary.json`，`tikv_details.json`，`tikv_summary.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 + > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_summary.json`，`tikv_details.json`，`tikv_trouble_shooting.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 4. 点击 **Load**。 From cb545c0e6ca9b130efc0ca6722ef360524aa114f Mon Sep 17 00:00:00 2001 From: liubo Date: Tue, 22 Oct 2019 10:46:43 +0800 Subject: [PATCH 3/5] Update v3.0/how-to/monitor/monitor-a-cluster.md Co-Authored-By: Lilian Lee --- v3.0/how-to/monitor/monitor-a-cluster.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3.0/how-to/monitor/monitor-a-cluster.md b/v3.0/how-to/monitor/monitor-a-cluster.md index 1ba1675c81fb..caebea7782ed 100644 --- a/v3.0/how-to/monitor/monitor-a-cluster.md +++ b/v3.0/how-to/monitor/monitor-a-cluster.md @@ -315,7 +315,7 @@ url = https://grafana.net 3. 点击 **Upload .json File** 上传对应的 JSON 文件（下载 [TiDB Grafana 配置文件](https://github.com/pingcap/tidb-ansible/tree/master/scripts))。 - > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tidb_summary.json`，`tikv_details.json`，`tikv_summary.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 + > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_summary.json`，`tikv_details.json`，`tikv_trouble_shooting.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 4. 点击 **Load**。 From de2334bcde7448c8c0a1bf3e6409c7af6856f5b3 Mon Sep 17 00:00:00 2001 From: liubo Date: Wed, 23 Oct 2019 11:43:22 +0800 Subject: [PATCH 4/5] Update dev/how-to/monitor/monitor-a-cluster.md Co-Authored-By: Lilian Lee --- dev/how-to/monitor/monitor-a-cluster.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/how-to/monitor/monitor-a-cluster.md b/dev/how-to/monitor/monitor-a-cluster.md index 2998955e63c1..085f4de5e4af 100644 --- a/dev/how-to/monitor/monitor-a-cluster.md +++ b/dev/how-to/monitor/monitor-a-cluster.md @@ -314,7 +314,9 @@ url = https://grafana.net 3. 点击 **Upload .json File** 上传对应的 JSON 文件（下载 [TiDB Grafana 配置文件](https://github.com/pingcap/tidb-ansible/tree/master/scripts))。 - > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_summary.json`，`tikv_details.json`，`tikv_trouble_shooting.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 + > **注意：** + > + > TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_summary.json`，`tikv_details.json`，`tikv_trouble_shooting.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 4. 点击 **Load**。 From 853dc88d439e4c2b045022150e179d3a5cb9d9f2 Mon Sep 17 00:00:00 2001 From: liubo Date: Wed, 23 Oct 2019 11:43:34 +0800 Subject: [PATCH 5/5] Update v3.0/how-to/monitor/monitor-a-cluster.md Co-Authored-By: Lilian Lee --- v3.0/how-to/monitor/monitor-a-cluster.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/v3.0/how-to/monitor/monitor-a-cluster.md b/v3.0/how-to/monitor/monitor-a-cluster.md index caebea7782ed..a742abfab5a3 100644 --- a/v3.0/how-to/monitor/monitor-a-cluster.md +++ b/v3.0/how-to/monitor/monitor-a-cluster.md @@ -315,7 +315,9 @@ url = https://grafana.net 3. 点击 **Upload .json File** 上传对应的 JSON 文件（下载 [TiDB Grafana 配置文件](https://github.com/pingcap/tidb-ansible/tree/master/scripts))。 - > **注意**：TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_summary.json`，`tikv_details.json`，`tikv_trouble_shooting.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 + > **注意：** + > + > TiKV、PD 和 TiDB 面板对应的 JSON 文件分别为 `tikv_summary.json`，`tikv_details.json`，`tikv_trouble_shooting.json`，`pd.json`，`tidb.json`，`tidb_summary.json`。 4. 点击 **Load**。