feat(dbm-services): 资源池匹配支持筛选os版本 TencentBlueKing#8333

ymakedaq · Dec 3, 2024 · d4d99be · d4d99be
1 parent 71fca3b
commit d4d99be
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 9 deletions.
diff --git a/dbm-services/common/db-resource/assets/migrations/000004_add_os_mirror_version_col.down.sql b/dbm-services/common/db-resource/assets/migrations/000004_add_os_mirror_version_col.down.sql
diff --git a/dbm-services/common/db-resource/assets/migrations/000004_add_os_mirror_version_col.up.sql b/dbm-services/common/db-resource/assets/migrations/000004_add_os_mirror_version_col.up.sql
diff --git a/dbm-services/common/db-resource/internal/controller/controller.go b/dbm-services/common/db-resource/internal/controller/controller.go
@@ -76,6 +76,7 @@ func (c *BackStageHandler) RegisterRouter(engine *gin.Engine) {
 	{
 		r.POST("/cc/module/check", c.RunModuleCheck)
 		r.POST("/cc/async", c.RunAsyncCmdb)
+		r.POST("/cc/sync/os/info", c.SyncOsInfo)
 	}
 }
 
@@ -96,3 +97,12 @@ func (c BackStageHandler) RunAsyncCmdb(r *gin.Context) {
 	}
 	c.SendResponse(r, nil, "async success")
 }
+
+// SyncOsInfo sync os info
+func (c BackStageHandler) SyncOsInfo(r *gin.Context) {
+	err := task.SyncOsNameInfo()
+	if err != nil {
+		logger.Error("SyncOsNameInfo failed %v", err)
+	}
+	c.SendResponse(r, nil, "async success")
+}
diff --git a/dbm-services/common/db-resource/internal/controller/manage/rs_import.go b/dbm-services/common/db-resource/internal/controller/manage/rs_import.go
@@ -23,6 +23,7 @@ import (
 	"dbm-services/common/db-resource/internal/svr/bk"
 	"dbm-services/common/db-resource/internal/svr/task"
 	"dbm-services/common/db-resource/internal/svr/yunti"
+	"dbm-services/common/db-resource/internal/util"
 	"dbm-services/common/go-pubpkg/cc.v3"
 	"dbm-services/common/go-pubpkg/errno"
 	"dbm-services/common/go-pubpkg/logger"
@@ -377,7 +378,7 @@ func (p ImportMachParam) transHostInfoToDbModule(h *cc.Host, bkCloudId int, labe
 		OsType:          model.ConvertOsTypeToHuman(osType),
 		OsBit:           h.BkOsBit,
 		OsVerion:        h.BkOsVersion,
-		OsName:          strings.TrimSpace(strings.ToLower(strings.ReplaceAll(h.OSName, " ", ""))),
+		OsName:          util.CleanOsName(h.OSName),
 		UpdateTime:      time.Now(),
 		CreateTime:      time.Now(),
 	}

diff --git a/dbm-services/common/db-resource/internal/model/TbRpDetail.go b/dbm-services/common/db-resource/internal/model/TbRpDetail.go
@@ -72,8 +72,6 @@ type TbRpDetail struct {
 	OsVerion string `gorm:"column:os_version;type:varchar(64);not null;comment:'操作系统版本'" json:"os_version"`
 	//  操作系统名称
 	OsName string `gorm:"column:os_name;type:varchar(64);not null;comment:'操作系统名称'" json:"os_name"`
-	// 操作系统镜像版本
-	OsMirrorVersion string `gorm:"column:os_mirror_version;type:varchar(64);not null;comment:'操作系统镜像版本'" json:"os_mirror_version"`
 	//  磁盘Raid
 	Raid string `gorm:"column:raid;type:varchar(20);not null" json:"raid"`
 	//  实际城市ID

diff --git a/dbm-services/common/db-resource/internal/model/TbRpDetailArchive.go b/dbm-services/common/db-resource/internal/model/TbRpDetailArchive.go
@@ -43,8 +43,6 @@ type TbRpDetailArchive struct {
 	OsVerion string `gorm:"column:os_version;type:varchar(64);not null;comment:'操作系统版本'" json:"os_version"`
 	//  操作系统名称
 	OsName string `gorm:"column:os_name;type:varchar(64);not null;comment:'操作系统名称'" json:"os_name"`
-	// 操作系统镜像版本
-	OsMirrorVersion string `gorm:"column:os_mirror_version;type:varchar(64);not null;comment:'操作系统镜像版本'" json:"os_mirror_version"`
 	// 磁盘Raid
 	Raid string `gorm:"column:raid;type:varchar(20);not null" json:"raid"`
 	//  实际城市ID

diff --git a/dbm-services/common/db-resource/internal/svr/task/task.go b/dbm-services/common/db-resource/internal/svr/task/task.go
@@ -19,6 +19,7 @@ import (
 
 	"dbm-services/common/db-resource/internal/model"
 	"dbm-services/common/db-resource/internal/svr/bk"
+	"dbm-services/common/db-resource/internal/util"
 	"dbm-services/common/go-pubpkg/cc.v3"
 	"dbm-services/common/go-pubpkg/cmutil"
 	"dbm-services/common/go-pubpkg/logger"
@@ -215,3 +216,39 @@ func AsyncResourceHardInfo() (err error) {
 	}
 	return nil
 }
+
+// SyncOsNameInfo sync os name info
+func SyncOsNameInfo() (err error) {
+	logger.Info("start async from cmdb ...")
+	var rsList []model.TbRpDetail
+	err = model.DB.Self.Table(model.TbRpDetailName()).Find(&rsList).Error
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil
+		}
+		logger.Error("query total_storage_cap less than 0,err %w ", err)
+		return err
+	}
+	bizHostMap := make(map[int][]string)
+	for _, rs := range rsList {
+		bizHostMap[rs.BkBizId] = append(bizHostMap[rs.BkBizId], rs.IP)
+	}
+	for bizId, hosts := range bizHostMap {
+		ccInfos, _, err := bk.BatchQueryHostsInfo(bizId, hosts)
+		if err != nil {
+			logger.Warn("query machine hardinfo from cmdb failed %s", err.Error())
+			continue
+		}
+		for _, ccInfo := range ccInfos {
+			err = model.DB.Self.Table(model.TbRpDetailName()).Where("ip = ? and  bk_biz_id = ? ", ccInfo.InnerIP, bizId).
+				Updates(map[string]interface{}{
+					"os_name":    util.CleanOsName(ccInfo.OSName),
+					"os_version": ccInfo.BkOsVersion,
+				}).Error
+			if err != nil {
+				logger.Warn("request cmdb api failed %s", err.Error())
+			}
+		}
+	}
+	return nil
+}