fix metrics

Signed-off-by: Ping Yu <yuping@pingcap.com>
tikv · Aug 24, 2023 · b6fbf8d · b6fbf8d
1 parent 2316dd4
commit b6fbf8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/cdc/Makefile b/cdc/Makefile
@@ -43,7 +43,7 @@ FAILPOINT_DISABLE := $$(echo $(FAILPOINT_DIR) | xargs $(FAILPOINT) disable >/dev
 
 RELEASE_VERSION ?=
 ifeq ($(RELEASE_VERSION),)
-	RELEASE_VERSION := v1.1-master
+	RELEASE_VERSION := v1.2-master
 	release_version_regex := ^cdc-v[0-9]\..*$$
 	release_branch_regex := "^cdc-[0-9]\.[0-9].*$$|^HEAD$$|^.*/*tags/cdc-v[0-9]\.[0-9]\..*$$"
 	ifneq ($(shell git rev-parse --abbrev-ref HEAD | egrep $(release_branch_regex)),)

diff --git a/cdc/cdc/kv/metrics.go b/cdc/cdc/kv/metrics.go
@@ -118,6 +118,7 @@ func InitMetrics(registry *prometheus.Registry) {
 	registry.MustRegister(eventFeedGauge)
 	registry.MustRegister(pullEventCounter)
 	registry.MustRegister(sendEventCounter)
+	registry.MustRegister(filterOutEventCounter)
 	registry.MustRegister(clientChannelSize)
 	registry.MustRegister(clientRegionTokenSize)
 	registry.MustRegister(cachedRegionSize)

diff --git a/cdc/metrics/grafana/tikv-cdc.json b/cdc/metrics/grafana/tikv-cdc.json
@@ -4837,6 +4837,13 @@
               "intervalFactor": 1,
               "legendFormat": "{{instance}}-{{type}}",
               "refId": "A"
+            },
+            {
+              "expr": "sum(rate(tikv_cdc_kvclient_filter_out_event_count{tidb_cluster=\"$tidb_cluster\", changefeed=~\"$changefeed\"}[1m])) by (instance, type)",
+              "format": "time_series",
+              "intervalFactor": 1,
+              "legendFormat": "filter-out-{{instance}}-{{type}}",
+              "refId": "B"
             }
           ],
           "thresholds": [],