updated get_ram_and_disk method

agent.py

@@ -5,6 +5,7 @@ import json
 import http.client
 import subprocess
 import re
+import shutil
 
 NON_UPDATABLE_KEYS = [
     'server_type',
@@ -28,6 +29,7 @@ class ServerData:
         self.hostname = os.uname().nodename
         self.public_ip = self.get_public_ip()
         self.dmidecode_data = self.parse_dmidecode_output()
+        self.hdparm_data = self.parse_hdparm_output()
         logging.basicConfig(level=logging.INFO)
 
     def parse_dmidecode_output(self):
@@ -91,6 +93,48 @@ class ServerData:
                 pass
         return []
 
+    def parse_hdparm_output(self):
+        devices = {}
+
+        # Check if hdparm exists
+        if shutil.which('hdparm') is None:
+            logging.error("hdparm not found")
+            return devices
+
+        # Get the list of devices
+        try:
+            device_list = subprocess.check_output(['lsblk', '-d', '-o', 'NAME'], stderr=subprocess.STDOUT, universal_newlines=True).split()[1:]
+        except subprocess.CalledProcessError as e:
+            logging.error("Failed to get device list: {}".format(e))
+            return devices
+
+        for device in device_list:
+            # Only get details of devices that start with 'sd': sda, sdb, etc.
+            if not device.startswith('sd'):
+                continue
+
+            device = '/dev/' + device
+            try:
+                # Get the output
+                output = subprocess.check_output(['hdparm', '-I', device], stderr=subprocess.STDOUT, universal_newlines=True)
+            except subprocess.CalledProcessError as e:
+                logging.error("Failed to get hdparm output for {}: {}".format(device, e))
+                continue
+
+            # Parse the output
+            details = {}
+            details['model_number'] = re.search(r'Model Number:\s*(.*)', output).group(1)
+            details['serial_number'] = re.search(r'Serial Number:\s*(.*)', output).group(1)
+            details['firmware_revision'] = re.search(r'Firmware Revision:\s*(.*)', output).group(1)
+            details['transport'] = re.search(r'Transport:\s*(.*)', output).group(1)
+            details['checksum'] = re.search(r'Checksum:\s*(.*)', output).group(1)
+            details['buffer_size'] = re.search(r'cache/buffer size\s*=\s*(.*)', output).group(1)
+            details['form_factor'] = re.search(r'Form Factor:\s*(.*)', output).group(1)
+
+            devices[device] = details
+
+        return devices
+
     def get_ram_and_disk(self):
         # RAM information
         with open('/proc/meminfo', 'r') as f:
@@ -101,13 +145,14 @@ class ServerData:
         for device in os.listdir('/sys/block'):
             device_path = '/sys/block/{}/device'.format(device)
             size_path = '/sys/block/{}/size'.format(device)
-            if os.path.islink(device_path):
-                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
+            if not os.path.islink(device_path):
+                continue
+            try:
+                with open(size_path, 'r') as f:
+                    size = int(f.read().strip())
+                    disk += size
+            except Exception:
+                pass
 
         disk = disk * 512 // (1024**3)  # convert to GB
         logging.info("RAM: {}MB, Disk: {}GB".format(ram, disk))
@@ -203,9 +248,15 @@ class ServerData:
             serial_number = ram.get('Serial Number', 'Unknown')
             ram_type = ram.get('Type', 'Unknown')
             ram_details.append("Size: {}, Speed: {} @ {}, ECC: {}, Serial Number: {}, Type: {}".format(size, speed, configured_speed, ecc, serial_number, ram_type))
+        
+        # SATA Storage media
+        sata_details = []
+        for device, details in self.hdparm_data.items():
+            sata_details.append("Device: {}, Model: {}, Serial: {}, Checksum: {}, Buffer Size: {}, Form Factor: {}".format(
+                device, details['model_number'], details['serial_number'], details['checksum'], details['buffer_size'], details['form_factor']))
 
-        note = "Chassis Model: {} | Serial Number: {} ||| Processor Model: {} | Count: {} ||| RAM Details: {}".format(
-        chassis_model, chassis_serial, processor_model, processor_count, ' | '.join(ram_details))
+        note = "Chassis Model: {} | Serial Number: {} ||| Processor Model: {} | Count: {} ||| RAM Details: {} ||| SATA Details {}".format(
+        chassis_model, chassis_serial, processor_model, processor_count, ' | '.join(ram_details), ' | '.join(sata_details))
 
         note_data = {
             'note': note,