metrics: fix metrics Get Backend Count and Ping Backend Duration (#…

…280)
pingcap · May 16, 2023 · 8bbb0e9 · 8bbb0e9
1 parent ea6ae2e
commit 8bbb0e9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/pkg/manager/router/metrics.go b/pkg/manager/router/metrics.go
@@ -62,6 +62,5 @@ func readMigrateCounter(from, to string, succeed bool) (int, error) {
 
 func setPingBackendMetrics(addr string, succeed bool, startTime time.Time) {
 	cost := time.Since(startTime)
-	resLabel := succeedToLabel(succeed)
-	metrics.PingBackendGauge.WithLabelValues(addr, resLabel).Set(cost.Seconds())
+	metrics.PingBackendGauge.WithLabelValues(addr).Set(cost.Seconds())
 }
diff --git a/pkg/metrics/backend.go b/pkg/metrics/backend.go
@@ -53,5 +53,5 @@ var (
 			Subsystem: LabelBackend,
 			Name:      "ping_duration_seconds",
 			Help:      "Time (s) of pinging the SQL port of each backend.",
-		}, []string{LblBackend, LblRes})
+		}, []string{LblBackend})
 )
diff --git a/pkg/metrics/grafana/tiproxy_summary.json b/pkg/metrics/grafana/tiproxy_summary.json
@@ -1225,7 +1225,7 @@
                      "expr": "tiproxy_backend_get_backend{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\"}",
                      "format": "time_series",
                      "intervalFactor": 2,
-                     "legendFormat": "{{res}}",
+                     "legendFormat": "{{instance}} : {{res}}",
                      "refId": "A"
                   }
                ],

diff --git a/pkg/metrics/grafana/tiproxy_summary.jsonnet b/pkg/metrics/grafana/tiproxy_summary.jsonnet
@@ -358,7 +358,7 @@ local bGetBeP = graphPanel.new(
 .addTarget(
   prometheus.target(
     'tiproxy_backend_get_backend{k8s_cluster="$k8s_cluster", tidb_cluster="$tidb_cluster"}',
-    legendFormat='{{res}}',
+    legendFormat='{{instance}} : {{res}}',
   )
 );