This is an automated cherry-pick of pingcap#22080

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

Author: Oreoxmt

TOC.md

@@ -277,6 +277,145 @@
       - [tiup-mirror](/tiup/tiup-mirror.md)
       - [tiup-bench](/tiup/tiup-bench.md)
   - [TiDB Operator](/tidb-operator-overview.md)
+<<<<<<< HEAD
+=======
+  - TiDB Data Migration
+    - [About TiDB Data Migration](/dm/dm-overview.md)
+    - [Architecture](/dm/dm-arch.md)
+    - [Quick Start](/dm/quick-start-with-dm.md)
+    - Deploy a DM cluster
+      - [Hardware and Software Requirements](/dm/dm-hardware-and-software-requirements.md)
+      - [Use TiUP (Recommended)](/dm/deploy-a-dm-cluster-using-tiup.md)
+      - [Use TiUP Offline](/dm/deploy-a-dm-cluster-using-tiup-offline.md)
+      - [Use Binary](/dm/deploy-a-dm-cluster-using-binary.md)
+      - [Use Kubernetes](https://docs.pingcap.com/tidb-in-kubernetes/v1.4/deploy-tidb-dm)
+    - Tutorials
+      - [Create a Data Source](/dm/quick-start-create-source.md)
+      - [Manage Data Sources](/dm/dm-manage-source.md)
+      - [Configure Tasks](/dm/dm-task-configuration-guide.md)
+      - [Shard Merge](/dm/dm-shard-merge.md)
+      - [Table Routing](/dm/dm-table-routing.md)
+      - [Block and Allow Lists](/dm/dm-block-allow-table-lists.md)
+      - [Binlog Event Filter](/dm/dm-binlog-event-filter.md)
+      - [Filter DMLs Using SQL Expressions](/dm/feature-expression-filter.md)
+      - [Online DDL Tool Support](/dm/dm-online-ddl-tool-support.md)
+      - Manage a Data Migration Task
+        - [Precheck a Task](/dm/dm-precheck.md)
+        - [Create a Task](/dm/dm-create-task.md)
+        - [Query Status](/dm/dm-query-status.md)
+        - [Pause a Task](/dm/dm-pause-task.md)
+        - [Resume a Task](/dm/dm-resume-task.md)
+        - [Stop a Task](/dm/dm-stop-task.md)
+    - Advanced Tutorials
+      - Merge and Migrate Data from Sharded Tables
+        - [Overview](/dm/feature-shard-merge.md)
+        - [Pessimistic Mode](/dm/feature-shard-merge-pessimistic.md)
+        - [Optimistic Mode](/dm/feature-shard-merge-optimistic.md)
+        - [Manually Handle Sharding DDL Lock](/dm/manually-handling-sharding-ddl-locks.md)
+      - [Migrate from MySQL Databases that Use GH-ost/PT-osc](/dm/feature-online-ddl.md)
+      - [Migrate Data to a Downstream TiDB Table with More Columns](/migrate-with-more-columns-downstream.md)
+    - Maintain
+      - Cluster Upgrade
+        - [Maintain DM Clusters Using TiUP (Recommended)](/dm/maintain-dm-using-tiup.md)
+        - [Manually Upgrade from v1.0.x to v2.0+](/dm/manually-upgrade-dm-1.0-to-2.0.md)
+      - Tools
+        - [Manage Using WebUI](/dm/dm-webui-guide.md)
+        - [Manage Using dmctl](/dm/dmctl-introduction.md)
+      - Performance Tuning
+        - [Benchmarks](/dm/dm-benchmark-v5.4.0.md)
+        - [Optimize Configurations](/dm/dm-tune-configuration.md)
+        - [Test DM Performance](/dm/dm-performance-test.md)
+        - [Handle Performance Issues](/dm/dm-handle-performance-issues.md)
+      - Manage Data Sources
+        - [Switch the MySQL Instance to Be Migrated](/dm/usage-scenario-master-slave-switch.md)
+      - Manage Tasks
+        - [Handle Failed DDL Statements](/dm/handle-failed-ddl-statements.md)
+        - [Manage Schemas of Tables to be Migrated](/dm/dm-manage-schema.md)
+      - [Export and Import Data Sources and Task Configurations of Clusters](/dm/dm-export-import-config.md)
+      - [Handle Alerts](/dm/dm-handle-alerts.md)
+      - [Daily Check](/dm/dm-daily-check.md)
+    - Reference
+      - Architecture
+        - [DM-worker](/dm/dm-worker-intro.md)
+        - [Safe Mode](/dm/dm-safe-mode.md)
+        - [Relay Log](/dm/relay-log.md)
+        - [DDL Handling](/dm/dm-ddl-compatible.md)
+      - Mechanism
+        - [DML Replication Mechanism](/dm/dm-replication-logic.md)
+      - Command Line
+        - [DM-master & DM-worker](/dm/dm-command-line-flags.md)
+      - Configuration Files
+        - [Overview](/dm/dm-config-overview.md)
+        - [Upstream Database Configurations](/dm/dm-source-configuration-file.md)
+        - [Task Configurations](/dm/task-configuration-file-full.md)
+        - [DM-master Configuration](/dm/dm-master-configuration-file.md)
+        - [DM-worker Configuration](/dm/dm-worker-configuration-file.md)
+        - [Table Selector](/dm/table-selector.md)
+      - [OpenAPI](/dm/dm-open-api.md)
+      - [Compatibility Catalog](/dm/dm-compatibility-catalog.md)
+      - Secure
+        - [Enable TLS for DM Connections](/dm/dm-enable-tls.md)
+        - [Generate Self-signed Certificates](/dm/dm-generate-self-signed-certificates.md)
+      - Monitoring and Alerts
+        - [Monitoring Metrics](/dm/monitor-a-dm-cluster.md)
+        - [Alert Rules](/dm/dm-alert-rules.md)
+      - [Error Codes](/dm/dm-error-handling.md#handle-common-errors)
+      - [Glossary](/dm/dm-glossary.md)
+      - Example
+        - [Migrate Data Using DM](/dm/migrate-data-using-dm.md)
+        - [Create a Data Migration Task](/dm/quick-start-create-task.md)
+        - [Best Practices of Data Migration in the Shard Merge Scenario](/dm/shard-merge-best-practices.md)
+      - Troubleshoot
+        - [FAQ](/dm/dm-faq.md)
+        - [Handle Errors](/dm/dm-error-handling.md)
+      - [Release Notes](/dm/dm-release-notes.md)
+  - TiDB Lightning
+    - [Overview](/tidb-lightning/tidb-lightning-overview.md)
+    - [Get Started](/get-started-with-tidb-lightning.md)
+    - [Deploy TiDB Lightning](/tidb-lightning/deploy-tidb-lightning.md)
+    - [Target Database Requirements](/tidb-lightning/tidb-lightning-requirements.md)
+    - Data Sources
+      - [Data Match Rules](/tidb-lightning/tidb-lightning-data-source.md)
+      - [CSV](/tidb-lightning/tidb-lightning-data-source.md#csv)
+      - [SQL](/tidb-lightning/tidb-lightning-data-source.md#sql)
+      - [Parquet](/tidb-lightning/tidb-lightning-data-source.md#parquet)
+      - [Customized File](/tidb-lightning/tidb-lightning-data-source.md#match-customized-files)
+    - Physical Import Mode
+      - [Requirements and Limitations](/tidb-lightning/tidb-lightning-physical-import-mode.md)
+      - [Use Physical Import Mode](/tidb-lightning/tidb-lightning-physical-import-mode-usage.md)
+    - Logical Import Mode
+      - [Requirements and Limitations](/tidb-lightning/tidb-lightning-logical-import-mode.md)
+      - [Use Logical Import Mode](/tidb-lightning/tidb-lightning-logical-import-mode-usage.md)
+    - [Prechecks](/tidb-lightning/tidb-lightning-prechecks.md)
+    - [Table Filter](/table-filter.md)
+    - [Checkpoints](/tidb-lightning/tidb-lightning-checkpoints.md)
+    - [Import Data in Parallel](/tidb-lightning/tidb-lightning-distributed-import.md)
+    - [Error Resolution](/tidb-lightning/tidb-lightning-error-resolution.md)
+    - [Troubleshooting](/tidb-lightning/troubleshoot-tidb-lightning.md)
+    - Reference
+      - [Configuration File](/tidb-lightning/tidb-lightning-configuration.md)
+      - [Command Line Flags](/tidb-lightning/tidb-lightning-command-line-full.md)
+      - [Monitoring](/tidb-lightning/monitor-tidb-lightning.md)
+      - [Web Interface](/tidb-lightning/tidb-lightning-web-interface.md)
+      - [FAQ](/tidb-lightning/tidb-lightning-faq.md)
+      - [Glossary](/tidb-lightning/tidb-lightning-glossary.md)
+  - [Dumpling](/dumpling-overview.md)
+  - TiCDC
+    - [Overview](/ticdc/ticdc-overview.md)
+    - [Deploy](/ticdc/deploy-ticdc.md)
+    - [Maintain](/ticdc/manage-ticdc.md)
+    - Monitor and Alert
+      - [Monitoring Metrics](/ticdc/monitor-ticdc.md)
+      - [Alert Rules](/ticdc/ticdc-alert-rules.md)
+    - [Troubleshoot](/ticdc/troubleshoot-ticdc.md)
+    - Reference
+      - [TiCDC OpenAPI](/ticdc/ticdc-open-api.md)
+      - [TiCDC Open Protocol](/ticdc/ticdc-open-protocol.md)
+      - [TiCDC Avro Protocol](/ticdc/ticdc-avro-protocol.md)
+      - [TiCDC Canal-JSON Protocol](/ticdc/ticdc-canal-json.md)
+    - [FAQs](/ticdc/ticdc-faq.md)
+    - [Glossary](/ticdc/ticdc-glossary.md)
+>>>>>>> 47755948df (v5.4-v6.1: update TiDB in Kubernetes links from dev to v1.4 (#22080))
   - Backup & Restore (BR)
     - [BR Tool Overview](/br/backup-and-restore-tool.md)
     - [Use BR Command-line for Backup and Restoration](/br/use-br-command-line-tool.md)

dashboard/dashboard-faq.md

@@ -83,7 +83,11 @@ To clear your browser cache, take the following steps:
 
 ### A `required component NgMonitoring is not started` error is shown
 
+<<<<<<< HEAD
 NgMonitoring is an advanced monitoring component built in TiDB clusters of v5.4.0 and later versions. It supports such features as **Continuous Profiling** and **Top SQL**. In a TiDB cluster deployed using TiUP, NgMonitoring is deployed automatically. In a TiDB cluster deployed using TiDB Operator, you need to deploy NgMonitoring manually by referring to [Enable Continuous Profiling](https://docs.pingcap.com/tidb-in-kubernetes/dev/access-dashboard/#enable-continuous-profiling).
+=======
+NgMonitoring is an advanced monitoring component built in TiDB clusters of v5.4.0 and later versions to support TiDB Dashboard features such as **Continuous Profiling** and **Top SQL**. NgMonitoring is automatically deployed when you deploy or upgrade a cluster with a newer version of TiUP. For clusters deployed using TiDB Operator, you can deploy NgMonitoring manually by referring to [Enable Continuous Profiling](https://docs.pingcap.com/tidb-in-kubernetes/v1.4/access-dashboard/#enable-continuous-profiling).
+>>>>>>> 47755948df (v5.4-v6.1: update TiDB in Kubernetes links from dev to v1.4 (#22080))
 
 If the **Continuous Profiling** page shows `required component NgMonitoring is not started`, address the problem based on the deployment method of the TiDB cluster.
 
@@ -145,4 +149,47 @@ After performing the preceding steps, enable Continuous Profiling on TiDB Dashbo
 
 #### Clusters deployed using TiDB Operator
 
+<<<<<<< HEAD
 Deploy NgMonitoring by referring to [Enable Continuous Profiling](https://docs.pingcap.com/tidb-in-kubernetes/dev/access-dashboard/#enable-continuous-profiling).
+=======
+<details>
+  <summary>Clusters Deployed using TiDB Operator</summary>
+
+Deploy the NgMonitoring component by following instructions in the [Enable Continuous Profiling](https://docs.pingcap.com/tidb-in-kubernetes/v1.4/access-dashboard/#enable-continuous-profiling) section in TiDB Operator documentation.
+
+</details>
+
+<details>
+  <summary>Clusters Started using TiUP Playground</summary>
+
+When starting the cluster, TiUP Playground (>= v1.8.0) automatically starts the NgMonitoring component. To update TiUP Playground to the latest version, run the following command:
+
+{{< copyable "shell-regular" >}}
+
+```shell
+tiup update --self
+tiup update playground
+```
+
+</details>
+
+### An `unknown field` error is shown on the **Slow Queries** page
+
+If the `unknown field` error appears on the **Slow Queries** page after the cluster upgrade, the error is related to a compatibility issue caused by the difference between TiDB Dashboard server fields (which might be updated) and user preferences fields (which are in the browser cache). This issue has been fixed. If your cluster is earlier than v5.0.3 or v4.0.14, perform the following steps to clear your browser cache:
+
+1. Open TiDB Dashboard page.
+
+2. Open Developer Tools. Different browsers have different ways of opening Developer Tools. After clicking the **Menu Bar**:
+
+    - Firefox: **Menu** > **Web Developer** > **Toggle Tools**, or **Tools** > **Web Developer** > **Toggle Tools**.
+    - Chrome: **More tools** > **Developer tools**.
+    - Safari: **Develop** > **Show Web Inspector**. If you can't see the **Develop** menu, go to **Safari** > **Preferences** > **Advanced**, and check the **Show Develop** menu in menu bar checkbox.
+
+    In the following example, Chrome is used.
+
+    ![Opening DevTools from Chrome's main menu](/media/dashboard/dashboard-faq-devtools.png)
+
+3. Select the **Application** panel, expand the **Local Storage** menu and select the **TiDB Dashboard page domain**. Click the **Clear All** button.
+
+    ![Clear the Local Storage](/media/dashboard/dashboard-faq-devtools-application.png)
+>>>>>>> 47755948df (v5.4-v6.1: update TiDB in Kubernetes links from dev to v1.4 (#22080))