[Tagrecorder] modify ch_device subscriber

deepflowio · Mar 25, 2024 · f96ce84 · f96ce84
1 parent 21b9986
commit f96ce84
Show file tree

Hide file tree

Showing 34 changed files with 824 additions and 640 deletions.
diff --git a/server/controller/recorder/pubsub/message/update.go b/server/controller/recorder/pubsub/message/update.go
@@ -184,6 +184,7 @@ type HostFieldsUpdate struct {
 	Key
 	Name         fieldDetail[string]
 	IP           fieldDetail[string]
+	UID          fieldDetail[string]
 	HType        fieldDetail[int]
 	VCPUNum      fieldDetail[int]
 	MemTotal     fieldDetail[int]
@@ -210,6 +211,7 @@ type VMFieldsUpdate struct {
 	LaunchServer fieldDetail[string]
 	CloudTags    fieldDetail[map[string]string]
 	HostID       fieldDetail[int]
+	UID          fieldDetail[string]
 	Hostname     fieldDetail[string]
 	VPCID        fieldDetail[int]
 	VPCLcuuid    fieldDetail[string]
@@ -442,6 +444,7 @@ type NATGatewayFieldsUpdate struct {
 	Name         fieldDetail[string]
 	FloatingIPs  fieldDetail[string]
 	RegionLcuuid fieldDetail[string]
+	UID          fieldDetail[string]
 }
 type NATGatewayUpdate struct {
 	Fields[NATGatewayFieldsUpdate]
@@ -473,6 +476,7 @@ type NATVMConnectionUpdate struct {
 type LBFieldsUpdate struct {
 	Key
 	Name         fieldDetail[string]
+	UID          fieldDetail[string]
 	Model        fieldDetail[int]
 	VIP          fieldDetail[string]
 	RegionLcuuid fieldDetail[string]
@@ -553,6 +557,7 @@ type CENUpdate struct {
 type RDSInstanceFieldsUpdate struct {
 	Key
 	Name         fieldDetail[string]
+	UID          fieldDetail[string]
 	State        fieldDetail[int]
 	Series       fieldDetail[int]
 	Model        fieldDetail[int]
@@ -569,6 +574,7 @@ type RDSInstanceUpdate struct {
 type RedisInstanceFieldsUpdate struct {
 	Key
 	Name         fieldDetail[string]
+	UID          fieldDetail[string]
 	State        fieldDetail[int]
 	PublicHost   fieldDetail[string]
 	AZLcuuid     fieldDetail[string]

diff --git a/server/controller/recorder/updater/pod_group.go b/server/controller/recorder/updater/pod_group.go
@@ -110,6 +110,7 @@ func (p *PodGroup) generateUpdateInfo(diffBase *diffbase.PodGroup, cloudItem *cl
 	if diffBase.Name != cloudItem.Name {
 		mapInfo["name"] = cloudItem.Name
 		structInfo.Name.Set(diffBase.Name, cloudItem.Name)
+		structInfo.Type.SetNew(cloudItem.Type)
 	}
 	if diffBase.Type != cloudItem.Type {
 		mapInfo["type"] = cloudItem.Type

diff --git a/server/controller/tagrecorder/ch_az.go b/server/controller/tagrecorder/ch_az.go
@@ -41,7 +41,7 @@ func NewChAZ(domainLcuuidToIconID map[string]int, resourceTypeToIconID map[IconK
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (a *ChAZ) onResourceUpdated(sourceID int, fieldsUpdate *message.AZFieldsUpdate) {
+func (a *ChAZ) onResourceUpdated(sourceID int, fieldsUpdate *message.AZFieldsUpdate, softDelete bool) {
 	updateInfo := make(map[string]interface{})
 	if fieldsUpdate.Name.IsDifferent() {
 		updateInfo["name"] = fieldsUpdate.Name.GetNew()
@@ -58,7 +58,7 @@ func (a *ChAZ) onResourceUpdated(sourceID int, fieldsUpdate *message.AZFieldsUpd
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (a *ChAZ) sourceToTarget(az *mysql.AZ) (keys []IDKey, targets []mysql.ChAZ) {
+func (a *ChAZ) sourceToTarget(az *mysql.AZ, softDelete bool) (keys []IDKey, targets []mysql.ChAZ) {
 	iconID := a.domainLcuuidToIconID[az.Domain]
 	if iconID == 0 {
 		key := IconKey{

diff --git a/server/controller/tagrecorder/ch_chost.go b/server/controller/tagrecorder/ch_chost.go
@@ -37,7 +37,7 @@ func NewChChost() *ChChost {
 }
 
 // sourceToTarget implements SubscriberDataGenerator
-func (c *ChChost) sourceToTarget(source *mysql.VM) (keys []IDKey, targets []mysql.ChChost) {
+func (c *ChChost) sourceToTarget(source *mysql.VM, softDelete bool) (keys []IDKey, targets []mysql.ChChost) {
 	sourceName := source.Name
 	if source.DeletedAt.Valid {
 		sourceName += " (deleted)"
@@ -56,7 +56,7 @@ func (c *ChChost) sourceToTarget(source *mysql.VM) (keys []IDKey, targets []mysq
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (c *ChChost) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFieldsUpdate) {
+func (c *ChChost) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFieldsUpdate, softDelete bool) {
 	updateInfo := make(map[string]interface{})
 	if fieldsUpdate.Name.IsDifferent() {
 		updateInfo["name"] = fieldsUpdate.Name.GetNew()

diff --git a/server/controller/tagrecorder/ch_chost_cloud_tag.go b/server/controller/tagrecorder/ch_chost_cloud_tag.go
@@ -37,7 +37,7 @@ func NewChChostCloudTag() *ChChostCloudTag {
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (c *ChChostCloudTag) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFieldsUpdate) {
+func (c *ChChostCloudTag) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFieldsUpdate, softDelete bool) {
 	keysToAdd := make([]CloudTagKey, 0)
 	targetsToAdd := make([]mysql.ChChostCloudTag, 0)
 	keysToDelete := make([]CloudTagKey, 0)
@@ -93,7 +93,7 @@ func (c *ChChostCloudTag) onResourceUpdated(sourceID int, fieldsUpdate *message.
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (c *ChChostCloudTag) sourceToTarget(source *mysql.VM) (keys []CloudTagKey, targets []mysql.ChChostCloudTag) {
+func (c *ChChostCloudTag) sourceToTarget(source *mysql.VM, softDelete bool) (keys []CloudTagKey, targets []mysql.ChChostCloudTag) {
 	for k, v := range source.CloudTags {
 		keys = append(keys, c.newTargetKey(source.ID, k))
 		targets = append(targets, mysql.ChChostCloudTag{

diff --git a/server/controller/tagrecorder/ch_chost_cloud_tags.go b/server/controller/tagrecorder/ch_chost_cloud_tags.go
@@ -39,7 +39,7 @@ func NewChChostCloudTags() *ChChostCloudTags {
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (c *ChChostCloudTags) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFieldsUpdate) {
+func (c *ChChostCloudTags) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFieldsUpdate, softDelete bool) {
 	updateInfo := make(map[string]interface{})
 	if fieldsUpdate.CloudTags.IsDifferent() {
 		bytes, err := json.Marshal(fieldsUpdate.CloudTags.GetNew())
@@ -64,7 +64,7 @@ func (c *ChChostCloudTags) onResourceUpdated(sourceID int, fieldsUpdate *message
 }
 
 // onResourceUpdated implements SubscriberDataGenerator
-func (c *ChChostCloudTags) sourceToTarget(item *mysql.VM) (keys []CloudTagsKey, targets []mysql.ChChostCloudTags) {
+func (c *ChChostCloudTags) sourceToTarget(item *mysql.VM, softDelete bool) (keys []CloudTagsKey, targets []mysql.ChChostCloudTags) {
 	if len(item.CloudTags) == 0 {
 		return
 	}