feat: unify-query 关联关系修正实体关键维度定义 --story=129547583 (#1158)

Author: shamcleren

pkg/unify-query/cmdb/v1beta1/config.go

@@ -147,19 +147,19 @@ var configData = &Config{
 		{
 			Name: "business",
 			Index: cmdb.Index{
-				"biz_id",
+				"bk_biz_id",
 			},
 		},
 		{
 			Name: "set",
 			Index: cmdb.Index{
-				"set_id",
+				"bk_set_id",
 			},
 		},
 		{
 			Name: "module",
 			Index: cmdb.Index{
-				"module_id",
+				"bk_module_id",
 			},
 		},
 		{
@@ -179,7 +179,7 @@ var configData = &Config{
 		{
 			Name: "host",
 			Index: cmdb.Index{
-				"host_id",
+				"bk_host_id",
 			},
 			Info: cmdb.Index{
 				"version",

pkg/unify-query/cmdb/v1beta1/query_maker_test.go

@@ -115,7 +115,7 @@ func TestMakeQuery(t *testing.T) {
 				"namespace":      "ns1",
 				"bcs_cluster_id": "cluster1",
 			},
-			promQL: `(count by (host_id) (bkmonitor:host_with_system_relation{bk_target_ip!="",host_id!=""} * on (bk_target_ip) group_left () (count by (bk_target_ip) (bkmonitor:node_with_system_relation{bcs_cluster_id="cluster1",bk_target_ip!="",node!=""} * on (bcs_cluster_id, node) group_left () (count by (bcs_cluster_id, node) (bkmonitor:node_with_pod_relation{bcs_cluster_id="cluster1",namespace="ns1",node!="",pod="pod1"})))))) * on (host_id) group_left (version, env_name, env_type, service_version, service_type) bkmonitor:host_info_relation{host_id!=""}`,
+			promQL: `(count by (bk_host_id) (bkmonitor:host_with_system_relation{bk_host_id!="",bk_target_ip!=""} * on (bk_target_ip) group_left () (count by (bk_target_ip) (bkmonitor:node_with_system_relation{bcs_cluster_id="cluster1",bk_target_ip!="",node!=""} * on (bcs_cluster_id, node) group_left () (count by (bcs_cluster_id, node) (bkmonitor:node_with_pod_relation{bcs_cluster_id="cluster1",namespace="ns1",node!="",pod="pod1"})))))) * on (bk_host_id) group_left (version, env_name, env_type, service_version, service_type) bkmonitor:host_info_relation{bk_host_id!=""}`,
 		},
 		{
 			name: "level 2 and 1m with expand info and expand show",

pkg/unify-query/cmdb/v1beta1/v1beta1_test.go

@@ -572,7 +572,7 @@ func TestModel_GetResourceMatcherRange(t *testing.T) {
 
 	mock.Vm.Set(map[string]any{
 		// host info
-		"query_range:1693973987169397440760count by (host_id, version, env_name, env_type, service_version, service_type) (count_over_time(a[1m]))": victoriaMetrics.Data{
+		"query_range:1693973987169397440760count by (bk_host_id, version, env_name, env_type, service_version, service_type) (count_over_time(a[1m]))": victoriaMetrics.Data{
 			ResultType: victoriaMetrics.MatrixType,
 			Result: []victoriaMetrics.Series{
 				{
@@ -631,13 +631,13 @@ func TestModel_GetResourceMatcherRange(t *testing.T) {
 		"host info": {
 			source: "host",
 			indexMatcher: cmdb.Matcher{
-				"host_id": "12345",
+				"bk_host_id": "12345",
 			},
 			targetInfoShow: true,
 			expectedPath:   []string{"host"},
 			expectedSource: "host",
 			expectedSourceInfo: map[string]string{
-				"host_id": "12345",
+				"bk_host_id": "12345",
 			},
 			expectedTarget: "host",
 			expectedTargetList: []cmdb.MatchersWithTimestamp{