[tagrecorder] Subscribe ch_os_app_tag

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]

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

server/controller/tagrecorder/ch_az.go

@@ -17,6 +17,8 @@
 package tagrecorder
 
 import (
+	"gorm.io/gorm/clause"
+
 	"github.com/deepflowio/deepflow/server/controller/common"
 	"github.com/deepflowio/deepflow/server/controller/db/mysql"
 	"github.com/deepflowio/deepflow/server/controller/recorder/pubsub/message"
@@ -78,3 +80,11 @@ func (a *ChAZ) sourceToTarget(az *mysql.AZ) (keys []IDKey, targets []mysql.ChAZ)
 	})
 	return
 }
+
+// softDeletedTargetsUpdated implements SubscriberDataGenerator
+func (a *ChAZ) softDeletedTargetsUpdated(targets []mysql.ChAZ) {
+	mysql.Db.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "id"}},
+		DoUpdates: clause.AssignmentColumns([]string{"name"}),
+	}).Create(&targets)
+}

server/controller/tagrecorder/ch_chost.go

@@ -17,6 +17,8 @@
 package tagrecorder
 
 import (
+	"gorm.io/gorm/clause"
+
 	"github.com/deepflowio/deepflow/server/controller/common"
 	"github.com/deepflowio/deepflow/server/controller/db/mysql"
 	"github.com/deepflowio/deepflow/server/controller/recorder/pubsub/message"
@@ -80,3 +82,11 @@ func (c *ChChost) onResourceUpdated(sourceID int, fieldsUpdate *message.VMFields
 		c.SubscriberComponent.dbOperator.update(chItem, updateInfo, IDKey{ID: sourceID})
 	}
 }
+
+// softDeletedTargetsUpdated implements SubscriberDataGenerator
+func (c *ChChost) softDeletedTargetsUpdated(targets []mysql.ChChost) {
+	mysql.Db.Clauses(clause.OnConflict{
+		Columns:   []clause.Column{{Name: "id"}},
+		DoUpdates: clause.AssignmentColumns([]string{"name"}),
+	}).Create(&targets)
+}

server/controller/tagrecorder/ch_chost_cloud_tag.go

@@ -108,3 +108,8 @@ func (c *ChChostCloudTag) sourceToTarget(source *mysql.VM) (keys []CloudTagKey,
 func (c *ChChostCloudTag) newTargetKey(id int, key string) CloudTagKey {
 	return CloudTagKey{ID: id, Key: key}
 }
+
+// softDeletedTargetsUpdated implements SubscriberDataGenerator
+func (c *ChChostCloudTag) softDeletedTargetsUpdated(targets []mysql.ChChostCloudTag) {
+
+}

server/controller/tagrecorder/ch_chost_cloud_tags.go

@@ -75,3 +75,8 @@ func (c *ChChostCloudTags) sourceToTarget(item *mysql.VM) (keys []CloudTagsKey,
 	}
 	return []CloudTagsKey{{ID: item.ID}}, []mysql.ChChostCloudTags{{ID: item.ID, CloudTags: string(bytes)}}
 }
+
+// softDeletedTargetsUpdated implements SubscriberDataGenerator
+func (c *ChChostCloudTags) softDeletedTargetsUpdated(targets []mysql.ChChostCloudTags) {
+
+}