fix(region): kafka usage

pkg/compute/models/kafka.go

@@ -312,8 +312,7 @@ func (self *SCloudregion) SyncKafkas(ctx context.Context, userCred mcclient.Toke
 
 type SKafkaCountStat struct {
 	TotalKafkaCount int
-	TotalCpuCount   int
-	TotalMemSizeGb  int
+	TotalDiskSizeGb int
 }
 
 func (man *SKafkaManager) TotalCount(
@@ -324,8 +323,7 @@ func (man *SKafkaManager) TotalCount(
 ) (SKafkaCountStat, error) {
 	sq := man.Query().SubQuery()
 	q := sq.Query(sqlchemy.COUNT("total_kafka_count"),
-		sqlchemy.SUM("total_cpu_count", sq.Field("vcpu_count")),
-		sqlchemy.SUM("total_mem_size_gb", sq.Field("vmem_size_gb")))
+		sqlchemy.SUM("total_disk_size_gb", sq.Field("disk_size_gb")))
 
 	q = scopeOwnerIdFilter(q, scope, ownerId)
 	q = CloudProviderFilter(q, q.Field("manager_id"), providers, brands, cloudEnv)

pkg/compute/usages/handler.go

@@ -989,8 +989,7 @@ func KafkaUsage(scope rbacutils.TRbacScope, ownerId mcclient.IIdentityProvider,
 	cnt, _ := models.KafkaManager.TotalCount(scope, ownerId, rangeObjs, providers, brands, cloudEnv)
 	count := make(map[string]interface{})
 	count[getKey(scope, "kafka")] = cnt.TotalKafkaCount
-	count[getKey(scope, "kafka.cpu")] = cnt.TotalCpuCount
-	count[getKey(scope, "kafka.memory")] = cnt.TotalMemSizeGb * 1024
+	count[getKey(scope, "kafka.disk")] = cnt.TotalDiskSizeGb
 	return count
 }