From 813e25fb3bdcbbdba129ce47d8d4c93a4be73e1a Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Fri, 7 Jun 2024 14:48:16 +0800
Subject: [PATCH 1/2] fix clusterResouces bugs

Former-commit-id: d9dc30e4262df90c75bdbb5c671f296915fae1a7
---
 api/internal/scheduler/database/aiStorage.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/internal/scheduler/database/aiStorage.go b/api/internal/scheduler/database/aiStorage.go
index ee3d8680..60b2059a 100644
--- a/api/internal/scheduler/database/aiStorage.go
+++ b/api/internal/scheduler/database/aiStorage.go
@@ -219,6 +219,7 @@ func (s *AiStorage) SaveClusterResources(adapterId string, clusterId string, clu
 	}
 	// prometheus
 	param := tracker.ClusterLoadRecord{
+		AdapterId:   aId,
 		ClusterName: clusterName,
 		CpuAvail:    cpuAvail,
 		CpuTotal:    cpuTotal,
@@ -239,6 +240,7 @@ func (s *AiStorage) UpdateClusterResources(clusterResource *models.TClusterResou
 	}
 	// prometheus
 	param := tracker.ClusterLoadRecord{
+		AdapterId:         clusterResource.AdapterId,
 		ClusterName:       clusterResource.ClusterName,
 		CpuAvail:          clusterResource.CpuAvail,
 		CpuTotal:          clusterResource.CpuTotal,

From ed6cf043d00218bc1a8d1d6a4b2c1f76fa0b7d8b Mon Sep 17 00:00:00 2001
From: tzwang <wtz1003@sina.com>
Date: Fri, 7 Jun 2024 14:51:48 +0800
Subject: [PATCH 2/2] fix clusterResouces bugs

Former-commit-id: 4a96ca733136179cca1284f3b68a7aa59bd98d8e
---
 api/internal/scheduler/database/aiStorage.go | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/api/internal/scheduler/database/aiStorage.go b/api/internal/scheduler/database/aiStorage.go
index 60b2059a..3f0b3f78 100644
--- a/api/internal/scheduler/database/aiStorage.go
+++ b/api/internal/scheduler/database/aiStorage.go
@@ -219,14 +219,17 @@ func (s *AiStorage) SaveClusterResources(adapterId string, clusterId string, clu
 	}
 	// prometheus
 	param := tracker.ClusterLoadRecord{
-		AdapterId:   aId,
-		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