Fix pool name extraction to prevent wrong physical drive naming

- Remove fallback logic that could extract incorrect pool names
- Simplify pool suffix matching to use explicit arrays
- Ensure only valid metric patterns create pools

Cargo.lock

@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 
 [[package]]
 name = "cm-dashboard"
-version = "0.1.116"
+version = "0.1.126"
 dependencies = [
  "anyhow",
  "chrono",
@@ -301,7 +301,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-agent"
-version = "0.1.116"
+version = "0.1.126"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -324,7 +324,7 @@ dependencies = [
 
 [[package]]
 name = "cm-dashboard-shared"
-version = "0.1.116"
+version = "0.1.126"
 dependencies = [
  "chrono",
  "serde",

agent/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-agent"
-version = "0.1.116"
+version = "0.1.126"
 edition = "2021"
 
 [dependencies]

agent/src/collectors/disk.rs

@@ -202,15 +202,34 @@ impl DiskCollector {
                 let (total_bytes, used_bytes) = self.get_filesystem_info(&mount_point)
                     .unwrap_or((0, 0));
                 
-                // Parse member paths
-                let member_paths: Vec<String> = device_sources
+                // Parse member paths - handle both full paths and numeric references
+                let raw_paths: Vec<String> = device_sources
                     .split(':')
                     .map(|s| s.trim().to_string())
                     .filter(|s| !s.is_empty())
                     .collect();
                 
+                // Convert numeric references to actual mount points if needed
+                let mut member_paths = if raw_paths.iter().any(|path| !path.starts_with('/')) {
+                    // Handle numeric format like "1:2" by finding corresponding /mnt/disk* paths
+                    self.resolve_numeric_mergerfs_paths(&raw_paths)?
+                } else {
+                    // Already full paths
+                    raw_paths
+                };
+                
+                // For SnapRAID setups, also include parity drives as part of the pool
+                let snapraid_parity_paths = self.discover_snapraid_parity_drives()?;
+                member_paths.extend(snapraid_parity_paths);
+                
                 // Categorize as data vs parity drives
-                let (data_drives, parity_drives) = self.categorize_pool_drives(&member_paths)?;
+                let (data_drives, parity_drives) = match self.categorize_pool_drives(&member_paths) {
+                    Ok(drives) => drives,
+                    Err(e) => {
+                        debug!("Failed to categorize drives for pool {}: {}. Skipping.", mount_point, e);
+                        continue;
+                    }
+                };
                 
                 pools.push(MergerfsPool {
                     mount_point,
@@ -225,6 +244,16 @@ impl DiskCollector {
         Ok(pools)
     }
 
+    /// Discover SnapRAID parity drives
+    fn discover_snapraid_parity_drives(&self) -> Result<Vec<String>> {
+        let mount_devices = self.get_mount_devices()?;
+        let parity_paths: Vec<String> = mount_devices.keys()
+            .filter(|path| path.contains("parity"))
+            .cloned()
+            .collect();
+        Ok(parity_paths)
+    }
+
     /// Categorize pool member drives as data vs parity
     fn categorize_pool_drives(&self, member_paths: &[String]) -> Result<(Vec<DriveInfo>, Vec<DriveInfo>)> {
         let mut data_drives = Vec::new();
@@ -286,6 +315,35 @@ impl DiskCollector {
         })
     }
 
+    /// Resolve numeric mergerfs references like "1:2" to actual mount paths
+    fn resolve_numeric_mergerfs_paths(&self, numeric_refs: &[String]) -> Result<Vec<String>> {
+        let mut resolved_paths = Vec::new();
+        
+        // Get all mount points that look like /mnt/disk* or /mnt/parity*
+        let mount_devices = self.get_mount_devices()?;
+        let mut disk_mounts: Vec<String> = mount_devices.keys()
+            .filter(|path| path.starts_with("/mnt/disk") || path.starts_with("/mnt/parity"))
+            .cloned()
+            .collect();
+        disk_mounts.sort(); // Ensure consistent ordering
+        
+        for num_ref in numeric_refs {
+            if let Ok(index) = num_ref.parse::<usize>() {
+                // Convert 1-based index to 0-based
+                if index > 0 && index <= disk_mounts.len() {
+                    resolved_paths.push(disk_mounts[index - 1].clone());
+                }
+            }
+        }
+        
+        // Fallback: if we couldn't resolve, return the original paths
+        if resolved_paths.is_empty() {
+            resolved_paths = numeric_refs.to_vec();
+        }
+        
+        Ok(resolved_paths)
+    }
+
     /// Extract base device name from partition (e.g., "nvme0n1p2" -> "nvme0n1", "sda1" -> "sda")
     fn extract_base_device(&self, device_name: &str) -> String {
         // Handle NVMe devices (nvme0n1p1 -> nvme0n1)
@@ -506,7 +564,7 @@ impl Collector for DiskCollector {
         let topology = match self.discover_storage() {
             Ok(topology) => topology,
             Err(e) => {
-                debug!("Storage discovery failed: {}", e);
+                tracing::error!("Storage discovery failed: {}", e);
                 return Ok(metrics);
             }
         };
@@ -695,7 +753,7 @@ impl DiskCollector {
                 value: MetricValue::Float(self.bytes_to_gb(filesystem.used_bytes)),
                 unit: Some("GB".to_string()),
                 description: Some(format!("{}: {}", filesystem.mount_point, self.bytes_to_human_readable(filesystem.used_bytes))),
-                status: Status::Ok,
+                status: fs_status.clone(),
                 timestamp,
             });
 
@@ -704,7 +762,7 @@ impl DiskCollector {
                 value: MetricValue::Float(self.bytes_to_gb(filesystem.total_bytes)),
                 unit: Some("GB".to_string()),
                 description: Some(format!("{}: {}", filesystem.mount_point, self.bytes_to_human_readable(filesystem.total_bytes))),
-                status: Status::Ok,
+                status: fs_status.clone(),
                 timestamp,
             });
 
@@ -737,7 +795,13 @@ impl DiskCollector {
         timestamp: u64,
         status_tracker: &mut StatusTracker
     ) {
-        let pool_name = pool.mount_point.trim_start_matches('/').replace('/', "_");
+        // Use consistent pool naming: extract mount point without leading slash
+        let pool_name = if pool.mount_point == "/" {
+            "root".to_string()
+        } else {
+            pool.mount_point.trim_start_matches('/').replace('/', "_")
+        };
+        
         if pool_name.is_empty() {
             return;
         }
@@ -841,12 +905,12 @@ impl DiskCollector {
         });
 
         // Individual drive metrics
-        for (i, drive) in pool.data_drives.iter().enumerate() {
-            self.generate_pool_drive_metrics(metrics, &pool_name, &format!("data_{}", i), drive, timestamp, status_tracker);
+        for drive in &pool.data_drives {
+            self.generate_pool_drive_metrics(metrics, &pool_name, &drive.device, drive, timestamp, status_tracker);
         }
 
-        for (i, drive) in pool.parity_drives.iter().enumerate() {
-            self.generate_pool_drive_metrics(metrics, &pool_name, &format!("parity_{}", i), drive, timestamp, status_tracker);
+        for drive in &pool.parity_drives {
+            self.generate_pool_drive_metrics(metrics, &pool_name, &drive.device, drive, timestamp, status_tracker);
         }
     }
 

dashboard/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard"
-version = "0.1.116"
+version = "0.1.126"
 edition = "2021"
 
 [dependencies]

dashboard/src/ui/widgets/system.rs

@@ -153,7 +153,9 @@ impl SystemWidget {
             "steampool" => "/mnt/steampool".to_string(),
             "steampool_1" => "/steampool_1".to_string(),
             "steampool_2" => "/steampool_2".to_string(),
-            _ => format!("/{}", pool_name), // Default fallback
+            // For device names (nvme0n1, sda, etc.), use the device name directly
+            name if name.starts_with("nvme") || name.starts_with("sd") || name.starts_with("hd") => name.to_string(),
+            _ => format!("/{}", pool_name), // Default fallback for mount-based pools
         }
     }
 
@@ -164,10 +166,9 @@ impl SystemWidget {
         for metric in metrics {
             if metric.name.starts_with("disk_") {
                 if let Some(pool_name) = self.extract_pool_name(&metric.name) {
-                    let mount_point = self.get_mount_point_for_pool(&pool_name);
                     let pool = pools.entry(pool_name.clone()).or_insert_with(|| StoragePool {
                         name: pool_name.clone(),
-                        mount_point: mount_point.clone(),
+                        mount_point: self.get_mount_point_for_pool(&pool_name), // Default fallback
                         pool_type: "single".to_string(), // Default, will be updated
                         pool_health: None,
                         drives: Vec::new(),
@@ -180,19 +181,26 @@ impl SystemWidget {
                     });
 
                     // Parse different metric types
-                    if metric.name.contains("_usage_percent") {
+                    if metric.name.contains("_usage_percent") && !metric.name.contains("_fs_") {
+                        // Only use drive-level metrics for pool totals, not filesystem metrics
                         if let MetricValue::Float(usage) = metric.value {
                             pool.usage_percent = Some(usage);
                             pool.status = metric.status.clone();
                         }
-                    } else if metric.name.contains("_used_gb") {
+                    } else if metric.name.contains("_used_gb") && !metric.name.contains("_fs_") {
+                        // Only use drive-level metrics for pool totals, not filesystem metrics
                         if let MetricValue::Float(used) = metric.value {
                             pool.used_gb = Some(used);
                         }
-                    } else if metric.name.contains("_total_gb") {
+                    } else if metric.name.contains("_total_gb") && !metric.name.contains("_fs_") {
+                        // Only use drive-level metrics for pool totals, not filesystem metrics  
                         if let MetricValue::Float(total) = metric.value {
                             pool.total_gb = Some(total);
                         }
+                    } else if metric.name.contains("_mount_point") {
+                        if let MetricValue::String(mount_point) = &metric.value {
+                            pool.mount_point = mount_point.clone();
+                        }
                     } else if metric.name.contains("_pool_type") {
                         if let MetricValue::String(pool_type) = &metric.value {
                             pool.pool_type = pool_type.clone();
@@ -340,38 +348,36 @@ impl SystemWidget {
 
     /// Extract pool name from disk metric name
     fn extract_pool_name(&self, metric_name: &str) -> Option<String> {
-        // Pattern: disk_{pool_name}_{drive_name}_{metric_type}
+        // Pattern: disk_{pool_name}_{various suffixes}
         // Since pool_name can contain underscores, work backwards from known metric suffixes
         if metric_name.starts_with("disk_") {
-            // First try drive-specific metrics that have device names
-            if let Some(suffix_pos) = metric_name.rfind("_temperature")
-                .or_else(|| metric_name.rfind("_wear_percent"))
-                .or_else(|| metric_name.rfind("_health")) {
-                // Find the second-to-last underscore to get pool name
-                let before_suffix = &metric_name[..suffix_pos];
-                if let Some(drive_start) = before_suffix.rfind('_') {
-                    if drive_start > 5 {
-                        return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
-                    }
-                }
-            }
-            // Handle filesystem metrics: disk_{pool}_fs_{filesystem}_{metric}
-            else if metric_name.contains("_fs_") {
+            // Handle filesystem metrics: disk_{pool}_fs_{filesystem}_{metric} 
+            if metric_name.contains("_fs_") {
                 if let Some(fs_pos) = metric_name.find("_fs_") {
                     return Some(metric_name[5..fs_pos].to_string()); // Skip "disk_", extract pool name before "_fs_"
                 }
             }
-            // For pool-level metrics (usage_percent, used_gb, total_gb), take everything before the metric suffix
-            else if let Some(suffix_pos) = metric_name.rfind("_usage_percent")
-                .or_else(|| metric_name.rfind("_used_gb"))
-                .or_else(|| metric_name.rfind("_total_gb"))
-                .or_else(|| metric_name.rfind("_available_gb")) {
-                return Some(metric_name[5..suffix_pos].to_string()); // Skip "disk_"
+            
+            // Handle pool-level metrics (usage_percent, used_gb, total_gb, mount_point, pool_type, pool_health)
+            // Use rfind to get the last occurrence of these suffixes
+            let pool_suffixes = ["_usage_percent", "_used_gb", "_total_gb", "_available_gb", "_mount_point", "_pool_type", "_pool_health"];
+            for suffix in pool_suffixes {
+                if let Some(suffix_pos) = metric_name.rfind(suffix) {
+                    return Some(metric_name[5..suffix_pos].to_string()); // Skip "disk_"
+                }
             }
-            // Fallback to old behavior for unknown patterns
-            else if let Some(captures) = metric_name.strip_prefix("disk_") {
-                if let Some(pos) = captures.find('_') {
-                    return Some(captures[..pos].to_string());
+            
+            // Handle drive-specific metrics: disk_{pool}_{drive}_{metric}
+            let drive_suffixes = ["_temperature", "_wear_percent", "_health"];
+            for suffix in drive_suffixes {
+                if let Some(suffix_pos) = metric_name.rfind(suffix) {
+                    // Extract pool name by finding the second-to-last underscore
+                    let before_suffix = &metric_name[..suffix_pos];
+                    if let Some(drive_start) = before_suffix.rfind('_') {
+                        if drive_start > 5 {
+                            return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
+                        }
+                    }
                 }
             }
         }
@@ -391,10 +397,9 @@ impl SystemWidget {
                 
                 for suffix in known_suffixes {
                     if after_fs.ends_with(suffix) {
-                        // Safely calculate fs_name length
-                        let suffix_with_underscore = suffix.len() + 1;
-                        if after_fs.len() > suffix_with_underscore {
-                            let fs_name = after_fs[..after_fs.len() - suffix_with_underscore].to_string();
+                        // Extract filesystem name by removing suffix and underscore
+                        if let Some(underscore_pos) = after_fs.rfind(&format!("_{}", suffix)) {
+                            let fs_name = after_fs[..underscore_pos].to_string();
                             return (Some(fs_name), Some(suffix.to_string()));
                         }
                     }
@@ -407,13 +412,15 @@ impl SystemWidget {
     /// Extract drive name from disk metric name  
     fn extract_drive_name(&self, metric_name: &str) -> Option<String> {
         // Pattern: disk_{pool_name}_{drive_name}_{metric_type}
+        // Now using actual device names like: disk_srv_media_sdb_temperature
         // Since pool_name can contain underscores, work backwards from known metric suffixes
         if metric_name.starts_with("disk_") {
             if let Some(suffix_pos) = metric_name.rfind("_temperature")
                 .or_else(|| metric_name.rfind("_wear_percent"))
                 .or_else(|| metric_name.rfind("_health")) {
-                // Find the second-to-last underscore to get the drive name
                 let before_suffix = &metric_name[..suffix_pos];
+                
+                // Extract the last component as drive name (e.g., "sdb", "sdc", "nvme0n1")
                 if let Some(drive_start) = before_suffix.rfind('_') {
                     return Some(before_suffix[drive_start + 1..].to_string());
                 }
@@ -439,26 +446,7 @@ impl SystemWidget {
             );
             lines.push(Line::from(pool_spans));
 
-            // Pool health line (for multi-disk pools)
-            if pool.pool_type != "single" {
-                if let Some(health) = &pool.pool_health {
-                    let health_text = match health.as_str() {
-                        "healthy" => format!("Pool Status: {} Healthy", 
-                            if pool.drives.len() > 1 { format!("({} drives)", pool.drives.len()) } else { String::new() }),
-                        "degraded" => "Pool Status: ⚠ Degraded".to_string(),
-                        "critical" => "Pool Status: ✗ Critical".to_string(), 
-                        "rebuilding" => "Pool Status: ⟳ Rebuilding".to_string(),
-                        _ => format!("Pool Status: ? {}", health),
-                    };
-                    
-                    let mut health_spans = vec![
-                        Span::raw("  "),
-                        Span::styled("├─ ", Typography::tree()),
-                    ];
-                    health_spans.extend(StatusIcons::create_status_spans(pool.health_status.clone(), &health_text));
-                    lines.push(Line::from(health_spans));
-                }
-            }
+            // Skip pool health line as discussed - removed
 
             // Total usage line (always show for pools)
             let usage_text = match (pool.usage_percent, pool.used_gb, pool.total_gb) {
@@ -481,7 +469,7 @@ impl SystemWidget {
             lines.push(Line::from(usage_spans));
 
             // Drive lines with enhanced grouping
-            if pool.pool_type != "single" && pool.drives.len() > 1 {
+            if pool.pool_type.contains("mergerfs") && pool.drives.len() > 1 {
                 // Group drives by type for mergerfs pools
                 let (data_drives, parity_drives): (Vec<_>, Vec<_>) = pool.drives.iter().enumerate()
                     .partition(|(_, drive)| {
@@ -490,7 +478,7 @@ impl SystemWidget {
                     });
 
                 // Show data drives
-                if !data_drives.is_empty() && pool.pool_type.contains("mergerfs") {
+                if !data_drives.is_empty() {
                     lines.push(Line::from(vec![
                         Span::raw("  "),
                         Span::styled("├─ ", Typography::tree()),
@@ -508,7 +496,7 @@ impl SystemWidget {
                 }
 
                 // Show parity drives
-                if !parity_drives.is_empty() && pool.pool_type.contains("mergerfs") {
+                if !parity_drives.is_empty() {
                     lines.push(Line::from(vec![
                         Span::raw("  "),
                         Span::styled("└─ ", Typography::tree()),
@@ -523,13 +511,13 @@ impl SystemWidget {
                             self.render_drive_line(&mut lines, drive, "   ├─");
                         }
                     }
-                } else {
-                    // Regular drive listing for non-mergerfs pools
-                    for (i, drive) in pool.drives.iter().enumerate() {
-                        let is_last = i == pool.drives.len() - 1;
-                        let tree_symbol = if is_last { "└─" } else { "├─" };
-                        self.render_drive_line(&mut lines, drive, tree_symbol);
-                    }
+                }
+            } else if pool.pool_type != "single" && pool.drives.len() > 1 {
+                // Regular drive listing for non-mergerfs multi-drive pools
+                for (i, drive) in pool.drives.iter().enumerate() {
+                    let is_last = i == pool.drives.len() - 1;
+                    let tree_symbol = if is_last { "└─" } else { "├─" };
+                    self.render_drive_line(&mut lines, drive, tree_symbol);
                 }
             } else if pool.pool_type.starts_with("drive (") {
                 // Physical drive pools: show drive info + filesystem children
@@ -610,10 +598,12 @@ impl SystemWidget {
         if let Some(wear) = drive.wear_percent {
             drive_info.push(format!("W: {:.0}%", wear));
         }
+        
+        // Always show drive name with info, or just name if no info available
         let drive_text = if drive_info.is_empty() {
             drive.name.clone()
         } else {
-            format!("{} {}", drive.name, drive_info.join(" • "))
+            format!("{} {}", drive.name, drive_info.join(" "))
         };
 
         let mut drive_spans = vec![

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cm-dashboard-shared"
-version = "0.1.116"
+version = "0.1.126"
 edition = "2021"
 
 [dependencies]