metrics: distinguish events of server level and connection level (#48290

) close #48289
pingcap · Nov 6, 2023 · b93b2f5 · b93b2f5
1 parent 18979c6
commit b93b2f5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pkg/metrics/grafana/tidb.json b/pkg/metrics/grafana/tidb.json
@@ -2915,7 +2915,7 @@
               "expr": "increase(tidb_server_event_total{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}[10m])",
               "format": "time_series",
               "intervalFactor": 2,
-              "legendFormat": "{{instance}}-server {{type}}",
+              "legendFormat": "{{instance}}-{{type}}",
               "refId": "A"
             }
           ],

diff --git a/pkg/metrics/server.go b/pkg/metrics/server.go
@@ -37,11 +37,11 @@ var (
 	ExecuteErrorCounter    *prometheus.CounterVec
 	CriticalErrorCounter   prometheus.Counter
 
-	EventStart        = "start"
-	EventGracefulDown = "graceful_shutdown"
+	ServerStart = "server-start"
+	ServerStop  = "server-stop"
+
 	// Eventkill occurs when the server.Kill() function is called.
-	EventKill  = "kill"
-	EventClose = "close"
+	EventKill = "kill"
 
 	ServerEventCounter              *prometheus.CounterVec
 	TimeJumpBackCounter             prometheus.Counter

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -419,7 +419,7 @@ func (s *Server) reportConfig() {
 
 // Run runs the server.
 func (s *Server) Run() error {
-	metrics.ServerEventCounter.WithLabelValues(metrics.EventStart).Inc()
+	metrics.ServerEventCounter.WithLabelValues(metrics.ServerStart).Inc()
 	s.reportConfig()
 
 	// Start HTTP API to report tidb info such as TPS.
@@ -579,7 +579,7 @@ func (s *Server) closeListener() {
 		s.authTokenCancelFunc()
 	}
 	s.wg.Wait()
-	metrics.ServerEventCounter.WithLabelValues(metrics.EventClose).Inc()
+	metrics.ServerEventCounter.WithLabelValues(metrics.ServerStop).Inc()
 }
 
 // Close closes the server.