disk space calculation using /sys/block/

agent.py

@@ -92,12 +92,24 @@ class ServerData:
         return []
 
     def get_ram_and_disk(self):
+        # RAM information
         with open('/proc/meminfo', 'r') as f:
             meminfo = f.read()
         ram = int([x for x in meminfo.split('\n') if 'MemTotal' in x][0].split()[1]) // 1024
-        with open('/proc/diskstats', 'r') as f:
+
-            diskstats = f.read()
+        # Disk space information
-        disk = sum(int(x.split()[9]) for x in diskstats.split('\n') if x) * 512 // 10**9
+        disk = 0
+        for device in os.listdir('/sys/block'):
+            size_path = f'/sys/block/{device}/size'
+            if os.path.exists(size_path) and os.access(size_path, os.R_OK):
+                try:
+                    with open(size_path, 'r') as f:
+                        size = int(f.read().strip())
+                        disk += size
+                except Exception:
+                    pass  # Skip the device if any exception occurs
+
+        disk = disk * 512 // (1024**3)  # convert to GB
         logging.info(f"RAM: {ram}MB, Disk: {disk}GB")
         return ram, disk