Fix physical drive grouping logic for unified pool visualization

Updated filesystem grouping to use extract_base_device method for proper partition-to-drive mapping. This ensures nvme0n1p1 and nvme0n1p2 are correctly grouped under nvme0n1 drive pool instead of separate pools.
Add partial filesystem data display for debugging
2025-11-23 13:54:33 +01:00 · 2025-11-23 13:33:36 +01:00 · 2025-11-23 13:24:13 +01:00 · 2025-11-23 13:11:05 +01:00
6 changed files with 34 additions and 13 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"

 [[package]]
 name = "cm-dashboard"
-version = "0.1.104"
+version = "0.1.108"
 dependencies = [
 "anyhow",
 "chrono",
@@ -301,7 +301,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.104"
+version = "0.1.108"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -324,7 +324,7 @@ dependencies = [

 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.104"
+version = "0.1.108"
 dependencies = [
 "chrono",
 "serde",
--- a/agent/Cargo.toml
+++ b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.105"
+version = "0.1.109"
 edition = "2021"

 [dependencies]
--- a/agent/src/collectors/disk.rs
+++ b/agent/src/collectors/disk.rs
@@ -419,13 +419,22 @@ impl DiskCollector {
            // Get the physical drive name for this mount point
            if let Some(devices) = self.detected_devices.get(&fs.mount_point) {
                if let Some(device_name) = devices.first() {
-                    // Extract drive name (e.g., "nvme0n1" from "nvme0n1")
-                    let drive_name = device_name.clone();
+                    // Extract base drive name from detected device
+                    let drive_name = Self::extract_base_device(device_name)
+                        .unwrap_or_else(|| device_name.clone());
+                    
+                    debug!("Grouping filesystem {} (device: {}) under drive: {}", 
+                           fs.mount_point, device_name, drive_name);
+                    
                    grouped.entry(drive_name).or_insert_with(Vec::new).push(fs.clone());
                }
            }
        }
        
+        debug!("Filesystem grouping result: {} drives with filesystems: {:?}", 
+               grouped.len(), 
+               grouped.keys().collect::<Vec<_>>());
+        
        Ok(grouped)
    }

--- a/dashboard/Cargo.toml
+++ b/dashboard/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.105"
+version = "0.1.109"
 edition = "2021"

 [dependencies]
--- a/dashboard/src/ui/widgets/system.rs
+++ b/dashboard/src/ui/widgets/system.rs
@@ -384,11 +384,14 @@ impl SystemWidget {
            if let Some(fs_start) = metric_name.find("_fs_") {
                let after_fs = &metric_name[fs_start + 4..]; // Skip "_fs_"
                
-                // Find the last underscore to separate filesystem name from metric type
-                if let Some(last_underscore) = after_fs.rfind('_') {
-                    let fs_name = after_fs[..last_underscore].to_string();
-                    let metric_type = after_fs[last_underscore + 1..].to_string();
-                    return (Some(fs_name), Some(metric_type));
+                // Look for known metric suffixes (these can contain underscores)
+                let known_suffixes = ["usage_percent", "used_gb", "total_gb", "available_gb", "mount_point"];
+                
+                for suffix in known_suffixes {
+                    if after_fs.ends_with(suffix) {
+                        let fs_name = after_fs[..after_fs.len() - suffix.len() - 1].to_string(); // Remove suffix + underscore
+                        return (Some(fs_name), Some(suffix.to_string()));
+                    }
                }
            }
        }
@@ -559,6 +562,15 @@ impl SystemWidget {
                        (Some(pct), Some(used), Some(total)) => {
                            format!("{}: {:.0}% {:.1}GB/{:.1}GB", filesystem.mount_point, pct, used, total)
                        }
+                        (Some(pct), _, Some(total)) => {
+                            format!("{}: {:.0}% —GB/{:.1}GB", filesystem.mount_point, pct, total)
+                        }
+                        (Some(pct), _, _) => {
+                            format!("{}: {:.0}% —GB/—GB", filesystem.mount_point, pct)
+                        }
+                        (_, Some(used), Some(total)) => {
+                            format!("{}: —% {:.1}GB/{:.1}GB", filesystem.mount_point, used, total)
+                        }
                        _ => format!("{}: —% —GB/—GB", filesystem.mount_point),
                    };

--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.105"
+version = "0.1.109"
 edition = "2021"

 [dependencies]
Author	SHA1	Message	Date
Christoffer Martinsson	7a3ee3d5ba	Fix physical drive grouping logic for unified pool visualization All checks were successful Build and Release / build-and-release (push) Successful in 2m11s Details Updated filesystem grouping to use extract_base_device method for proper partition-to-drive mapping. This ensures nvme0n1p1 and nvme0n1p2 are correctly grouped under nvme0n1 drive pool instead of separate pools.	2025-11-23 13:54:33 +01:00
Christoffer Martinsson	0e8b149718	Add partial filesystem data display for debugging All checks were successful Build and Release / build-and-release (push) Successful in 2m11s Details - Make filesystem display more forgiving - show partial data if available - Will display usage% even if GB values are missing, or vice versa - This should help identify which specific metrics aren't being populated - Debug version to identify filesystem data population issues	2025-11-23 13:33:36 +01:00
Christoffer Martinsson	2c27d0e1db	Prepare v0.1.107 for filesystem data debugging All checks were successful Build and Release / build-and-release (push) Successful in 1m31s Details Current status: Filesystem children appear with correct mount points but show —% —GB/—GB Need to debug why usage_percent, used_gb, total_gb metrics aren't populating filesystem entries	2025-11-23 13:24:13 +01:00
Christoffer Martinsson	9f18488752	Fix filesystem metric parsing for correct mount point names All checks were successful Build and Release / build-and-release (push) Successful in 2m10s Details - Fix extract_filesystem_metric() to handle multi-underscore metric names correctly - Parse known metric suffixes (usage_percent, mount_point, available_gb, etc.) - Prevent incorrect parsing like boot_mount_point -> fs_name='boot_mount', metric_type='point' - Should now correctly show /boot and / instead of /boot/mount and /root/mount	2025-11-23 13:11:05 +01:00