opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-29 17:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5365 from swordqiu/hotfix/qj-monitor-details

Browse Source 
fix: implements details and list for monitor service
This commit is contained in:
Zexi Li
2020-03-07 15:52:09 +08:00
committed by GitHub
parent ff4d99012d 4b311a8264
commit ecc0679eb1
10 changed files with 321 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dbinstances.go
+22 -5
View File
@@ -429,16 +429,33 @@ func (manager *SDBInstanceManager) FetchCustomizeColumns(
virtRows := manager.SVirtualResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
manRows := manager.SManagedResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
regRows := manager.SCloudregionResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
vpcRows := manager.SVpcResourceBaseManager.FetchCustomizeColumns(ctx, userCred, query, objs, fields, isList)
vpcIds := make([]string, len(rows))
for i := range rows {
rows[i] = api.DBInstanceDetails{
VirtualResourceDetails: virtRows[i],
VpcResourceInfo: vpcRows[i],
VirtualResourceDetails: virtRows[i],
ManagedResourceInfo: manRows[i],
CloudregionResourceInfo: regRows[i],
}
rows[i].ManagedResourceInfo = manRows[i]
rows[i].CloudregionResourceInfo = regRows[i]
rows[i] = objs[i].(*SDBInstance).getMoreDetails(rows[i])
vpcIds[i] = objs[i].(*SDBInstance).VpcId
}
vpcs := make(map[string]SVpc)
err := db.FetchStandaloneObjectsByIds(VpcManager, vpcIds, &vpcs)
if err != nil {
log.Errorf("db.FetchStandaloneObjectsByIds fail %s", err)
return rows
}
for i := range rows {
if vpc, ok := vpcs[vpcIds[i]]; ok {
rows[i].Vpc = vpc.Name
rows[i].VpcExtId = vpc.ExternalId
}
}
return rows
}