[Querier] modify pod_group_type showtagvalues error #22514

- run automation test(basic & querier_sql) pass
deepflowio · Oct 16, 2023 · 3d11340 · 3d11340
1 parent a9ec769
commit 3d11340
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 24 deletions.
diff --git a/server/controller/tagrecorder/const.go b/server/controller/tagrecorder/const.go
@@ -756,12 +756,12 @@ var RESOURCE_TYPE_TO_NODE_TYPE = map[int]string{
 	common.VIF_DEVICE_TYPE_POD_GROUP:                       RESOURCE_TYPE_POD_GROUP,
 	common.VIF_DEVICE_TYPE_SERVICE:                         RESOURCE_TYPE_SERVICE,
 	common.VIF_DEVICE_TYPE_GPROCESS:                        RESOURCE_TYPE_GPROCESS,
-	common.VIF_DEVICE_TYPE_POD_GROUP_DEPLOYMENT:            RESOURCE_TYPE_CH_POD_GROUP_DEPLOYMENT,
-	common.VIF_DEVICE_TYPE_POD_GROUP_STATEFULSET:           RESOURCE_TYPE_CH_POD_GROUP_STATEFULSET,
-	common.VIF_DEVICE_TYPE_POD_GROUP_RC:                    RESOURCE_TYPE_CH_POD_GROUP_RC,
-	common.VIF_DEVICE_TYPE_POD_GROUP_DAEMON_SET:            RESOURCE_TYPE_CH_POD_GROUP_DAEMON_SET,
-	common.VIF_DEVICE_TYPE_POD_GROUP_REPLICASET_CONTROLLER: RESOURCE_TYPE_CH_POD_GROUP_REPLICASET_CONTROLLER,
-	common.VIF_DEVICE_TYPE_POD_GROUP_CLONESET:              RESOURCE_TYPE_CH_POD_GROUP_CLONESET,
+	common.VIF_DEVICE_TYPE_POD_GROUP_DEPLOYMENT:            RESOURCE_TYPE_POD_GROUP,
+	common.VIF_DEVICE_TYPE_POD_GROUP_STATEFULSET:           RESOURCE_TYPE_POD_GROUP,
+	common.VIF_DEVICE_TYPE_POD_GROUP_RC:                    RESOURCE_TYPE_POD_GROUP,
+	common.VIF_DEVICE_TYPE_POD_GROUP_DAEMON_SET:            RESOURCE_TYPE_POD_GROUP,
+	common.VIF_DEVICE_TYPE_POD_GROUP_REPLICASET_CONTROLLER: RESOURCE_TYPE_POD_GROUP,
+	common.VIF_DEVICE_TYPE_POD_GROUP_CLONESET:              RESOURCE_TYPE_POD_GROUP,
 	common.VIF_DEVICE_TYPE_IP:                              RESOURCE_TYPE_IP,
 }
 

diff --git a/server/querier/engine/clickhouse/tag/const.go b/server/querier/engine/clickhouse/tag/const.go
@@ -17,22 +17,28 @@
 package tag
 
 const (
-	VIF_DEVICE_TYPE_INTERNET       = 0
-	VIF_DEVICE_TYPE_VM             = 1
-	VIF_DEVICE_TYPE_VROUTER        = 5
-	VIF_DEVICE_TYPE_HOST           = 6
-	VIF_DEVICE_TYPE_DHCP_PORT      = 9
-	VIF_DEVICE_TYPE_POD            = 10
-	VIF_DEVICE_TYPE_POD_SERVICE    = 11
-	VIF_DEVICE_TYPE_REDIS_INSTANCE = 12
-	VIF_DEVICE_TYPE_RDS_INSTANCE   = 13
-	VIF_DEVICE_TYPE_POD_NODE       = 14
-	VIF_DEVICE_TYPE_LB             = 15
-	VIF_DEVICE_TYPE_NAT_GATEWAY    = 16
-	VIF_DEVICE_TYPE_POD_GROUP      = 101
-	VIF_DEVICE_TYPE_SERVICE        = 102
-	VIF_DEVICE_TYPE_GPROCESS       = 120
-	VIF_DEVICE_TYPE_IP             = 255
+	VIF_DEVICE_TYPE_INTERNET                        = 0
+	VIF_DEVICE_TYPE_VM                              = 1
+	VIF_DEVICE_TYPE_VROUTER                         = 5
+	VIF_DEVICE_TYPE_HOST                            = 6
+	VIF_DEVICE_TYPE_DHCP_PORT                       = 9
+	VIF_DEVICE_TYPE_POD                             = 10
+	VIF_DEVICE_TYPE_POD_SERVICE                     = 11
+	VIF_DEVICE_TYPE_REDIS_INSTANCE                  = 12
+	VIF_DEVICE_TYPE_RDS_INSTANCE                    = 13
+	VIF_DEVICE_TYPE_POD_NODE                        = 14
+	VIF_DEVICE_TYPE_LB                              = 15
+	VIF_DEVICE_TYPE_NAT_GATEWAY                     = 16
+	VIF_DEVICE_TYPE_POD_GROUP                       = 101
+	VIF_DEVICE_TYPE_SERVICE                         = 102
+	VIF_DEVICE_TYPE_GPROCESS                        = 120
+	VIF_DEVICE_TYPE_POD_GROUP_DEPLOYMENT            = 130
+	VIF_DEVICE_TYPE_POD_GROUP_STATEFULSET           = 131
+	VIF_DEVICE_TYPE_POD_GROUP_RC                    = 132
+	VIF_DEVICE_TYPE_POD_GROUP_DAEMON_SET            = 133
+	VIF_DEVICE_TYPE_POD_GROUP_REPLICASET_CONTROLLER = 134
+	VIF_DEVICE_TYPE_POD_GROUP_CLONESET              = 135
+	VIF_DEVICE_TYPE_IP                              = 255
 )
 
 const (
@@ -70,8 +76,19 @@ var AutoPodGroupMap = map[string]int{
 }
 
 var AutoServiceMap = map[string]int{
-	"pod_group": VIF_DEVICE_TYPE_POD_GROUP,
-	"service":   VIF_DEVICE_TYPE_SERVICE,
+	"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,
+	"service":                VIF_DEVICE_TYPE_SERVICE,
+}
+
+var PodGroupTypeSlice = []string{
+	"deployment", "stateful_set", "replication_controller", "daemon_set",
+	"replica_set_controller", "clone_set",
 }
 
 var NoLanguageTag = []string{

diff --git a/server/querier/engine/clickhouse/tag/description.go b/server/querier/engine/clickhouse/tag/description.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"golang.org/x/exp/slices"
 	"regexp"
 	"strconv"
 	"strings"
@@ -701,6 +702,9 @@ func GetTagResourceValues(db, table, rawSql string) (*common.Result, []string, e
 				"auto_service":  AutoServiceMap,
 			}
 			for resourceKey, resourceType := range autoMap[tag] {
+				if slices.Contains(PodGroupTypeSlice, resourceKey) {
+					continue
+				}
 				resourceId := resourceKey + "_id"
 				resourceName := resourceKey + "_name"
 				if resourceKey == "service" {