diff --git a/cmd/cdc/server/server.go b/cmd/cdc/server/server.go index 78f89a58a1..5f852591bc 100644 --- a/cmd/cdc/server/server.go +++ b/cmd/cdc/server/server.go @@ -123,7 +123,7 @@ func (o *options) run(cmd *cobra.Command) error { logger.StartLogFileMonitor(ctx, loggerConfig.File, 30*time.Second) version.LogVersionInfo("Change Data Capture (CDC)") - metrics.BuildInfo.WithLabelValues(version.ReleaseVersion, version.GitHash, version.BuildTS, kerneltype.Name()).Set(1) + metrics.BuildInfo.WithLabelValues(version.ReleaseVersion, version.GitHash, version.BuildTS, kerneltype.Name(), "newarch").Set(1) log.Info("The TiCDC release version", zap.String("ReleaseVersion", version.ReleaseVersion)) util.LogHTTPProxies() diff --git a/metrics/grafana/ticdc_new_arch.json b/metrics/grafana/ticdc_new_arch.json index 649677b1ca..4b2a3db197 100644 --- a/metrics/grafana/ticdc_new_arch.json +++ b/metrics/grafana/ticdc_new_arch.json @@ -3540,7 +3540,7 @@ "pluginVersion": "7.5.17", "targets": [ { - "expr": "max by (instance, kernel_type, git_hash, release_version, utc_build_time) (ticdc_server_build_info{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"})", + "expr": "max by (instance, ticdc_arch, kernel_type, git_hash, release_version, utc_build_time) (ticdc_server_build_info{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"}) or (max by (instance, ticdc_arch, kernel_type, git_hash, release_version, utc_build_time) (label_replace(label_replace(label_replace(label_replace(label_replace(ticdc_server_etcd_health_check_duration_count{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"}, \"ticdc_arch\", \"oldarch\", \"instance\", \".*\"), \"kernel_type\", \"unknown\", \"instance\", \".*\"), \"git_hash\", \"unknown\", \"instance\", \".*\"), \"release_version\", \"unknown\", \"instance\", \".*\"), \"utc_build_time\", \"unknown\", \"instance\", \".*\"))) unless on (instance) ticdc_server_build_info{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"})", "format": "time_series", "instant": true, "refId": "A" @@ -3562,11 +3562,12 @@ "__name__": true }, "indexByName": { - "git_hash": 2, + "git_hash": 3, "instance": 0, - "kernel_type": 1, - "release_version": 3, - "utc_build_time": 4 + "kernel_type": 2, + "release_version": 4, + "ticdc_arch": 1, + "utc_build_time": 5 }, "renameByName": {} } diff --git a/metrics/nextgengrafana/ticdc_new_arch_next_gen.json b/metrics/nextgengrafana/ticdc_new_arch_next_gen.json index 24c62eb98a..bdb73db09b 100644 --- a/metrics/nextgengrafana/ticdc_new_arch_next_gen.json +++ b/metrics/nextgengrafana/ticdc_new_arch_next_gen.json @@ -3540,7 +3540,7 @@ "pluginVersion": "7.5.17", "targets": [ { - "expr": "max by (instance, kernel_type, git_hash, release_version, utc_build_time) (ticdc_server_build_info{k8s_cluster=\"$k8s_cluster\", sharedpool_id=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"})", + "expr": "max by (instance, ticdc_arch, kernel_type, git_hash, release_version, utc_build_time) (ticdc_server_build_info{k8s_cluster=\"$k8s_cluster\", sharedpool_id=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"}) or (max by (instance, ticdc_arch, kernel_type, git_hash, release_version, utc_build_time) (label_replace(label_replace(label_replace(label_replace(label_replace(ticdc_server_etcd_health_check_duration_count{k8s_cluster=\"$k8s_cluster\", sharedpool_id=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"}, \"ticdc_arch\", \"oldarch\", \"instance\", \".*\"), \"kernel_type\", \"unknown\", \"instance\", \".*\"), \"git_hash\", \"unknown\", \"instance\", \".*\"), \"release_version\", \"unknown\", \"instance\", \".*\"), \"utc_build_time\", \"unknown\", \"instance\", \".*\"))) unless on (instance) ticdc_server_build_info{k8s_cluster=\"$k8s_cluster\", sharedpool_id=\"$tidb_cluster\", job=~\".*ticdc.*\", instance=~\"$ticdc_instance\"})", "format": "time_series", "instant": true, "refId": "A" @@ -3562,11 +3562,12 @@ "__name__": true }, "indexByName": { - "git_hash": 2, + "git_hash": 3, "instance": 0, - "kernel_type": 1, - "release_version": 3, - "utc_build_time": 4 + "kernel_type": 2, + "release_version": 4, + "ticdc_arch": 1, + "utc_build_time": 5 }, "renameByName": {} } diff --git a/pkg/metrics/server.go b/pkg/metrics/server.go index 4d1faec4ad..9a0533e04e 100644 --- a/pkg/metrics/server.go +++ b/pkg/metrics/server.go @@ -39,8 +39,9 @@ var ( Help: "The value of GOMAXPROCS", }) - // buildInfo is a metric with a constant '1' value, labeled by the build metadata. - // It is used by dashboards to identify the exact binary running on each TiCDC server. + // BuildInfo is a metric with a constant '1' value, labeled by the build metadata. + // It is used by dashboards to identify the exact binary running on each TiCDC server, + // including whether the process is running in TiCDC's new or old architecture mode. BuildInfo = prometheus.NewGaugeVec( prometheus.GaugeOpts{ Namespace: "ticdc", @@ -48,7 +49,7 @@ var ( Name: "build_info", Help: "TiCDC build information as labels.", }, - []string{"release_version", "git_hash", "utc_build_time", "kernel_type"}, + []string{"release_version", "git_hash", "utc_build_time", "kernel_type", "ticdc_arch"}, ) )