updated metrics

App/Monitor/monitorRoutes.py

@@ -12,10 +12,16 @@ def get_metrics():
     cpu_usage = psutil.cpu_percent()
 
     # Get memory usage
-    memory_usage = psutil.virtual_memory().percent
+    memory_usage = psutil.virtual_memory()
+    memory_total = memory_usage.total
+    memory_available = memory_usage.available
+    memory_percent = memory_usage.percent
 
     # Get disk usage
-    disk_usage = psutil.disk_usage("/").percent
+    disk_usage = psutil.disk_usage("/")
+    disk_total = disk_usage.total
+    disk_used = disk_usage.used
+    disk_percent = disk_usage.percent
 
     # Get network statistics
     network_stats = psutil.net_io_counters()
@@ -23,8 +29,12 @@ def get_metrics():
     # Create a dictionary with the metrics
     metrics = {
         "cpu_usage": cpu_usage,
-        "memory_usage": memory_usage,
-        "disk_usage": disk_usage,
+        "memory_usage": {
+            "total": memory_total,
+            "available": memory_available,
+            "percent": memory_percent,
+        },
+        "disk_usage": {"total": disk_total, "used": disk_used, "percent": disk_percent},
         "network_stats": {
             "bytes_sent": network_stats.bytes_sent,
             "bytes_received": network_stats.bytes_recv,