Merge pull request 'fix bugs' (#220) from tzwang/pcm-coordinator:master into master

Former-commit-id: 818b7110f1

api/internal/scheduler/database/aiStorage.go

@@ -219,13 +219,17 @@ func (s *AiStorage) SaveClusterResources(adapterId string, clusterId string, clu
 	}
 	// prometheus
 	param := tracker.ClusterLoadRecord{
-		ClusterName: clusterName,
-		CpuAvail:    cpuAvail,
-		CpuTotal:    cpuTotal,
-		MemoryAvail: memAvail,
-		MemoryTotal: memTotal,
-		DiskAvail:   diskAvail,
-		DiskTotal:   diskTotal,
+		AdapterId:         aId,
+		ClusterName:       clusterName,
+		CpuAvail:          cpuAvail,
+		CpuTotal:          cpuTotal,
+		CpuUtilisation:    clusterResource.CpuAvail / clusterResource.CpuTotal,
+		MemoryAvail:       memAvail,
+		MemoryTotal:       memTotal,
+		MemoryUtilisation: clusterResource.MemAvail / clusterResource.MemTotal,
+		DiskAvail:         diskAvail,
+		DiskTotal:         diskTotal,
+		DiskUtilisation:   clusterResource.DiskAvail / clusterResource.DiskTotal,
 	}
 	tracker.SyncClusterLoad(param)
 	return nil
@@ -239,6 +243,7 @@ func (s *AiStorage) UpdateClusterResources(clusterResource *models.TClusterResou
 	}
 	// prometheus
 	param := tracker.ClusterLoadRecord{
+		AdapterId:         clusterResource.AdapterId,
 		ClusterName:       clusterResource.ClusterName,
 		CpuAvail:          clusterResource.CpuAvail,
 		CpuTotal:          clusterResource.CpuTotal,