feat: support update vtap az

Author: askyrie

server/controller/cloud/kubernetes_gather/plugin/plugin.go

@@ -39,6 +39,10 @@ func GeneratePodGroup(orgID int, db *gorm.DB, metaData *simplejson.Json) (string
 		return "", "", err
 	}
 
+	if len(plugins) == 0 {
+		return "", "", nil
+	}
+
 	// TODO: convert to lua script
 	podGroupType, podGroupName := customSCIPodGroup(orgID, metaData)
 	if podGroupType != "" && podGroupName != "" {

server/controller/monitor/vtap/vtap.go

@@ -94,13 +94,13 @@ func (v *VTapCheck) launchServerCheck(db *metadb.DB) {
 
 	log.Debugf("vtap launch_server check start", db.LogPrefixORGID)
 
-	db.Select("id", "lcuuid", "name", "region").Find(&vms)
+	db.Select("id", "lcuuid", "name", "region", "az").Find(&vms)
 	lcuuidToVM := make(map[string]metadbmodel.VM)
 	for _, vm := range vms {
 		lcuuidToVM[vm.Lcuuid] = vm
 	}
 
-	db.Select("id", "lcuuid", "name", "region").Find(&podNodes)
+	db.Select("id", "lcuuid", "name", "region", "az").Find(&podNodes)
 	lcuuidToPodNode := make(map[string]metadbmodel.PodNode)
 	for _, podNode := range podNodes {
 		lcuuidToPodNode[podNode.Lcuuid] = podNode
@@ -140,6 +140,14 @@ func (v *VTapCheck) launchServerCheck(db *metadb.DB) {
 					)
 					db.Model(&vtap).Update("region", vm.Region)
 				}
+				// check and update az
+				if vtap.AZ != vm.AZ {
+					log.Infof(
+						"update vtap (%s) az from %s to %s",
+						vtap.Lcuuid, vtap.AZ, vm.AZ, db.LogPrefixORGID,
+					)
+					db.Model(&vtap).Update("az", vm.AZ)
+				}
 			}
 
 		case common.VTAP_TYPE_KVM, common.VTAP_TYPE_ESXI, common.VTAP_TYPE_HYPER_V:
@@ -173,6 +181,14 @@ func (v *VTapCheck) launchServerCheck(db *metadb.DB) {
 					)
 					db.Model(&vtap).Update("region", host.Region)
 				}
+				// check and update az
+				if vtap.AZ != host.AZ {
+					log.Infof(
+						"update vtap (%s) az from %s to %s",
+						vtap.Lcuuid, vtap.AZ, host.AZ, db.LogPrefixORGID,
+					)
+					db.Model(&vtap).Update("az", host.AZ)
+				}
 			}
 		case common.VTAP_TYPE_POD_HOST, common.VTAP_TYPE_POD_VM:
 			podNode, ok := lcuuidToPodNode[vtap.Lcuuid]
@@ -210,6 +226,14 @@ func (v *VTapCheck) launchServerCheck(db *metadb.DB) {
 					)
 					db.Model(&vtap).Update("region", podNode.Region)
 				}
+				// check and update az
+				if vtap.AZ != podNode.AZ {
+					log.Infof(
+						"update vtap (%s) az from %s to %s",
+						vtap.Lcuuid, vtap.AZ, podNode.AZ, db.LogPrefixORGID,
+					)
+					db.Model(&vtap).Update("az", podNode.AZ)
+				}
 			}
 		case common.VTAP_TYPE_K8S_SIDECAR:
 			var pod metadbmodel.Pod
@@ -242,6 +266,13 @@ func (v *VTapCheck) launchServerCheck(db *metadb.DB) {
 					)
 					db.Model(&vtap).Update("region", pod.Region)
 				}
+				if vtap.AZ != pod.AZ {
+					log.Infof(
+						"update vtap (%s) az from %s to %s",
+						vtap.Lcuuid, vtap.AZ, pod.AZ, db.LogPrefixORGID,
+					)
+					db.Model(&vtap).Update("az", pod.AZ)
+				}
 			}
 		}
 	}

server/controller/trisolaris/services/grpc/agentsynchronize/sync_push.go

@@ -687,6 +687,7 @@ func (e *AgentEvent) Push(r *api.SyncRequest, in api.Synchronizer_PushServer) er
 
 		if !enabledPush {
 			firstPush = false
+			in.Send(&api.SyncResponse{Status: &STATUS_HEARTBEAT})
 			log.Debugf("push disabled for agent (%s-%s)", r.GetCtrlIp(), r.GetCtrlMac(), logger.NewORGPrefix(orgID))
 			continue
 		}