feat: querier auto_instance supports pod_group

xiaochaoren1 · xiaochaoren1 · commit 47ea58751eac · 2026-08-05T16:12:40.000+08:00
diff --git a/server/querier/db_descriptions/clickhouse/tag/enum/auto_instance_type.ch b/server/querier/db_descriptions/clickhouse/tag/enum/auto_instance_type.ch
@@ -1,15 +1,22 @@
-# Value , DisplayName     , Description
-0       , Internet IP     ,
-1       , 云主机          ,
-5       , 路由器          ,
-6       , 宿主机          ,
-9       , DHCP 网关       ,
-10      , 容器 POD        ,
-11      , 容器服务        ,
-12      , Redis          ,
-13      , RDS            ,
-14      , 容器节点        ,
-15      , 负载均衡器      ,
-16      , NAT 网关        ,
-120     , 进程            ,
-255     , IP              ,
+# Value , DisplayName             , Description
+0       , Internet IP             ,
+1       , 云主机                  ,
+5       , 路由器                  ,
+6       , 宿主机                  ,
+9       , DHCP 网关               ,
+10      , 容器 POD                ,
+11      , 容器服务                ,
+12      , Redis                  ,
+13      , RDS                    ,
+14      , 容器节点                ,
+15      , 负载均衡器              ,
+16      , NAT 网关                ,
+101     , 工作负载                 ,
+120     , 进程                    ,
+130     , Deployment              ,
+131     , StatefulSet             ,
+132     , ReplicationController   ,
+133     , DaemonSet               ,
+134     , ReplicaSetController    ,
+135     , CloneSet                ,
+255     , IP                      ,
diff --git a/server/querier/db_descriptions/clickhouse/tag/enum/auto_instance_type.en b/server/querier/db_descriptions/clickhouse/tag/enum/auto_instance_type.en
@@ -1,15 +1,22 @@
-# Value , DisplayName       , Description
-0       , Internet IP       ,
-1       , Cloud Host        ,
-5       , Router            ,
-6       , VM Hypervisor     ,
-9       , DHCP Gateway      ,
-10      , K8s POD           ,
-11      , K8s Service       ,
-12      , Redis             ,
-13      , RDS               ,
-14      , K8s Node          ,
-15      , Load Balancer     ,
-16      , NAT Gateway       ,
-120     , Process           ,
-255     , IP                ,
+# Value , DisplayName             , Description
+0       , Internet IP             ,
+1       , Cloud Host              ,
+5       , Router                  ,
+6       , VM Hypervisor           ,
+9       , DHCP Gateway            ,
+10      , K8s POD                 ,
+11      , K8s Service             ,
+12      , Redis                   ,
+13      , RDS                     ,
+14      , K8s Node                ,
+15      , Load Balancer           ,
+16      , NAT Gateway             ,
+101     , K8s Workload            ,
+120     , Process                 ,
+130     , Deployment              ,
+131     , StatefulSet             ,
+132     , ReplicationController   ,
+133     , DaemonSet               ,
+134     , ReplicaSetController    ,
+135     , CloneSet                ,
+255     , IP                      ,
diff --git a/server/querier/engine/clickhouse/clickhouse_test.go b/server/querier/engine/clickhouse/clickhouse_test.go
@@ -139,7 +139,7 @@ var (
 		output: []string{"WITH toStartOfInterval(time, toIntervalSecond(60)) + toIntervalSecond(arrayJoin([0]) * 60) AS `_toi` SELECT toUnixTimestamp(`_toi`) AS `toi`, divide(plus(SUM(byte_tx+byte_rx), 100), 60) AS `persecond_max_byte_100` FROM flow_log.`l4_flow_log` GROUP BY `toi` LIMIT 1"},
 	}, {
 		input:  "select resource_gl0_0,ip_0 from l7_flow_log where ip_0='1.1.1.1' and resource_gl0_0='abc' and resource_gl0_0 regexp 'abc' and resource_gl0_id_0=2 group by resource_gl0_0,ip_0",
-		output: []string{"SELECT if(auto_instance_type_0 in (0,255),if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)),dictGet('flow_tag.device_map', 'name', (toUInt64(auto_instance_type_0),toUInt64(auto_instance_id_0)))) AS `resource_gl0_0`, if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)) AS `ip_0`, auto_instance_type_0 AS `resource_gl0_type_0` FROM flow_log.`l7_flow_log` WHERE (((if(is_ipv4=1, ip4_0 = toIPv4OrNull('1.1.1.1'), ip6_0 = toIPv6OrNull('1.1.1.1'))))) AND (if(auto_instance_type_0 in (0,255),if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)) = 'abc',(toUInt64(auto_instance_id_0),toUInt64(auto_instance_type_0)) GLOBAL IN (SELECT deviceid,devicetype FROM flow_tag.device_map WHERE name = 'abc' AND devicetype not in (101,102)))) AND (if(auto_instance_type_0 in (0,255),match(if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)),'abc'),(toUInt64(auto_instance_id_0),toUInt64(auto_instance_type_0)) GLOBAL IN (SELECT deviceid,devicetype FROM flow_tag.device_map WHERE match(name,'abc') AND devicetype not in (101,102)))) AND (if(auto_instance_type_0 in (0,255),subnet_id_0 = 2,auto_instance_id_0 = 2)) GROUP BY if(auto_instance_type_0 in (0,255),if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)),dictGet('flow_tag.device_map', 'name', (toUInt64(auto_instance_type_0),toUInt64(auto_instance_id_0)))) AS `resource_gl0_0`, `resource_gl0_type_0`, if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)) AS `ip_0` LIMIT 10000"},
+		output: []string{"SELECT if(auto_instance_type_0 in (0,255),if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)),dictGet('flow_tag.device_map', 'name', (toUInt64(auto_instance_type_0),toUInt64(auto_instance_id_0)))) AS `resource_gl0_0`, if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)) AS `ip_0`, auto_instance_type_0 AS `resource_gl0_type_0` FROM flow_log.`l7_flow_log` WHERE (((if(is_ipv4=1, ip4_0 = toIPv4OrNull('1.1.1.1'), ip6_0 = toIPv6OrNull('1.1.1.1'))))) AND (if(auto_instance_type_0 in (0,255),if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)) = 'abc',(toUInt64(auto_instance_id_0),toUInt64(auto_instance_type_0)) GLOBAL IN (SELECT deviceid,devicetype FROM flow_tag.device_map WHERE name = 'abc' AND devicetype not in (102)))) AND (if(auto_instance_type_0 in (0,255),match(if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)),'abc'),(toUInt64(auto_instance_id_0),toUInt64(auto_instance_type_0)) GLOBAL IN (SELECT deviceid,devicetype FROM flow_tag.device_map WHERE match(name,'abc') AND devicetype not in (102)))) AND (if(auto_instance_type_0 in (0,255),subnet_id_0 = 2,auto_instance_id_0 = 2)) GROUP BY if(auto_instance_type_0 in (0,255),if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)),dictGet('flow_tag.device_map', 'name', (toUInt64(auto_instance_type_0),toUInt64(auto_instance_id_0)))) AS `resource_gl0_0`, `resource_gl0_type_0`, if(is_ipv4=1, IPv4NumToString(ip4_0), IPv6NumToString(ip6_0)) AS `ip_0` LIMIT 10000"},
 	}, {
 		input:  "select pod_service_0 from l7_flow_log where pod_service_0 !='xx' group by pod_service_0",
 		output: []string{"SELECT dictGet('flow_tag.device_map', 'name', (toUInt64(11),toUInt64(service_id_0))) AS `pod_service_0` FROM flow_log.`l7_flow_log` WHERE (not(toUInt64(service_id_0) GLOBAL IN (SELECT deviceid FROM flow_tag.device_map WHERE name = 'xx' AND devicetype=11))) GROUP BY dictGet('flow_tag.device_map', 'name', (toUInt64(11),toUInt64(service_id_0))) AS `pod_service_0` LIMIT 10000"},
@@ -449,11 +449,11 @@ var (
 	}, {
 		name:   "exist_trans_support_tag_0",
 		input:  "SELECT pod from l4_flow_log WHERE exist(pod_0) AND exist(host_1) AND exist(vpc_0) AND exist(auto_instance_1) AND exist(auto_service_0) LIMIT 1",
-		output: []string{"SELECT dictGet('flow_tag.pod_map', 'name', (toUInt64(pod_id))) AS `pod` FROM flow_log.`l4_flow_log` WHERE (pod_id_0!=0) AND (host_id_1!=0) AND (l3_epc_id_0!=-2) AND (auto_instance_type_1 not in (101,102)) AND (auto_service_type_0 not in (10)) LIMIT 1"},
+		output: []string{"SELECT dictGet('flow_tag.pod_map', 'name', (toUInt64(pod_id))) AS `pod` FROM flow_log.`l4_flow_log` WHERE (pod_id_0!=0) AND (host_id_1!=0) AND (l3_epc_id_0!=-2) AND (auto_instance_type_1 not in (102)) AND (auto_service_type_0 not in (10)) LIMIT 1"},
 	}, {
 		name:   "exist_trans_support_tag_1",
 		input:  "SELECT pod from vtap_app_port WHERE exist(resource_gl0) AND exist(resource_gl1) LIMIT 1",
-		output: []string{"SELECT dictGet('flow_tag.pod_map', 'name', (toUInt64(pod_id))) AS `pod` FROM flow_metrics.`application` WHERE (auto_instance_type not in (101,102)) AND (auto_service_type not in (10)) LIMIT 1"},
+		output: []string{"SELECT dictGet('flow_tag.pod_map', 'name', (toUInt64(pod_id))) AS `pod` FROM flow_metrics.`application` WHERE (auto_instance_type not in (102)) AND (auto_service_type not in (10)) LIMIT 1"},
 		db:     "flow_metrics",
 	}, {
 		name:   "l2_vpc_filter_trans",
diff --git a/server/querier/engine/clickhouse/filter.go b/server/querier/engine/clickhouse/filter.go
@@ -131,7 +131,7 @@ func TransWhereTagFunction(db, table string, name string, args []string) (filter
 			filter = strings.Join([]string{"epc_id", suffix, "!=0"}, "")
 		} else if common.IsValueInSliceString(resourceNoID, tag.TAG_RESOURCE_TYPE_AUTO) {
 			if common.IsValueInSliceString(resourceNoID, []string{"resource_gl0", "auto_instance"}) {
-				filter = strings.Join([]string{"auto_instance_type", suffix, " not in (101,102)"}, "")
+				filter = strings.Join([]string{"auto_instance_type", suffix, " not in (102)"}, "")
 			} else {
 				filter = strings.Join([]string{"auto_service_type", suffix, " not in (10)"}, "")
 			}
diff --git a/server/querier/engine/clickhouse/tag/const.go b/server/querier/engine/clickhouse/tag/const.go
@@ -70,7 +70,14 @@ var AutoMap = map[string]int{
 }
 
 var AutoPodMap = map[string]int{
-	"pod": VIF_DEVICE_TYPE_POD,
+	"pod":                    VIF_DEVICE_TYPE_POD,
+	"pod_group":              VIF_DEVICE_TYPE_POD_GROUP,
+	"deployment":             VIF_DEVICE_TYPE_POD_GROUP_DEPLOYMENT,
+	"stateful_set":           VIF_DEVICE_TYPE_POD_GROUP_STATEFULSET,
+	"replication_controller": VIF_DEVICE_TYPE_POD_GROUP_RC,
+	"daemon_set":             VIF_DEVICE_TYPE_POD_GROUP_DAEMON_SET,
+	"replica_set_controller": VIF_DEVICE_TYPE_POD_GROUP_REPLICASET_CONTROLLER,
+	"clone_set":              VIF_DEVICE_TYPE_POD_GROUP_CLONESET,
 }
 
 var AutoPodGroupMap = map[string]int{
diff --git a/server/querier/engine/clickhouse/tag/translation.go b/server/querier/engine/clickhouse/tag/translation.go
@@ -401,7 +401,7 @@ func GenerateTagResoureMap() map[string]map[string]*Tag {
 			iconIDStrSuffix := fmt.Sprintf("multiIf(%s=%d,%s,%s=%d,%s,%s)", tagAutoTypeSuffix, VIF_DEVICE_TYPE_INTERNET, internetIconDictGet, tagAutoTypeSuffix, VIF_DEVICE_TYPE_IP, ipIconDictGet, autoIconDictGet)
 			deviceTypeFilter := ""
 			if strings.HasPrefix(autoNameSuffix, "resource_gl0") || strings.HasPrefix(autoNameSuffix, "auto_instance") {
-				deviceTypeFilter = "devicetype not in (101,102)"
+				deviceTypeFilter = "devicetype not in (102)"
 			} else {
 				deviceTypeFilter = "devicetype not in (10)"
 			}

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func TransWhereTagFunction(db, table string, name string, args []string) (filter`
`131`	`131`	`filter = strings.Join([]string{"epc_id", suffix, "!=0"}, "")`
`132`	`132`	`} else if common.IsValueInSliceString(resourceNoID, tag.TAG_RESOURCE_TYPE_AUTO) {`
`133`	`133`	`if common.IsValueInSliceString(resourceNoID, []string{"resource_gl0", "auto_instance"}) {`
`134`		`- filter = strings.Join([]string{"auto_instance_type", suffix, " not in (101,102)"}, "")`
	`134`	`+ filter = strings.Join([]string{"auto_instance_type", suffix, " not in (102)"}, "")`
`135`	`135`	`} else {`
`136`	`136`	`filter = strings.Join([]string{"auto_service_type", suffix, " not in (10)"}, "")`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,14 @@ var AutoMap = map[string]int{`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`var AutoPodMap = map[string]int{`
`73`		`- "pod": VIF_DEVICE_TYPE_POD,`
	`73`	`+ "pod": VIF_DEVICE_TYPE_POD,`
	`74`	`+ "pod_group": VIF_DEVICE_TYPE_POD_GROUP,`
	`75`	`+ "deployment": VIF_DEVICE_TYPE_POD_GROUP_DEPLOYMENT,`
	`76`	`+ "stateful_set": VIF_DEVICE_TYPE_POD_GROUP_STATEFULSET,`
	`77`	`+ "replication_controller": VIF_DEVICE_TYPE_POD_GROUP_RC,`
	`78`	`+ "daemon_set": VIF_DEVICE_TYPE_POD_GROUP_DAEMON_SET,`
	`79`	`+ "replica_set_controller": VIF_DEVICE_TYPE_POD_GROUP_REPLICASET_CONTROLLER,`
	`80`	`+ "clone_set": VIF_DEVICE_TYPE_POD_GROUP_CLONESET,`
`74`	`81`	`}`
`75`	`82`
`76`	`83`	`var AutoPodGroupMap = map[string]int{`
Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ func GenerateTagResoureMap() map[string]map[string]*Tag {`
`401`	`401`	`iconIDStrSuffix := fmt.Sprintf("multiIf(%s=%d,%s,%s=%d,%s,%s)", tagAutoTypeSuffix, VIF_DEVICE_TYPE_INTERNET, internetIconDictGet, tagAutoTypeSuffix, VIF_DEVICE_TYPE_IP, ipIconDictGet, autoIconDictGet)`
`402`	`402`	`deviceTypeFilter := ""`
`403`	`403`	`if strings.HasPrefix(autoNameSuffix, "resource_gl0") \|\| strings.HasPrefix(autoNameSuffix, "auto_instance") {`
`404`		`- deviceTypeFilter = "devicetype not in (101,102)"`
	`404`	`+ deviceTypeFilter = "devicetype not in (102)"`
`405`	`405`	`} else {`
`406`	`406`	`deviceTypeFilter = "devicetype not in (10)"`
`407`	`407`	`}`