This is an automated cherry-pick of #16642

Signed-off-by: ti-chi-bot <[email protected]>

hardware-and-software-requirements.md

@@ -284,4 +284,37 @@ As an open-source distributed SQL database, TiDB requires the following network
 
 ## Web browser requirements
 
+<<<<<<< HEAD
 TiDB relies on [Grafana](https://grafana.com/) to provide visualization of database metrics. A recent version of Internet Explorer, Chrome or Firefox with Javascript enabled is sufficient.
+=======
+TiDB relies on [Grafana](https://grafana.com/) to provide visualization of database metrics. A recent version of Microsoft Edge, Safari, Chrome or Firefox with Javascript enabled is sufficient.
+
+## Hardware and software requirements for TiFlash disaggregated storage and compute architecture
+
+The preceding TiFlash software and hardware requirements are for the coupled storage and compute architecture. Starting from v7.0.0, TiFlash supports the [disaggregated storage and compute architecture](/tiflash/tiflash-disaggregated-and-s3.md). In this architecture, TiFlash is divided into two types of nodes: the Write Node and the Compute Node. The requirements for these nodes are as follows:
+
+- Software: remain the same as the coupled storage and compute architecture, see [OS and platform requirements](#os-and-platform-requirements).
+- Network port: remain the same as the coupled storage and compute architecture, see [Network](#network-requirements).
+- Disk space:
+    - TiFlash Write Node: it is recommended to configure at least 200 GB of disk space, which is used as a local buffer when adding TiFlash replicas and migrating Region replicas before uploading data to Amazon S3. In addition, an object storage compatible with Amazon S3 is required.
+    - TiFlash Compute Node: it is recommended to configure at least 100 GB of disk space, which is mainly used to cache the data read from the Write Node to improve performance. The cache of the Compute Node might be fully used, which is normal.
+- CPU and memory requirements are described in the following sections.
+
+### Development and test environments
+
+| Component | CPU | Memory | Local Storage | Network | Number of Instances (Minimum Requirement) |
+| --- | --- | --- | --- | --- | --- |
+| TiFlash Write Node | 16 cores+ | 32 GB+ | SSD, 200 GB+ | Gigabit Ethernet | 1 |
+| TiFlash Compute Node | 16 cores+ | 32 GB+ | SSD, 100 GB+ | Gigabit Ethernet | 0 (see the following note) |
+
+### Production environment
+
+| Component | CPU | Memory | Disk Type | Network | Number of Instances (Minimum Requirement) |
+| --- | --- | --- | --- | --- | --- |
+| TiFlash Write Node | 32 cores+ | 64 GB+ | 1 or more SSDs | 10 Gigabit Ethernet (2 recommended) | 1 |
+| TiFlash Compute Node | 32 cores+ | 64 GB+ | 1 or more SSDs | 10 Gigabit Ethernet (2 recommended) | 0 (see the following note) |
+
+> **Note:**
+>
+> You can use deployment tools such as TiUP to quickly scale in or out the TiFlash Compute Node, within the range of `[0, +inf]`.
+>>>>>>> 6131925045 (update hardware requirement for disaggregated tiflash (#16642))