From c1c687b7abb60105d1f45b818ef2ada4998c1ea9 Mon Sep 17 00:00:00 2001
From: Weizhen Wang <wangweizhen@pingcap.com>
Date: Wed, 7 Feb 2024 18:52:15 +0800
Subject: [PATCH 1/2] This is an automated cherry-pick of #51050

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
---
 metrics/grafana/tidb.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/metrics/grafana/tidb.json b/metrics/grafana/tidb.json
index 9e2f362c74c84..1ad7ca3d580b7 100644
--- a/metrics/grafana/tidb.json
+++ b/metrics/grafana/tidb.json
@@ -13416,7 +13416,15 @@
           "dashLength": 10,
           "dashes": false,
           "datasource": "${DS_TEST-CLUSTER}",
+<<<<<<< HEAD:metrics/grafana/tidb.json
           "description": "TiDB auto analyze query per second",
+=======
+          "description": "TiDB auto analyze query per minute",
+          "fieldConfig": {
+            "defaults": {},
+            "overrides": []
+          },
+>>>>>>> 3478bd5ef71 (metrics: tidb_statistics_auto_analyze_total should be int (#51050)):pkg/metrics/grafana/tidb.json
           "fill": 1,
           "gridPos": {
             "h": 7,
@@ -13448,7 +13456,7 @@
           "steppedLine": false,
           "targets": [
             {
-              "expr": "sum(rate(tidb_statistics_auto_analyze_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (type)",
+              "expr": "sum(increase(tidb_statistics_auto_analyze_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[1m])) by (type)",
               "format": "time_series",
               "intervalFactor": 2,
               "legendFormat": "{{type}}",
@@ -13460,7 +13468,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Auto Analyze QPS",
+          "title": "Auto Analyze Queries Per Minute",
           "tooltip": {
             "shared": true,
             "sort": 0,

From 07190dc46ddc08bbcada0e79e0fb24281f081821 Mon Sep 17 00:00:00 2001
From: Weizhen Wang <wangweizhen@pingcap.com>
Date: Tue, 13 Feb 2024 22:09:46 +0800
Subject: [PATCH 2/2] test

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
---
 metrics/grafana/tidb.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/metrics/grafana/tidb.json b/metrics/grafana/tidb.json
index 1ad7ca3d580b7..1f05c7c5dacfe 100644
--- a/metrics/grafana/tidb.json
+++ b/metrics/grafana/tidb.json
@@ -13416,15 +13416,11 @@
           "dashLength": 10,
           "dashes": false,
           "datasource": "${DS_TEST-CLUSTER}",
-<<<<<<< HEAD:metrics/grafana/tidb.json
-          "description": "TiDB auto analyze query per second",
-=======
           "description": "TiDB auto analyze query per minute",
           "fieldConfig": {
             "defaults": {},
             "overrides": []
           },
->>>>>>> 3478bd5ef71 (metrics: tidb_statistics_auto_analyze_total should be int (#51050)):pkg/metrics/grafana/tidb.json
           "fill": 1,
           "gridPos": {
             "h": 7,