Enhance memory usage reporting with detailed breakdown for system, VM, Docker, and ZFS memory in Unraid sensors

Author: ruaan-deysel

custom_components/unraid/api/disk_operations.py

@@ -416,9 +416,15 @@ async def collect_disk_info(self) -> Tuple[List[Dict[str, Any]], Dict[str, Any]]
             # Get all disk information in a single command, but without SMART data first
             # This prevents waking up disks in standby mode
             cmd = (
-                # Get disk usage for standard Unraid mounts
+                # Get disk usage for standard Unraid mounts and all cache pools
                 "echo '===DISK_USAGE==='; "
-                "df -P -B1 /mnt/disk[0-9]* /mnt/cache* /mnt/user* 2>/dev/null | grep -v '^Filesystem' | awk '{print $6,$2,$3,$4}'; "
+                "df -P -B1 /mnt/disk[0-9]* /mnt/user* 2>/dev/null | grep -v '^Filesystem' | awk '{print $6,$2,$3,$4}'; "
+                # Get all cache pools (including those with special characters)
+                "mount | grep -E '/mnt/' | grep -v -E '(fuse\\.shfs|/var/lib/docker|/etc/libvirt)' | grep -v -E '/mnt/(disk[0-9]+|user[0-9]*|disks|remotes|addons|rootshare)' | awk '{print $3}' | while read mount_point; do "
+                "  if [ -d \"$mount_point\" ] && mountpoint -q \"$mount_point\"; then "
+                "    df -P -B1 \"$mount_point\" 2>/dev/null | grep -v '^Filesystem' | awk '{print $6,$2,$3,$4}'; "
+                "  fi; "
+                "done; "
                 # Get mount points and devices (including ZFS and other custom mounts)
                 "echo '===MOUNT_INFO==='; "
                 "mount | grep -E '/mnt/' | awk '{print $1,$3,$5}'; "

custom_components/unraid/api/smart_operations.py

@@ -150,8 +150,14 @@ async def get_smart_data(
                         _LOGGER.error("Invalid disk number in %s", device)
                         return {"state": "error", "error": "Invalid device name", "temperature": None}
                 else:
-                    _LOGGER.error("Unrecognized device format: %s", device)
-                    return {"state": "error", "error": "Invalid device name", "temperature": None}
+                    # Check if this is a ZFS pool name
+                    zfs_device = await self._resolve_zfs_pool_device(device)
+                    if zfs_device:
+                        device_path = zfs_device
+                        _LOGGER.debug("Resolved ZFS pool '%s' to device '%s'", device, device_path)
+                    else:
+                        _LOGGER.error("Unrecognized device format: %s", device)
+                        return {"state": "error", "error": "Invalid device name", "temperature": None}
 
             # Strip partition numbers from device path for SMART data collection
             # For example, convert /dev/nvme0n1p1 to /dev/nvme0n1
@@ -562,4 +568,35 @@ async def get_usb_detection_stats(self) -> Dict[str, Any]:
     def clear_usb_cache(self) -> None:
         """Clear USB detection cache (useful for testing or troubleshooting)."""
         self._usb_detector.clear_cache()
-        _LOGGER.info("USB detection cache cleared")
+        _LOGGER.info("USB detection cache cleared")
+
+    async def _resolve_zfs_pool_device(self, pool_name: str) -> Optional[str]:
+        """Resolve ZFS pool name to underlying physical device path."""
+        try:
+            # Check if this is a ZFS pool
+            zpool_cmd = f"zpool list -H -o name {pool_name} 2>/dev/null"
+            result = await self._instance.execute_command(zpool_cmd)
+
+            if result.exit_status != 0 or not result.stdout.strip():
+                # Not a ZFS pool
+                return None
+
+            # Get the underlying devices for this ZFS pool
+            devices_cmd = f"zpool list -v -H {pool_name} | grep -E '^\\s+\\w+' | awk '{{print $1}}' | head -1"
+            devices_result = await self._instance.execute_command(devices_cmd)
+
+            if devices_result.exit_status == 0 and devices_result.stdout.strip():
+                device = devices_result.stdout.strip()
+                # Ensure device path starts with /dev/
+                if not device.startswith('/dev/'):
+                    device = f"/dev/{device}"
+
+                _LOGGER.debug("ZFS pool '%s' resolved to device '%s'", pool_name, device)
+                return device
+
+            _LOGGER.warning("Could not resolve ZFS pool '%s' to physical device", pool_name)
+            return None
+
+        except Exception as err:
+            _LOGGER.debug("Error resolving ZFS pool '%s': %s", pool_name, err)
+            return None