From 2a2ec905fba1c55403fc1016c0f9ad93037c0b78 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Thu, 18 Jul 2024 11:15:17 +0800 Subject: [PATCH 1/5] Add temp.md --- temp.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 temp.md diff --git a/temp.md b/temp.md new file mode 100644 index 0000000000000..af27ff4986a7b --- /dev/null +++ b/temp.md @@ -0,0 +1 @@ +This is a test file. \ No newline at end of file From 899379e1417c1d7d0dd0e624701ba54883fc1088 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Thu, 18 Jul 2024 11:15:22 +0800 Subject: [PATCH 2/5] Delete temp.md --- temp.md | 1 - 1 file changed, 1 deletion(-) delete mode 100644 temp.md diff --git a/temp.md b/temp.md deleted file mode 100644 index af27ff4986a7b..0000000000000 --- a/temp.md +++ /dev/null @@ -1 +0,0 @@ -This is a test file. \ No newline at end of file From 0bb524d0f9aa2107e95709dc576709f073035f2c Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Thu, 18 Jul 2024 17:52:30 +0800 Subject: [PATCH 3/5] add translation --- deploy-monitoring-services.md | 12 ++++++------ upgrade-tidb-using-tiup.md | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy-monitoring-services.md b/deploy-monitoring-services.md index 6c91115edd658..2a1e57acb3219 100644 --- a/deploy-monitoring-services.md +++ b/deploy-monitoring-services.md @@ -29,18 +29,18 @@ Assume that the TiDB cluster topology is as follows: ```bash # Downloads the package. -wget https://download.pingcap.org/prometheus-2.27.1.linux-amd64.tar.gz +wget https://github.com/prometheus/prometheus/releases/download/v2.49.1/prometheus-2.49.1.linux-amd64.tar.gz wget https://download.pingcap.org/node_exporter-v1.3.1-linux-amd64.tar.gz -wget https://download.pingcap.org/grafana-7.5.11.linux-amd64.tar.gz +wget https://download.pingcap.org/grafana-7.5.17.linux-amd64.tar.gz ``` {{< copyable "shell-regular" >}} ```bash # Extracts the package. -tar -xzf prometheus-2.27.1.linux-amd64.tar.gz +tar -xzf prometheus-2.49.1.linux-amd64.tar.gz tar -xzf node_exporter-v1.3.1-linux-amd64.tar.gz -tar -xzf grafana-7.5.11.linux-amd64.tar.gz +tar -xzf grafana-7.5.17.linux-amd64.tar.gz ``` ### Step 2: Start `node_exporter` on Node1, Node2, Node3, and Node4 @@ -62,7 +62,7 @@ Edit the Prometheus configuration file: {{< copyable "shell-regular" >}} ```bash -cd prometheus-2.27.1.linux-amd64 && +cd prometheus-2.49.1.linux-amd64 && vi prometheus.yml ``` @@ -135,7 +135,7 @@ Edit the Grafana configuration file: {{< copyable "shell-regular" >}} ```ini -cd grafana-7.5.11 && +cd grafana-7.5.17 && vi conf/grafana.ini ... diff --git a/upgrade-tidb-using-tiup.md b/upgrade-tidb-using-tiup.md index a1e006545d969..3b8439b46e582 100644 --- a/upgrade-tidb-using-tiup.md +++ b/upgrade-tidb-using-tiup.md @@ -67,7 +67,7 @@ There are some other [limitations on user operations](/smooth-upgrade-tidb.md#li - Support upgrading the versions of TiDB Binlog, TiCDC, TiFlash, and other components. - When upgrading TiFlash from versions earlier than v6.3.0 to v6.3.0 and later versions, note that the CPU must support the AVX2 instruction set under the Linux AMD64 architecture and the ARMv8 instruction set architecture under the Linux ARM64 architecture. For details, see the description in [v6.3.0 Release Notes](/releases/release-6.3.0.md#others). - For detailed compatibility changes of different versions, see the [Release Notes](/releases/release-notes.md) of each version. Modify your cluster configuration according to the "Compatibility Changes" section of the corresponding release notes. -- For clusters that upgrade from versions earlier than v5.3 to v5.3 or later versions, the default deployed Prometheus will upgrade from v2.8.1 to v2.27.1. Prometheus v2.27.1 provides more features and fixes a security issue. Compared with v2.8.1, alert time representation in v2.27.1 is changed. For more details, see [Prometheus commit](https://github.com/prometheus/prometheus/commit/7646cbca328278585be15fa615e22f2a50b47d06) for more details. +- For clusters that upgrade from versions earlier than v5.3 to v5.3 or later versions, the default deployed Prometheus will upgrade from v2.8.1 to v2.27.1. Prometheus v2.27.1 provides more features and fixes a security issue. Compared with v2.8.1, alert time representation in v2.27.1 is changed. For more details, see [Prometheus commit](https://github.com/prometheus/prometheus/commit/7646cbca328278585be15fa615e22f2a50b47d06). ## Preparations From 9122c1ab26553d25255398e6a7726157f02a1c7d Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Tue, 23 Jul 2024 16:46:11 +0800 Subject: [PATCH 4/5] sync from zh changes --- releases/release-8.0.0.md | 2 ++ upgrade-tidb-using-tiup.md | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/releases/release-8.0.0.md b/releases/release-8.0.0.md index 3e3364b840d7d..17136f63eae44 100644 --- a/releases/release-8.0.0.md +++ b/releases/release-8.0.0.md @@ -291,6 +291,8 @@ Quick access: [Quick start](https://docs.pingcap.com/tidb/v8.0/quick-start-with- > > This section provides compatibility changes you need to know when you upgrade from v7.6.0 to the current version (v8.0.0). If you are upgrading from v7.5.0 or earlier versions to the current version, you might also need to check the compatibility changes introduced in intermediate versions. +- Upgrade the default Prometheus version deployed by TiUP from 2.27.1 to 2.49.1. +- Upgrade the default Grafana version deployed by TiUP from 7.5.11 to 7.5.17. - Remove witness-related schedulers that are not GA but are enabled by default [#7765](https://github.com/tikv/pd/pull/7765) @[rleungx](https://github.com/rleungx) ### Behavior changes diff --git a/upgrade-tidb-using-tiup.md b/upgrade-tidb-using-tiup.md index 3b8439b46e582..52b7a231d58a4 100644 --- a/upgrade-tidb-using-tiup.md +++ b/upgrade-tidb-using-tiup.md @@ -67,7 +67,7 @@ There are some other [limitations on user operations](/smooth-upgrade-tidb.md#li - Support upgrading the versions of TiDB Binlog, TiCDC, TiFlash, and other components. - When upgrading TiFlash from versions earlier than v6.3.0 to v6.3.0 and later versions, note that the CPU must support the AVX2 instruction set under the Linux AMD64 architecture and the ARMv8 instruction set architecture under the Linux ARM64 architecture. For details, see the description in [v6.3.0 Release Notes](/releases/release-6.3.0.md#others). - For detailed compatibility changes of different versions, see the [Release Notes](/releases/release-notes.md) of each version. Modify your cluster configuration according to the "Compatibility Changes" section of the corresponding release notes. -- For clusters that upgrade from versions earlier than v5.3 to v5.3 or later versions, the default deployed Prometheus will upgrade from v2.8.1 to v2.27.1. Prometheus v2.27.1 provides more features and fixes a security issue. Compared with v2.8.1, alert time representation in v2.27.1 is changed. For more details, see [Prometheus commit](https://github.com/prometheus/prometheus/commit/7646cbca328278585be15fa615e22f2a50b47d06). +- When updating clusters from versions earlier than v5.3 to v5.3 or later versions, note that there is a time format change in the alerts generated by the default deployed Prometheus. This format change is introduced starting from Prometheus v2.27.1. For more information, see [Prometheus commit](https://github.com/prometheus/prometheus/commit/7646cbca328278585be15fa615e22f2a50b47d06). ## Preparations From cb23e12268089e7589d4eaaf1406a418df7288f1 Mon Sep 17 00:00:00 2001 From: Grace Cai Date: Tue, 23 Jul 2024 17:00:45 +0800 Subject: [PATCH 5/5] add alert rules --- deploy-monitoring-services.md | 18 ++++++++++++++++++ releases/release-8.0.0.md | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/deploy-monitoring-services.md b/deploy-monitoring-services.md index 2a1e57acb3219..188027ff3457d 100644 --- a/deploy-monitoring-services.md +++ b/deploy-monitoring-services.md @@ -112,7 +112,25 @@ scrape_configs: - '192.168.199.118:20180' ... +``` + +To enable alarm rules for components such as TiDB, PD, and TiKV, download the alarm rule files of the corresponding components separately, and then add the configurations of alarm rule files to the Prometheus configuration file. +- TiDB: [`tidb.rules.yml`](https://github.com/pingcap/tidb/blob/master/pkg/metrics/alertmanager/tidb.rules.yml) +- PD: [`pd.rules.yml`](https://github.com/tikv/pd/blob/master/metrics/alertmanager/pd.rules.yml) +- TiKV: [`tikv.rules.yml`](https://github.com/tikv/tikv/blob/master/metrics/alertmanager/tikv.rules.yml) +- TiFlash: [`tiflash.rules.yml`](https://github.com/pingcap/tiflash/blob/master/metrics/alertmanager/tiflash.rules.yml) +- TiCDC: [`ticdc.rules.yml`](https://github.com/pingcap/tiflow/blob/master/metrics/alertmanager/ticdc.rules.yml) +- TiDB Lightning: [`lightning.rules.yml`](https://github.com/pingcap/tidb/blob/master/br/metrics/alertmanager/lightning.rules.yml) + +```ini +rule_files: + - 'tidb.rules.yml' + - 'pd.rules.yml' + - 'tikv.rules.yml' + - 'tiflash.rules.yml' + - 'ticdc.rules.yml' + - 'lightning.rules.yml' ``` Start the Prometheus service: diff --git a/releases/release-8.0.0.md b/releases/release-8.0.0.md index 17136f63eae44..e2eb82d8b0bc7 100644 --- a/releases/release-8.0.0.md +++ b/releases/release-8.0.0.md @@ -292,7 +292,7 @@ Quick access: [Quick start](https://docs.pingcap.com/tidb/v8.0/quick-start-with- > This section provides compatibility changes you need to know when you upgrade from v7.6.0 to the current version (v8.0.0). If you are upgrading from v7.5.0 or earlier versions to the current version, you might also need to check the compatibility changes introduced in intermediate versions. - Upgrade the default Prometheus version deployed by TiUP from 2.27.1 to 2.49.1. -- Upgrade the default Grafana version deployed by TiUP from 7.5.11 to 7.5.17. +- Upgrade the default Grafana version deployed by TiUP from 7.5.11 to 7.5.17. - Remove witness-related schedulers that are not GA but are enabled by default [#7765](https://github.com/tikv/pd/pull/7765) @[rleungx](https://github.com/rleungx) ### Behavior changes