fix comment: change dist ddl to dist task

pingcap · Sep 25, 2023 · c4eef6d · c4eef6d
1 parent 0d92eae
commit c4eef6d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/metrics/disttask.go b/metrics/disttask.go
@@ -30,9 +30,9 @@ const (
 )
 
 var (
-	// DistTaskSubTaskCntGauge is the gauge of dist ddl subtask count.
+	// DistTaskSubTaskCntGauge is the gauge of dist task subtask count.
 	DistTaskSubTaskCntGauge *prometheus.GaugeVec
-	// DistTaskSubTaskStartTimeGauge is the gauge of dist ddl subtask start time.
+	// DistTaskSubTaskStartTimeGauge is the gauge of dist task subtask start time.
 	DistTaskSubTaskStartTimeGauge *prometheus.GaugeVec
 )
 
@@ -42,7 +42,7 @@ func InitDistTaskMetrics() {
 		prometheus.GaugeOpts{
 			Namespace: "tidb",
 			Subsystem: "disttask",
-			Name:      "ddl_subtask_cnt",
+			Name:      "subtask_cnt",
 			Help:      "Gauge of ddl subtask count.",
 		}, []string{lblTaskType, lblTaskID, lblSchedulerID, lblTaskStatus})
 

diff --git a/metrics/grafana/tidb.json b/metrics/grafana/tidb.json
@@ -13806,7 +13806,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(tidb_disttask_ddl_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=~\"pending|running|revert_pending|reverting|paused\"}) by (task_id)",
+              "expr": "sum(tidb_disttask_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=~\"pending|running|revert_pending|reverting|paused\"}) by (task_id)",
               "interval": "",
               "legendFormat": "",
               "queryType": "randomWalk",
@@ -13817,7 +13817,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Running Dist DDL Subtasks",
+          "title": "Running Dist Task Subtasks",
           "tooltip": {
             "shared": true,
             "sort": 0,
@@ -13901,7 +13901,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(tidb_disttask_ddl_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=~\"succeed|failed|canceled|reverted|revert_failed\"}) by (task_id)",
+              "expr": "sum(tidb_disttask_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=~\"succeed|failed|canceled|reverted|revert_failed\"}) by (task_id)",
               "interval": "",
               "legendFormat": "",
               "queryType": "randomWalk",
@@ -13912,7 +13912,7 @@
           "timeFrom": null,
           "timeRegions": [],
           "timeShift": null,
-          "title": "Finished Dist DDL Subtasks",
+          "title": "Finished Dist Task Subtasks",
           "tooltip": {
             "shared": true,
             "sort": 0,
@@ -13996,7 +13996,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum by (task_id) (increase(tidb_disttask_ddl_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=\"succeed\"}[1m]))",
+              "expr": "sum by (task_id) (increase(tidb_disttask_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=\"succeed\"}[1m]))",
               "interval": "",
               "legendFormat": "task_id_{{task_id}}",
               "queryType": "randomWalk",
@@ -14092,7 +14092,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "increase(tidb_disttask_ddl_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=\"succeed\"}[1m])",
+              "expr": "increase(tidb_disttask_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=\"succeed\"}[1m])",
               "interval": "",
               "legendFormat": "{{scheduler_id}}",
               "queryType": "randomWalk",
@@ -14193,14 +14193,14 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "sum(tidb_disttask_ddl_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=~\"pending|running|reverting|revert_pending|paused\"}) by (scheduler_id)",
+              "expr": "sum(tidb_disttask_subtask_cnt{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=~\"pending|running|reverting|revert_pending|paused\"}) by (scheduler_id)",
               "interval": "",
               "legendFormat": "",
               "queryType": "randomWalk",
               "refId": "A"
             }
           ],
-          "title": "Distributed DDL Running Subtask Distribution on TiDB Nodes",
+          "title": "Distributed Task Running Subtask Distribution on TiDB Nodes",
           "type": "piechart"
         }
       ],

diff --git a/metrics/grafana/tidb_runtime.json b/metrics/grafana/tidb_runtime.json
@@ -1668,7 +1668,7 @@
           "targets": [
             {
               "exemplar": true,
-              "expr": "tidb_disttask_ddl_subtask_cnt{k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=\"pending\"}",
+              "expr": "tidb_disttask_subtask_cnt{k8s_cluster=\"$k8s_cluster\",tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", status=\"pending\"}",
               "interval": "",
               "legendFormat": "pending_subtasks",
               "queryType": "randomWalk",