From 6ef7b0b4443f9ab09c57f4c2364cbaf8ca9bace0 Mon Sep 17 00:00:00 2001 From: duanda Date: Fri, 16 Aug 2024 11:11:14 +0800 Subject: [PATCH] feat: change service chsql filter --- server/controller/tagrecorder/ch_device.go | 12 ++++++++ .../controller/tagrecorder/check/ch_device.go | 28 +++++++++++++++++++ server/querier/engine/clickhouse/tag/const.go | 1 - 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/server/controller/tagrecorder/ch_device.go b/server/controller/tagrecorder/ch_device.go index d6a69fbeaf9..b6b32a4ff49 100644 --- a/server/controller/tagrecorder/ch_device.go +++ b/server/controller/tagrecorder/ch_device.go @@ -619,6 +619,18 @@ func (c *ChPodServiceDevice) sourceToTarget(md *message.Metadata, source *mysql. SubDomainID: md.SubDomainID, }) + // service + keys = append(keys, DeviceKey{DeviceType: CH_DEVICE_TYPE_SERVICE, + DeviceID: source.ID}) + targets = append(targets, mysql.ChDevice{ + DeviceType: CH_DEVICE_TYPE_SERVICE, + DeviceID: source.ID, + Name: sourceName, + IconID: iconID, + TeamID: md.TeamID, + DomainID: md.DomainID, + SubDomainID: md.SubDomainID, + }) return } diff --git a/server/controller/tagrecorder/check/ch_device.go b/server/controller/tagrecorder/check/ch_device.go index 16ab9048a67..df5649c23f6 100644 --- a/server/controller/tagrecorder/check/ch_device.go +++ b/server/controller/tagrecorder/check/ch_device.go @@ -461,6 +461,20 @@ func (d *ChDevice) generatePodServiceData(keyToItem map[DeviceKey]mysql.ChDevice SubDomainID: tagrecorder.SubDomainToSubDomainID[podService.SubDomain], } + // service + serviceKey := DeviceKey{ + DeviceType: CH_DEVICE_TYPE_SERVICE, + DeviceID: podService.ID, + } + keyToItem[serviceKey] = mysql.ChDevice{ + DeviceType: CH_DEVICE_TYPE_SERVICE, + DeviceID: podService.ID, + Name: podService.Name + " (deleted)", + IconID: d.resourceTypeToIconID[IconKey{NodeType: RESOURCE_TYPE_POD_SERVICE}], + TeamID: teamID, + DomainID: tagrecorder.DomainToDomainID[podService.Domain], + SubDomainID: tagrecorder.SubDomainToSubDomainID[podService.SubDomain], + } } else { // pod_service podServiceKey := DeviceKey{ @@ -477,6 +491,20 @@ func (d *ChDevice) generatePodServiceData(keyToItem map[DeviceKey]mysql.ChDevice SubDomainID: tagrecorder.SubDomainToSubDomainID[podService.SubDomain], } + // service + serviceKey := DeviceKey{ + DeviceType: CH_DEVICE_TYPE_SERVICE, + DeviceID: podService.ID, + } + keyToItem[serviceKey] = mysql.ChDevice{ + DeviceType: CH_DEVICE_TYPE_SERVICE, + 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], + SubDomainID: tagrecorder.SubDomainToSubDomainID[podService.SubDomain], + } } } return true diff --git a/server/querier/engine/clickhouse/tag/const.go b/server/querier/engine/clickhouse/tag/const.go index 2b29890fdc9..2fe2fd9a1a2 100644 --- a/server/querier/engine/clickhouse/tag/const.go +++ b/server/querier/engine/clickhouse/tag/const.go @@ -85,7 +85,6 @@ var AutoServiceMap = map[string]int{ "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{