From f669762d1bbef3612657eff65de7f8c9887308ec Mon Sep 17 00:00:00 2001 From: Ericsssss Date: Thu, 25 Apr 2024 15:55:08 +0800 Subject: [PATCH] [Tagrecorder] resource_map add team_id/domain_id - run automation test(querier&*basic) pass --- server/controller/tagrecorder/check/ch_az.go | 17 ++++-- .../controller/tagrecorder/check/ch_chost.go | 5 ++ .../tagrecorder/check/ch_chost_cloud_tag.go | 9 ++- .../tagrecorder/check/ch_chost_cloud_tags.go | 3 + .../controller/tagrecorder/check/ch_device.go | 55 +++++++++++++++++++ .../tagrecorder/check/ch_gprocess.go | 25 +++++---- .../controller/tagrecorder/check/ch_l3_epc.go | 21 ++++--- .../tagrecorder/check/ch_os_app_tag.go | 9 ++- .../tagrecorder/check/ch_os_app_tags.go | 3 + server/controller/tagrecorder/check/ch_pod.go | 5 ++ .../tagrecorder/check/ch_pod_cluster.go | 17 ++++-- .../tagrecorder/check/ch_pod_group.go | 5 ++ .../tagrecorder/check/ch_pod_ingress.go | 13 +++-- .../check/ch_pod_k8s_annotation.go | 13 +++-- .../check/ch_pod_k8s_annotations.go | 3 + .../tagrecorder/check/ch_pod_k8s_env.go | 13 +++-- .../tagrecorder/check/ch_pod_k8s_envs.go | 11 ++-- .../tagrecorder/check/ch_pod_k8s_label.go | 13 +++-- .../tagrecorder/check/ch_pod_k8s_labels.go | 11 ++-- .../tagrecorder/check/ch_pod_node.go | 17 ++++-- .../controller/tagrecorder/check/ch_pod_ns.go | 5 ++ .../tagrecorder/check/ch_pod_ns_cloud_tag.go | 9 ++- .../tagrecorder/check/ch_pod_ns_cloud_tags.go | 3 + .../tagrecorder/check/ch_pod_service.go | 5 ++ .../check/ch_pod_service_k8s_annotation.go | 13 +++-- .../check/ch_pod_service_k8s_annotations.go | 3 + .../check/ch_pod_service_k8s_label.go | 13 +++-- .../check/ch_pod_service_k8s_labels.go | 11 ++-- .../controller/tagrecorder/check/ch_subnet.go | 9 ++- .../tagrecorder/check/tagrecorder.go | 2 + 30 files changed, 252 insertions(+), 89 deletions(-) diff --git a/server/controller/tagrecorder/check/ch_az.go b/server/controller/tagrecorder/check/ch_az.go index 1b5d34b6b59..4fdc0641339 100644 --- a/server/controller/tagrecorder/check/ch_az.go +++ b/server/controller/tagrecorder/check/ch_az.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChAZ struct { @@ -59,15 +60,19 @@ func (a *ChAZ) generateNewData() (map[IDKey]mysql.ChAZ, bool) { } if az.DeletedAt.Valid { keyToItem[IDKey{ID: az.ID}] = mysql.ChAZ{ - ID: az.ID, - Name: az.Name + " (deleted)", - IconID: iconID, + ID: az.ID, + Name: az.Name + " (deleted)", + IconID: iconID, + TeamID: tagrecorder.DomainToTeamID[az.Domain], + DomainID: tagrecorder.DomainToDomainID[az.Domain], } } else { keyToItem[IDKey{ID: az.ID}] = mysql.ChAZ{ - ID: az.ID, - Name: az.Name, - IconID: iconID, + ID: az.ID, + Name: az.Name, + IconID: iconID, + TeamID: tagrecorder.DomainToTeamID[az.Domain], + DomainID: tagrecorder.DomainToDomainID[az.Domain], } } diff --git a/server/controller/tagrecorder/check/ch_chost.go b/server/controller/tagrecorder/check/ch_chost.go index a49dd10f847..325efdaa75a 100644 --- a/server/controller/tagrecorder/check/ch_chost.go +++ b/server/controller/tagrecorder/check/ch_chost.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChChost struct { @@ -65,6 +66,8 @@ func (p *ChChost) generateNewData() (map[IDKey]mysql.ChChost, bool) { HostID: ipToHostID[chost.LaunchServer], Hostname: chost.Hostname, IP: chost.IP, + TeamID: tagrecorder.DomainToTeamID[chost.Domain], + DomainID: tagrecorder.DomainToDomainID[chost.Domain], } } else { keyToItem[IDKey{ID: chost.ID}] = mysql.ChChost{ @@ -74,6 +77,8 @@ func (p *ChChost) generateNewData() (map[IDKey]mysql.ChChost, bool) { HostID: ipToHostID[chost.LaunchServer], Hostname: chost.Hostname, IP: chost.IP, + TeamID: tagrecorder.DomainToTeamID[chost.Domain], + DomainID: tagrecorder.DomainToDomainID[chost.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_chost_cloud_tag.go b/server/controller/tagrecorder/check/ch_chost_cloud_tag.go index 84b1180a26f..c1a1893379d 100644 --- a/server/controller/tagrecorder/check/ch_chost_cloud_tag.go +++ b/server/controller/tagrecorder/check/ch_chost_cloud_tag.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChChostCloudTag struct { @@ -50,9 +51,11 @@ func (c *ChChostCloudTag) generateNewData() (map[CloudTagKey]mysql.ChChostCloudT Key: k, } keyToItem[key] = mysql.ChChostCloudTag{ - ID: vm.ID, - Key: k, - Value: v, + ID: vm.ID, + Key: k, + Value: v, + TeamID: tagrecorder.DomainToTeamID[vm.Domain], + DomainID: tagrecorder.DomainToDomainID[vm.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_chost_cloud_tags.go b/server/controller/tagrecorder/check/ch_chost_cloud_tags.go index e3c0e6d6990..33097970257 100644 --- a/server/controller/tagrecorder/check/ch_chost_cloud_tags.go +++ b/server/controller/tagrecorder/check/ch_chost_cloud_tags.go @@ -20,6 +20,7 @@ import ( "encoding/json" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChChostCloudTags struct { @@ -62,6 +63,8 @@ func (c *ChChostCloudTags) generateNewData() (map[CloudTagsKey]mysql.ChChostClou keyToItem[key] = mysql.ChChostCloudTags{ ID: vm.ID, CloudTags: string(cloudTagsStr), + TeamID: tagrecorder.DomainToTeamID[vm.Domain], + DomainID: tagrecorder.DomainToDomainID[vm.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_device.go b/server/controller/tagrecorder/check/ch_device.go index abf02b6451a..7aba575b15c 100644 --- a/server/controller/tagrecorder/check/ch_device.go +++ b/server/controller/tagrecorder/check/ch_device.go @@ -20,6 +20,7 @@ import ( "github.com/deepflowio/deepflow/server/controller/common" "github.com/deepflowio/deepflow/server/controller/db/mysql" "github.com/deepflowio/deepflow/server/controller/db/mysql/query" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChDevice struct { @@ -143,6 +144,8 @@ func (d *ChDevice) generateHostData(keyToItem map[DeviceKey]mysql.ChDevice) bool IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_HOST, SubType: host.HType}], Hostname: host.Hostname, IP: host.IP, + TeamID: tagrecorder.DomainToTeamID[host.Domain], + DomainID: tagrecorder.DomainToDomainID[host.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -152,6 +155,8 @@ func (d *ChDevice) generateHostData(keyToItem map[DeviceKey]mysql.ChDevice) bool IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_HOST, SubType: host.HType}], Hostname: host.Hostname, IP: host.IP, + TeamID: tagrecorder.DomainToTeamID[host.Domain], + DomainID: tagrecorder.DomainToDomainID[host.Domain], } } @@ -182,6 +187,8 @@ func (d *ChDevice) generateVMData(keyToItem map[DeviceKey]mysql.ChDevice) bool { IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VM, SubType: vm.HType}], Hostname: vm.Hostname, IP: vm.IP, + TeamID: tagrecorder.DomainToTeamID[vm.Domain], + DomainID: tagrecorder.DomainToDomainID[vm.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -192,6 +199,8 @@ func (d *ChDevice) generateVMData(keyToItem map[DeviceKey]mysql.ChDevice) bool { IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VM, SubType: vm.HType}], Hostname: vm.Hostname, IP: vm.IP, + TeamID: tagrecorder.DomainToTeamID[vm.Domain], + DomainID: tagrecorder.DomainToDomainID[vm.Domain], } } } @@ -220,6 +229,8 @@ func (d *ChDevice) generateVRouterData(keyToItem map[DeviceKey]mysql.ChDevice) b DeviceID: vrouter.ID, Name: vrouterName, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VGW}], + TeamID: tagrecorder.DomainToTeamID[vrouter.Domain], + DomainID: tagrecorder.DomainToDomainID[vrouter.Domain], } } return true @@ -245,6 +256,8 @@ func (d *ChDevice) generateDHCPPortData(keyToItem map[DeviceKey]mysql.ChDevice) DeviceID: dhcpPort.ID, Name: dhcpPort.Name + " (deleted)", IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_DHCP_PORT}], + TeamID: tagrecorder.DomainToTeamID[dhcpPort.Domain], + DomainID: tagrecorder.DomainToDomainID[dhcpPort.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -252,6 +265,8 @@ func (d *ChDevice) generateDHCPPortData(keyToItem map[DeviceKey]mysql.ChDevice) DeviceID: dhcpPort.ID, Name: dhcpPort.Name, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_DHCP_PORT}], + TeamID: tagrecorder.DomainToTeamID[dhcpPort.Domain], + DomainID: tagrecorder.DomainToDomainID[dhcpPort.Domain], } } } @@ -279,6 +294,8 @@ func (d *ChDevice) generateNATGatewayData(keyToItem map[DeviceKey]mysql.ChDevice Name: natGateway.Name + " (deleted)", UID: natGateway.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_NAT_GATEWAY}], + TeamID: tagrecorder.DomainToTeamID[natGateway.Domain], + DomainID: tagrecorder.DomainToDomainID[natGateway.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -287,6 +304,8 @@ func (d *ChDevice) generateNATGatewayData(keyToItem map[DeviceKey]mysql.ChDevice Name: natGateway.Name, UID: natGateway.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_NAT_GATEWAY}], + TeamID: tagrecorder.DomainToTeamID[natGateway.Domain], + DomainID: tagrecorder.DomainToDomainID[natGateway.Domain], } } } @@ -314,6 +333,8 @@ func (d *ChDevice) generateLBData(keyToItem map[DeviceKey]mysql.ChDevice) bool { Name: lb.Name + " (deleted)", UID: lb.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_LB}], + TeamID: tagrecorder.DomainToTeamID[lb.Domain], + DomainID: tagrecorder.DomainToDomainID[lb.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -322,6 +343,8 @@ func (d *ChDevice) generateLBData(keyToItem map[DeviceKey]mysql.ChDevice) bool { Name: lb.Name, UID: lb.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_LB}], + TeamID: tagrecorder.DomainToTeamID[lb.Domain], + DomainID: tagrecorder.DomainToDomainID[lb.Domain], } } } @@ -349,6 +372,8 @@ func (d *ChDevice) generateRDSInstanceData(keyToItem map[DeviceKey]mysql.ChDevic Name: rdsInstance.Name + " (deleted)", UID: rdsInstance.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_RDS}], + TeamID: tagrecorder.DomainToTeamID[rdsInstance.Domain], + DomainID: tagrecorder.DomainToDomainID[rdsInstance.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -357,6 +382,8 @@ func (d *ChDevice) generateRDSInstanceData(keyToItem map[DeviceKey]mysql.ChDevic Name: rdsInstance.Name, UID: rdsInstance.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_RDS}], + TeamID: tagrecorder.DomainToTeamID[rdsInstance.Domain], + DomainID: tagrecorder.DomainToDomainID[rdsInstance.Domain], } } } @@ -384,6 +411,8 @@ func (d *ChDevice) generateRedisInstanceData(keyToItem map[DeviceKey]mysql.ChDev Name: redisInstance.Name + " (deleted)", UID: redisInstance.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_REDIS}], + TeamID: tagrecorder.DomainToTeamID[redisInstance.Domain], + DomainID: tagrecorder.DomainToDomainID[redisInstance.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -392,6 +421,8 @@ func (d *ChDevice) generateRedisInstanceData(keyToItem map[DeviceKey]mysql.ChDev Name: redisInstance.Name, UID: redisInstance.UID, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_REDIS}], + TeamID: tagrecorder.DomainToTeamID[redisInstance.Domain], + DomainID: tagrecorder.DomainToDomainID[redisInstance.Domain], } } } @@ -418,6 +449,8 @@ func (d *ChDevice) generatePodServiceData(keyToItem map[DeviceKey]mysql.ChDevice DeviceID: podService.ID, Name: podService.Name + " (deleted)", IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_SERVICE}], + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } // service @@ -430,6 +463,8 @@ func (d *ChDevice) generatePodServiceData(keyToItem map[DeviceKey]mysql.ChDevice DeviceID: podService.ID, Name: podService.Name + " (deleted)", IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_SERVICE}], + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } else { // pod_service @@ -442,6 +477,8 @@ func (d *ChDevice) generatePodServiceData(keyToItem map[DeviceKey]mysql.ChDevice DeviceID: podService.ID, Name: podService.Name, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_SERVICE}], + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } // service @@ -454,6 +491,8 @@ func (d *ChDevice) generatePodServiceData(keyToItem map[DeviceKey]mysql.ChDevice DeviceID: podService.ID, Name: podService.Name, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_SERVICE}], + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } } @@ -479,6 +518,8 @@ func (d *ChDevice) generatePodData(keyToItem map[DeviceKey]mysql.ChDevice) bool DeviceID: pod.ID, Name: pod.Name + " (deleted)", IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD}], + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -486,6 +527,8 @@ func (d *ChDevice) generatePodData(keyToItem map[DeviceKey]mysql.ChDevice) bool DeviceID: pod.ID, Name: pod.Name, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD}], + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } @@ -511,6 +554,8 @@ func (d *ChDevice) generatePodGroupData(keyToItem map[DeviceKey]mysql.ChDevice) DeviceID: podGroup.ID, Name: podGroup.Name + " (deleted)", IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_GROUP}], + TeamID: tagrecorder.DomainToTeamID[podGroup.Domain], + DomainID: tagrecorder.DomainToDomainID[podGroup.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -518,6 +563,8 @@ func (d *ChDevice) generatePodGroupData(keyToItem map[DeviceKey]mysql.ChDevice) DeviceID: podGroup.ID, Name: podGroup.Name, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_GROUP}], + TeamID: tagrecorder.DomainToTeamID[podGroup.Domain], + DomainID: tagrecorder.DomainToDomainID[podGroup.Domain], } } } @@ -545,6 +592,8 @@ func (d *ChDevice) generatePodNodeData(keyToItem map[DeviceKey]mysql.ChDevice) b IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NODE}], Hostname: podNode.Hostname, IP: podNode.IP, + TeamID: tagrecorder.DomainToTeamID[podNode.Domain], + DomainID: tagrecorder.DomainToDomainID[podNode.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -554,6 +603,8 @@ func (d *ChDevice) generatePodNodeData(keyToItem map[DeviceKey]mysql.ChDevice) b IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NODE}], Hostname: podNode.Hostname, IP: podNode.IP, + TeamID: tagrecorder.DomainToTeamID[podNode.Domain], + DomainID: tagrecorder.DomainToDomainID[podNode.Domain], } } } @@ -602,6 +653,8 @@ func (d *ChDevice) generateProcessData(keyToItem map[DeviceKey]mysql.ChDevice) b DeviceID: process.ID, Name: process.Name + " (deleted)", IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_GPROCESS}], + TeamID: tagrecorder.DomainToTeamID[process.Domain], + DomainID: tagrecorder.DomainToDomainID[process.Domain], } } else { keyToItem[key] = mysql.ChDevice{ @@ -609,6 +662,8 @@ func (d *ChDevice) generateProcessData(keyToItem map[DeviceKey]mysql.ChDevice) b DeviceID: process.ID, Name: process.Name, IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_GPROCESS}], + TeamID: tagrecorder.DomainToTeamID[process.Domain], + DomainID: tagrecorder.DomainToDomainID[process.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_gprocess.go b/server/controller/tagrecorder/check/ch_gprocess.go index 231f310d6c8..9ac0a237ad0 100644 --- a/server/controller/tagrecorder/check/ch_gprocess.go +++ b/server/controller/tagrecorder/check/ch_gprocess.go @@ -19,6 +19,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" "github.com/deepflowio/deepflow/server/controller/db/mysql/query" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChGProcess struct { @@ -48,19 +49,23 @@ func (p *ChGProcess) generateNewData() (map[IDKey]mysql.ChGProcess, bool) { for _, process := range processes { if process.DeletedAt.Valid { keyToItem[IDKey{ID: process.ID}] = mysql.ChGProcess{ - ID: process.ID, - Name: process.Name + " (deleted)", - IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_GPROCESS}], - CHostID: process.VMID, - L3EPCID: process.VPCID, + ID: process.ID, + Name: process.Name + " (deleted)", + IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_GPROCESS}], + CHostID: process.VMID, + L3EPCID: process.VPCID, + TeamID: tagrecorder.DomainToTeamID[process.Domain], + DomainID: tagrecorder.DomainToDomainID[process.Domain], } } else { keyToItem[IDKey{ID: process.ID}] = mysql.ChGProcess{ - ID: process.ID, - Name: process.Name, - IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_GPROCESS}], - CHostID: process.VMID, - L3EPCID: process.VPCID, + ID: process.ID, + Name: process.Name, + IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_GPROCESS}], + CHostID: process.VMID, + L3EPCID: process.VPCID, + TeamID: tagrecorder.DomainToTeamID[process.Domain], + DomainID: tagrecorder.DomainToDomainID[process.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_l3_epc.go b/server/controller/tagrecorder/check/ch_l3_epc.go index c0b69c07bd7..787b575be03 100644 --- a/server/controller/tagrecorder/check/ch_l3_epc.go +++ b/server/controller/tagrecorder/check/ch_l3_epc.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChVPC struct { @@ -48,17 +49,21 @@ func (v *ChVPC) generateNewData() (map[IDKey]mysql.ChVPC, bool) { for _, vpc := range vpcs { if vpc.DeletedAt.Valid { keyToItem[IDKey{ID: vpc.ID}] = mysql.ChVPC{ - ID: vpc.ID, - Name: vpc.Name + " (deleted)", - UID: vpc.UID, - IconID: v.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VPC}], + ID: vpc.ID, + Name: vpc.Name + " (deleted)", + UID: vpc.UID, + IconID: v.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VPC}], + TeamID: tagrecorder.DomainToTeamID[vpc.Domain], + DomainID: tagrecorder.DomainToDomainID[vpc.Domain], } } else { keyToItem[IDKey{ID: vpc.ID}] = mysql.ChVPC{ - ID: vpc.ID, - Name: vpc.Name, - UID: vpc.UID, - IconID: v.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VPC}], + ID: vpc.ID, + Name: vpc.Name, + UID: vpc.UID, + IconID: v.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VPC}], + TeamID: tagrecorder.DomainToTeamID[vpc.Domain], + DomainID: tagrecorder.DomainToDomainID[vpc.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_os_app_tag.go b/server/controller/tagrecorder/check/ch_os_app_tag.go index fe91aee53dd..70a44b2716a 100644 --- a/server/controller/tagrecorder/check/ch_os_app_tag.go +++ b/server/controller/tagrecorder/check/ch_os_app_tag.go @@ -21,6 +21,7 @@ import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" "github.com/deepflowio/deepflow/server/controller/db/mysql/query" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChOSAppTag struct { @@ -55,9 +56,11 @@ func (o *ChOSAppTag) generateNewData() (map[OSAPPTagKey]mysql.ChOSAppTag, bool) Key: strings.Trim(splitSingleTag[0], " "), } keyToItem[key] = mysql.ChOSAppTag{ - PID: process.ID, - Key: strings.Trim(splitSingleTag[0], " "), - Value: strings.Trim(splitSingleTag[1], " "), + PID: process.ID, + Key: strings.Trim(splitSingleTag[0], " "), + Value: strings.Trim(splitSingleTag[1], " "), + TeamID: tagrecorder.DomainToTeamID[process.Domain], + DomainID: tagrecorder.DomainToDomainID[process.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_os_app_tags.go b/server/controller/tagrecorder/check/ch_os_app_tags.go index 9fda655264b..f24a0beea12 100644 --- a/server/controller/tagrecorder/check/ch_os_app_tags.go +++ b/server/controller/tagrecorder/check/ch_os_app_tags.go @@ -22,6 +22,7 @@ import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" "github.com/deepflowio/deepflow/server/controller/db/mysql/query" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChOSAppTags struct { @@ -67,6 +68,8 @@ func (o *ChOSAppTags) generateNewData() (map[OSAPPTagsKey]mysql.ChOSAppTags, boo keyToItem[key] = mysql.ChOSAppTags{ PID: process.ID, OSAPPTags: string(osAppTagsStr), + TeamID: tagrecorder.DomainToTeamID[process.Domain], + DomainID: tagrecorder.DomainToDomainID[process.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod.go b/server/controller/tagrecorder/check/ch_pod.go index 72b9a56cca7..f5bb95fcb1e 100644 --- a/server/controller/tagrecorder/check/ch_pod.go +++ b/server/controller/tagrecorder/check/ch_pod.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPod struct { @@ -71,6 +72,8 @@ func (p *ChPod) generateNewData() (map[IDKey]mysql.ChPod, bool) { PodNodeID: pod.PodNodeID, PodGroupID: pod.PodGroupID, PodServiceID: podServiceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } else { keyToItem[IDKey{ID: pod.ID}] = mysql.ChPod{ @@ -82,6 +85,8 @@ func (p *ChPod) generateNewData() (map[IDKey]mysql.ChPod, bool) { PodNodeID: pod.PodNodeID, PodGroupID: pod.PodGroupID, PodServiceID: podServiceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_cluster.go b/server/controller/tagrecorder/check/ch_pod_cluster.go index ea08e801f4e..8d49d1d465a 100644 --- a/server/controller/tagrecorder/check/ch_pod_cluster.go +++ b/server/controller/tagrecorder/check/ch_pod_cluster.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodCluster struct { @@ -48,15 +49,19 @@ func (p *ChPodCluster) generateNewData() (map[IDKey]mysql.ChPodCluster, bool) { for _, podCluster := range podClusters { if podCluster.DeletedAt.Valid { keyToItem[IDKey{ID: podCluster.ID}] = mysql.ChPodCluster{ - ID: podCluster.ID, - Name: podCluster.Name + " (deleted)", - IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_CLUSTER}], + ID: podCluster.ID, + Name: podCluster.Name + " (deleted)", + IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_CLUSTER}], + TeamID: tagrecorder.DomainToTeamID[podCluster.Domain], + DomainID: tagrecorder.DomainToDomainID[podCluster.Domain], } } else { keyToItem[IDKey{ID: podCluster.ID}] = mysql.ChPodCluster{ - ID: podCluster.ID, - Name: podCluster.Name, - IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_CLUSTER}], + ID: podCluster.ID, + Name: podCluster.Name, + IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_CLUSTER}], + TeamID: tagrecorder.DomainToTeamID[podCluster.Domain], + DomainID: tagrecorder.DomainToDomainID[podCluster.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_group.go b/server/controller/tagrecorder/check/ch_pod_group.go index 2bc861186f9..6f3f8b23b51 100644 --- a/server/controller/tagrecorder/check/ch_pod_group.go +++ b/server/controller/tagrecorder/check/ch_pod_group.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodGroup struct { @@ -54,6 +55,8 @@ func (p *ChPodGroup) generateNewData() (map[IDKey]mysql.ChPodGroup, bool) { IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_GROUP}], PodClusterID: podGroup.PodClusterID, PodNsID: podGroup.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podGroup.Domain], + DomainID: tagrecorder.DomainToDomainID[podGroup.Domain], } } else { keyToItem[IDKey{ID: podGroup.ID}] = mysql.ChPodGroup{ @@ -63,6 +66,8 @@ func (p *ChPodGroup) generateNewData() (map[IDKey]mysql.ChPodGroup, bool) { IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_GROUP}], PodClusterID: podGroup.PodClusterID, PodNsID: podGroup.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podGroup.Domain], + DomainID: tagrecorder.DomainToDomainID[podGroup.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_ingress.go b/server/controller/tagrecorder/check/ch_pod_ingress.go index 3ef9f28c8f5..918eaecedc4 100644 --- a/server/controller/tagrecorder/check/ch_pod_ingress.go +++ b/server/controller/tagrecorder/check/ch_pod_ingress.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodIngress struct { @@ -48,13 +49,17 @@ func (p *ChPodIngress) generateNewData() (map[IDKey]mysql.ChPodIngress, bool) { for _, podIngress := range podIngresses { if podIngress.DeletedAt.Valid { keyToItem[IDKey{ID: podIngress.ID}] = mysql.ChPodIngress{ - ID: podIngress.ID, - Name: podIngress.Name + " (deleted)", + ID: podIngress.ID, + Name: podIngress.Name + " (deleted)", + TeamID: tagrecorder.DomainToTeamID[podIngress.Domain], + DomainID: tagrecorder.DomainToDomainID[podIngress.Domain], } } else { keyToItem[IDKey{ID: podIngress.ID}] = mysql.ChPodIngress{ - ID: podIngress.ID, - Name: podIngress.Name, + ID: podIngress.ID, + Name: podIngress.Name, + TeamID: tagrecorder.DomainToTeamID[podIngress.Domain], + DomainID: tagrecorder.DomainToDomainID[podIngress.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_k8s_annotation.go b/server/controller/tagrecorder/check/ch_pod_k8s_annotation.go index 518dc977fbe..19c330eafc3 100644 --- a/server/controller/tagrecorder/check/ch_pod_k8s_annotation.go +++ b/server/controller/tagrecorder/check/ch_pod_k8s_annotation.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodK8sAnnotation struct { @@ -56,11 +57,13 @@ func (k *ChPodK8sAnnotation) generateNewData() (map[K8sAnnotationKey]mysql.ChPod Key: annotationInfo[0], } keyToItem[key] = mysql.ChPodK8sAnnotation{ - ID: pod.ID, - Key: annotationInfo[0], - Value: annotationInfo[1], - L3EPCID: pod.VPCID, - PodNsID: pod.PodNamespaceID, + ID: pod.ID, + Key: annotationInfo[0], + Value: annotationInfo[1], + L3EPCID: pod.VPCID, + PodNsID: pod.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_k8s_annotations.go b/server/controller/tagrecorder/check/ch_pod_k8s_annotations.go index d23396a54a6..bbc8eb02046 100644 --- a/server/controller/tagrecorder/check/ch_pod_k8s_annotations.go +++ b/server/controller/tagrecorder/check/ch_pod_k8s_annotations.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodK8sAnnotations struct { @@ -69,6 +70,8 @@ func (k *ChPodK8sAnnotations) generateNewData() (map[K8sAnnotationsKey]mysql.ChP Annotations: string(annotationStr), L3EPCID: pod.VPCID, PodNsID: pod.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_k8s_env.go b/server/controller/tagrecorder/check/ch_pod_k8s_env.go index 6c1abb0f3b7..2551cf084a9 100644 --- a/server/controller/tagrecorder/check/ch_pod_k8s_env.go +++ b/server/controller/tagrecorder/check/ch_pod_k8s_env.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodK8sEnv struct { @@ -56,11 +57,13 @@ func (k *ChPodK8sEnv) generateNewData() (map[K8sEnvKey]mysql.ChPodK8sEnv, bool) Key: envInfo[0], } keyToItem[key] = mysql.ChPodK8sEnv{ - ID: pod.ID, - Key: envInfo[0], - Value: envInfo[1], - L3EPCID: pod.VPCID, - PodNsID: pod.PodNamespaceID, + ID: pod.ID, + Key: envInfo[0], + Value: envInfo[1], + L3EPCID: pod.VPCID, + PodNsID: pod.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_k8s_envs.go b/server/controller/tagrecorder/check/ch_pod_k8s_envs.go index 3601198816b..d21ccc70153 100644 --- a/server/controller/tagrecorder/check/ch_pod_k8s_envs.go +++ b/server/controller/tagrecorder/check/ch_pod_k8s_envs.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodK8sEnvs struct { @@ -65,10 +66,12 @@ func (k *ChPodK8sEnvs) generateNewData() (map[K8sEnvsKey]mysql.ChPodK8sEnvs, boo ID: pod.ID, } keyToItem[key] = mysql.ChPodK8sEnvs{ - ID: pod.ID, - Envs: string(envStr), - L3EPCID: pod.VPCID, - PodNsID: pod.PodNamespaceID, + ID: pod.ID, + Envs: string(envStr), + L3EPCID: pod.VPCID, + PodNsID: pod.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_k8s_label.go b/server/controller/tagrecorder/check/ch_pod_k8s_label.go index f3c9a242e1c..876305fc4e7 100644 --- a/server/controller/tagrecorder/check/ch_pod_k8s_label.go +++ b/server/controller/tagrecorder/check/ch_pod_k8s_label.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodK8sLabel struct { @@ -71,11 +72,13 @@ func (k *ChPodK8sLabel) generateNewData() (map[K8sLabelKey]mysql.ChPodK8sLabel, Key: splitSingleLabel[0], } keyToItem[key] = mysql.ChPodK8sLabel{ - ID: pod.ID, - Key: splitSingleLabel[0], - Value: splitSingleLabel[1], - L3EPCID: pod.VPCID, - PodNsID: pod.PodNamespaceID, + ID: pod.ID, + Key: splitSingleLabel[0], + Value: splitSingleLabel[1], + L3EPCID: pod.VPCID, + PodNsID: pod.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_k8s_labels.go b/server/controller/tagrecorder/check/ch_pod_k8s_labels.go index e7773d6c94f..496d165848a 100644 --- a/server/controller/tagrecorder/check/ch_pod_k8s_labels.go +++ b/server/controller/tagrecorder/check/ch_pod_k8s_labels.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodK8sLabels struct { @@ -65,10 +66,12 @@ func (k *ChPodK8sLabels) generateNewData() (map[K8sLabelsKey]mysql.ChPodK8sLabel ID: pod.ID, } keyToItem[key] = mysql.ChPodK8sLabels{ - ID: pod.ID, - Labels: string(labelsStr), - L3EPCID: pod.VPCID, - PodNsID: pod.PodNamespaceID, + ID: pod.ID, + Labels: string(labelsStr), + L3EPCID: pod.VPCID, + PodNsID: pod.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[pod.Domain], + DomainID: tagrecorder.DomainToDomainID[pod.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_node.go b/server/controller/tagrecorder/check/ch_pod_node.go index 996ac3a6473..f176e4d5b9f 100644 --- a/server/controller/tagrecorder/check/ch_pod_node.go +++ b/server/controller/tagrecorder/check/ch_pod_node.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodNode struct { @@ -48,15 +49,19 @@ func (p *ChPodNode) generateNewData() (map[IDKey]mysql.ChPodNode, bool) { for _, podNode := range podNodes { if podNode.DeletedAt.Valid { keyToItem[IDKey{ID: podNode.ID}] = mysql.ChPodNode{ - ID: podNode.ID, - Name: podNode.Name + " (deleted)", - IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NODE}], + ID: podNode.ID, + Name: podNode.Name + " (deleted)", + IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NODE}], + TeamID: tagrecorder.DomainToTeamID[podNode.Domain], + DomainID: tagrecorder.DomainToDomainID[podNode.Domain], } } else { keyToItem[IDKey{ID: podNode.ID}] = mysql.ChPodNode{ - ID: podNode.ID, - Name: podNode.Name, - IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NODE}], + ID: podNode.ID, + Name: podNode.Name, + IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NODE}], + TeamID: tagrecorder.DomainToTeamID[podNode.Domain], + DomainID: tagrecorder.DomainToDomainID[podNode.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_ns.go b/server/controller/tagrecorder/check/ch_pod_ns.go index 4a726359b30..b8101bc08d7 100644 --- a/server/controller/tagrecorder/check/ch_pod_ns.go +++ b/server/controller/tagrecorder/check/ch_pod_ns.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodNamespace struct { @@ -52,6 +53,8 @@ func (p *ChPodNamespace) generateNewData() (map[IDKey]mysql.ChPodNamespace, bool Name: podNamespace.Name + " (deleted)", IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NAMESPACE}], PodClusterID: podNamespace.PodClusterID, + TeamID: tagrecorder.DomainToTeamID[podNamespace.Domain], + DomainID: tagrecorder.DomainToDomainID[podNamespace.Domain], } } else { keyToItem[IDKey{ID: podNamespace.ID}] = mysql.ChPodNamespace{ @@ -59,6 +62,8 @@ func (p *ChPodNamespace) generateNewData() (map[IDKey]mysql.ChPodNamespace, bool Name: podNamespace.Name, IconID: p.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_NAMESPACE}], PodClusterID: podNamespace.PodClusterID, + TeamID: tagrecorder.DomainToTeamID[podNamespace.Domain], + DomainID: tagrecorder.DomainToDomainID[podNamespace.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_ns_cloud_tag.go b/server/controller/tagrecorder/check/ch_pod_ns_cloud_tag.go index 6de3903d806..b06a168b412 100644 --- a/server/controller/tagrecorder/check/ch_pod_ns_cloud_tag.go +++ b/server/controller/tagrecorder/check/ch_pod_ns_cloud_tag.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodNSCloudTag struct { @@ -50,9 +51,11 @@ func (p *ChPodNSCloudTag) generateNewData() (map[CloudTagKey]mysql.ChPodNSCloudT Key: k, } keyToItem[key] = mysql.ChPodNSCloudTag{ - ID: podNamespace.ID, - Key: k, - Value: v, + ID: podNamespace.ID, + Key: k, + Value: v, + TeamID: tagrecorder.DomainToTeamID[podNamespace.Domain], + DomainID: tagrecorder.DomainToDomainID[podNamespace.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_ns_cloud_tags.go b/server/controller/tagrecorder/check/ch_pod_ns_cloud_tags.go index 08cf8f6b8e0..4700a90d3b1 100644 --- a/server/controller/tagrecorder/check/ch_pod_ns_cloud_tags.go +++ b/server/controller/tagrecorder/check/ch_pod_ns_cloud_tags.go @@ -20,6 +20,7 @@ import ( "encoding/json" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodNSCloudTags struct { @@ -62,6 +63,8 @@ func (p *ChPodNSCloudTags) generateNewData() (map[CloudTagsKey]mysql.ChPodNSClou keyToItem[key] = mysql.ChPodNSCloudTags{ ID: podNamespace.ID, CloudTags: string(cloudTagsStr), + TeamID: tagrecorder.DomainToTeamID[podNamespace.Domain], + DomainID: tagrecorder.DomainToDomainID[podNamespace.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_service.go b/server/controller/tagrecorder/check/ch_pod_service.go index d7333fe06d3..50abb6c5ad4 100644 --- a/server/controller/tagrecorder/check/ch_pod_service.go +++ b/server/controller/tagrecorder/check/ch_pod_service.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodService struct { @@ -50,6 +51,8 @@ func (p *ChPodService) generateNewData() (map[IDKey]mysql.ChPodService, bool) { Name: podService.Name + " (deleted)", PodClusterID: podService.PodClusterID, PodNsID: podService.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } else { keyToItem[IDKey{ID: podService.ID}] = mysql.ChPodService{ @@ -57,6 +60,8 @@ func (p *ChPodService) generateNewData() (map[IDKey]mysql.ChPodService, bool) { Name: podService.Name, PodClusterID: podService.PodClusterID, PodNsID: podService.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_service_k8s_annotation.go b/server/controller/tagrecorder/check/ch_pod_service_k8s_annotation.go index eb7fa6f9615..432b55bb6c6 100644 --- a/server/controller/tagrecorder/check/ch_pod_service_k8s_annotation.go +++ b/server/controller/tagrecorder/check/ch_pod_service_k8s_annotation.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodServiceK8sAnnotation struct { @@ -56,11 +57,13 @@ func (k *ChPodServiceK8sAnnotation) generateNewData() (map[K8sAnnotationKey]mysq Key: annotationInfo[0], } keyToItem[key] = mysql.ChPodServiceK8sAnnotation{ - ID: podService.ID, - Key: annotationInfo[0], - Value: annotationInfo[1], - L3EPCID: podService.VPCID, - PodNsID: podService.PodNamespaceID, + ID: podService.ID, + Key: annotationInfo[0], + Value: annotationInfo[1], + L3EPCID: podService.VPCID, + PodNsID: podService.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_service_k8s_annotations.go b/server/controller/tagrecorder/check/ch_pod_service_k8s_annotations.go index c5d223367d1..1034deb1639 100644 --- a/server/controller/tagrecorder/check/ch_pod_service_k8s_annotations.go +++ b/server/controller/tagrecorder/check/ch_pod_service_k8s_annotations.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodServiceK8sAnnotations struct { @@ -69,6 +70,8 @@ func (k *ChPodServiceK8sAnnotations) generateNewData() (map[K8sAnnotationsKey]my Annotations: string(annotationStr), L3EPCID: podService.VPCID, PodNsID: podService.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_service_k8s_label.go b/server/controller/tagrecorder/check/ch_pod_service_k8s_label.go index 7eebc827fd2..7fbab63f288 100644 --- a/server/controller/tagrecorder/check/ch_pod_service_k8s_label.go +++ b/server/controller/tagrecorder/check/ch_pod_service_k8s_label.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodServiceK8sLabel struct { @@ -71,11 +72,13 @@ func (k *ChPodServiceK8sLabel) generateNewData() (map[K8sLabelKey]mysql.ChPodSer Key: splitSingleLabel[0], } keyToItem[key] = mysql.ChPodServiceK8sLabel{ - ID: podService.ID, - Key: splitSingleLabel[0], - Value: splitSingleLabel[1], - L3EPCID: podService.VPCID, - PodNsID: podService.PodNamespaceID, + ID: podService.ID, + Key: splitSingleLabel[0], + Value: splitSingleLabel[1], + L3EPCID: podService.VPCID, + PodNsID: podService.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_pod_service_k8s_labels.go b/server/controller/tagrecorder/check/ch_pod_service_k8s_labels.go index 81c8aa62395..1d71f83872e 100644 --- a/server/controller/tagrecorder/check/ch_pod_service_k8s_labels.go +++ b/server/controller/tagrecorder/check/ch_pod_service_k8s_labels.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChPodServiceK8sLabels struct { @@ -65,10 +66,12 @@ func (k *ChPodServiceK8sLabels) generateNewData() (map[K8sLabelsKey]mysql.ChPodS ID: podService.ID, } keyToItem[key] = mysql.ChPodServiceK8sLabels{ - ID: podService.ID, - Labels: string(labelsStr), - L3EPCID: podService.VPCID, - PodNsID: podService.PodNamespaceID, + ID: podService.ID, + Labels: string(labelsStr), + L3EPCID: podService.VPCID, + PodNsID: podService.PodNamespaceID, + TeamID: tagrecorder.DomainToTeamID[podService.Domain], + DomainID: tagrecorder.DomainToDomainID[podService.Domain], } } } diff --git a/server/controller/tagrecorder/check/ch_subnet.go b/server/controller/tagrecorder/check/ch_subnet.go index 4d66419ee1a..e9b2a119c49 100644 --- a/server/controller/tagrecorder/check/ch_subnet.go +++ b/server/controller/tagrecorder/check/ch_subnet.go @@ -18,6 +18,7 @@ package tagrecorder import ( "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) type ChNetwork struct { @@ -52,9 +53,11 @@ func (n *ChNetwork) generateNewData() (map[IDKey]mysql.ChNetwork, bool) { networkName += " (deleted)" } keyToItem[IDKey{ID: network.ID}] = mysql.ChNetwork{ - ID: network.ID, - Name: networkName, - IconID: n.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VL2}], + ID: network.ID, + Name: networkName, + IconID: n.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_VL2}], + TeamID: tagrecorder.DomainToTeamID[network.Domain], + DomainID: tagrecorder.DomainToDomainID[network.Domain], } } return keyToItem, true diff --git a/server/controller/tagrecorder/check/tagrecorder.go b/server/controller/tagrecorder/check/tagrecorder.go index 562ac3a9da9..2cd5fa1eb14 100644 --- a/server/controller/tagrecorder/check/tagrecorder.go +++ b/server/controller/tagrecorder/check/tagrecorder.go @@ -32,6 +32,7 @@ import ( "github.com/deepflowio/deepflow/server/controller/config" "github.com/deepflowio/deepflow/server/controller/db/mysql" + "github.com/deepflowio/deepflow/server/controller/tagrecorder" ) var ( @@ -66,6 +67,7 @@ func (c *TagRecorder) Check() { if err := mysql.GetDBs().DoOnAllDBs(func(db *mysql.DB) error { t := time.Now() log.Infof("ORG(id=%d database=%s) tagrecorder health check data run", db.ORGID, db.Name) + tagrecorder.GetTeamInfo(db) if err := c.check(db); err != nil { log.Infof("ORG(id=%d database=%s) tagrecorder health check failed: %v", db.ORGID, db.Name, err.Error()) }