Merge branch 'master' into disksing/metrics

tikv · Sep 22, 2023 · 34430ea · 34430ea
2 parents d9c7ac7 + 301b917
commit 34430ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/mcs/resourcemanager/server/manager.go b/pkg/mcs/resourcemanager/server/manager.go
@@ -363,7 +363,7 @@ func (m *Manager) backgroundMetricsFlush(ctx context.Context) {
 			if consumption == nil {
 				continue
 			}
-			ruLabelType := tidbTypeLabel
+			ruLabelType := defaultTypeLabel
 			if consumptionInfo.isBackground {
 				ruLabelType = backgroundTypeLabel
 			}

diff --git a/pkg/mcs/resourcemanager/server/metrics.go b/pkg/mcs/resourcemanager/server/metrics.go
@@ -26,8 +26,8 @@ const (
 	readTypeLabel          = "read"
 	writeTypeLabel         = "write"
 	backgroundTypeLabel    = "background"
-	tiflashTypeLabel       = "tiflash"
-	tidbTypeLabel          = "tidb"
+	tiflashTypeLabel       = "ap"
+	defaultTypeLabel       = "tp"
 )
 
 var (