Bump version to v0.1.192

Emoji rendering in terminals can be very slow, especially when rendered in the hot path (every frame for every docker image). The whale emoji 🐋 was causing significant rendering delays.

Temporary change to ASCII 'D' to test if emoji was the performance issue.

Cargo.lock

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

agent/Cargo.toml

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

agent/src/collectors/disk.rs

@@ -112,9 +112,12 @@ impl DiskCollector {
 
     /// Get block devices and their mount points using lsblk
     async fn get_mount_devices(&self) -> Result<HashMap<String, String>, CollectorError> {
-        let output = Command::new("lsblk")
+        use super::run_command_with_timeout;
-            .args(&["-rn", "-o", "NAME,MOUNTPOINT"])
+
-            .output()
+        let mut cmd = Command::new("lsblk");
+        cmd.args(&["-rn", "-o", "NAME,MOUNTPOINT"]);
+
+        let output = run_command_with_timeout(cmd, 2).await
             .map_err(|e| CollectorError::SystemRead {
                 path: "block devices".to_string(),
                 error: e.to_string(),
@@ -186,8 +189,8 @@ impl DiskCollector {
 
     /// Get filesystem info for a single mount point
     fn get_filesystem_info(&self, mount_point: &str) -> Result<(u64, u64), CollectorError> {
-        let output = Command::new("df")
+        let output = std::process::Command::new("timeout")
-            .args(&["--block-size=1", mount_point])
+            .args(&["2", "df", "--block-size=1", mount_point])
             .output()
             .map_err(|e| CollectorError::SystemRead {
                 path: format!("df {}", mount_point),
@@ -386,7 +389,7 @@ impl DiskCollector {
     /// Get SMART data for drives
     async fn get_smart_data_for_drives(&self, physical_drives: &[PhysicalDrive], mergerfs_pools: &[MergerfsPool]) -> HashMap<String, SmartData> {
         let mut smart_data = HashMap::new();
-        
+
         // Collect all drive names
         let mut all_drives = std::collections::HashSet::new();
         for drive in physical_drives {
@@ -413,23 +416,26 @@ impl DiskCollector {
 
     /// Get SMART data for a single drive
     async fn get_smart_data(&self, drive_name: &str) -> Result<SmartData, CollectorError> {
-        let output = Command::new("sudo")
+        use super::run_command_with_timeout;
-            .args(&["smartctl", "-a", &format!("/dev/{}", drive_name)])
+
-            .output()
+        // Use direct smartctl (no sudo) - service has CAP_SYS_RAWIO and CAP_SYS_ADMIN capabilities
+        // For NVMe drives, specify device type explicitly
+        let mut cmd = Command::new("smartctl");
+        if drive_name.starts_with("nvme") {
+            cmd.args(&["-d", "nvme", "-a", &format!("/dev/{}", drive_name)]);
+        } else {
+            cmd.args(&["-a", &format!("/dev/{}", drive_name)]);
+        }
+
+        let output = run_command_with_timeout(cmd, 3).await
             .map_err(|e| CollectorError::SystemRead {
                 path: format!("SMART data for {}", drive_name),
                 error: e.to_string(),
             })?;
 
         let output_str = String::from_utf8_lossy(&output.stdout);
-        let error_str = String::from_utf8_lossy(&output.stderr);
+
-        
-        // Debug logging for SMART command results
-        debug!("SMART output for {}: status={}, stdout_len={}, stderr={}", 
-            drive_name, output.status, output_str.len(), error_str);
-        
         if !output.status.success() {
-            debug!("SMART command failed for {}: {}", drive_name, error_str);
             // Return unknown data rather than failing completely
             return Ok(SmartData {
                 health: "UNKNOWN".to_string(),
@@ -756,9 +762,9 @@ impl DiskCollector {
 
     /// Get drive information for a mount path
     fn get_drive_info_for_path(&self, path: &str) -> anyhow::Result<PoolDrive> {
-        // Use lsblk to find the backing device
+        // Use lsblk to find the backing device with timeout
-        let output = Command::new("lsblk")
+        let output = Command::new("timeout")
-            .args(&["-rn", "-o", "NAME,MOUNTPOINT"])
+            .args(&["2", "lsblk", "-rn", "-o", "NAME,MOUNTPOINT"])
             .output()
             .map_err(|e| anyhow::anyhow!("Failed to run lsblk: {}", e))?;
             

agent/src/collectors/memory.rs

@@ -105,12 +105,12 @@ impl MemoryCollector {
             return Ok(());
         }
 
-        // Get usage data for all tmpfs mounts at once using df
+        // Get usage data for all tmpfs mounts at once using df (with 2 second timeout)
-        let mut df_args = vec!["df", "--output=target,size,used", "--block-size=1"];
+        let mut df_args = vec!["2", "df", "--output=target,size,used", "--block-size=1"];
         df_args.extend(tmpfs_mounts.iter().map(|s| s.as_str()));
 
-        let df_output = std::process::Command::new(df_args[0])
+        let df_output = std::process::Command::new("timeout")
-            .args(&df_args[1..])
+            .args(&df_args[..])
             .output()
             .map_err(|e| CollectorError::SystemRead {
                 path: "tmpfs mounts".to_string(),

agent/src/collectors/mod.rs

@@ -1,6 +1,8 @@
 use async_trait::async_trait;
 use cm_dashboard_shared::{AgentData};
-
+use std::process::{Command, Output};
+use std::time::Duration;
+use tokio::time::timeout;
 
 pub mod backup;
 pub mod cpu;
@@ -13,6 +15,20 @@ pub mod systemd;
 
 pub use error::CollectorError;
 
+/// Run a command with a timeout to prevent blocking
+pub async fn run_command_with_timeout(mut cmd: Command, timeout_secs: u64) -> std::io::Result<Output> {
+    let timeout_duration = Duration::from_secs(timeout_secs);
+
+    match timeout(timeout_duration, tokio::task::spawn_blocking(move || cmd.output())).await {
+        Ok(Ok(result)) => result,
+        Ok(Err(e)) => Err(std::io::Error::new(std::io::ErrorKind::Other, e)),
+        Err(_) => Err(std::io::Error::new(
+            std::io::ErrorKind::TimedOut,
+            format!("Command timed out after {} seconds", timeout_secs)
+        )),
+    }
+}
+
 
 /// Base trait for all collectors with direct structured data output
 #[async_trait]

agent/src/collectors/network.rs

@@ -49,11 +49,68 @@ impl NetworkCollector {
         }
     }
 
+    /// Get the primary physical interface (the one with default route)
+    fn get_primary_physical_interface() -> Option<String> {
+        match Command::new("timeout").args(["2", "ip", "route", "show", "default"]).output() {
+            Ok(output) if output.status.success() => {
+                let output_str = String::from_utf8_lossy(&output.stdout);
+                // Parse: "default via 192.168.1.1 dev eno1 ..."
+                for line in output_str.lines() {
+                    if line.starts_with("default") {
+                        if let Some(dev_pos) = line.find(" dev ") {
+                            let after_dev = &line[dev_pos + 5..];
+                            if let Some(space_pos) = after_dev.find(' ') {
+                                let interface = &after_dev[..space_pos];
+                                // Only return if it's a physical interface
+                                if Self::is_physical_interface(interface) {
+                                    return Some(interface.to_string());
+                                }
+                            } else {
+                                // No space after interface name (end of line)
+                                let interface = after_dev.trim();
+                                if Self::is_physical_interface(interface) {
+                                    return Some(interface.to_string());
+                                }
+                            }
+                        }
+                    }
+                }
+                None
+            }
+            _ => None,
+        }
+    }
+
+    /// Parse VLAN configuration from /proc/net/vlan/config
+    /// Returns a map of interface name -> VLAN ID
+    fn parse_vlan_config() -> std::collections::HashMap<String, u16> {
+        let mut vlan_map = std::collections::HashMap::new();
+
+        if let Ok(contents) = std::fs::read_to_string("/proc/net/vlan/config") {
+            for line in contents.lines().skip(2) {  // Skip header lines
+                let parts: Vec<&str> = line.split('|').collect();
+                if parts.len() >= 2 {
+                    let interface_name = parts[0].trim();
+                    let vlan_id_str = parts[1].trim();
+
+                    if let Ok(vlan_id) = vlan_id_str.parse::<u16>() {
+                        vlan_map.insert(interface_name.to_string(), vlan_id);
+                    }
+                }
+            }
+        }
+
+        vlan_map
+    }
+
     /// Collect network interfaces using ip command
     async fn collect_interfaces(&self) -> Vec<NetworkInterfaceData> {
         let mut interfaces = Vec::new();
 
-        match Command::new("ip").args(["-j", "addr"]).output() {
+        // Parse VLAN configuration
+        let vlan_map = Self::parse_vlan_config();
+
+        match Command::new("timeout").args(["2", "ip", "-j", "addr"]).output() {
             Ok(output) if output.status.success() => {
                 let json_str = String::from_utf8_lossy(&output.stdout);
 
@@ -62,11 +119,19 @@ impl NetworkCollector {
                         for iface in ifaces {
                             let name = iface["ifname"].as_str().unwrap_or("").to_string();
 
-                            // Skip loopback and empty names
+                            // Skip loopback, empty names, and ifb* interfaces
-                            if name.is_empty() || name == "lo" {
+                            if name.is_empty() || name == "lo" || name.starts_with("ifb") {
                                 continue;
                             }
 
+                            // Parse parent interface from @parent notation (e.g., lan@enp0s31f6)
+                            let (interface_name, parent_interface) = if let Some(at_pos) = name.find('@') {
+                                let (child, parent) = name.split_at(at_pos);
+                                (child.to_string(), Some(parent[1..].to_string()))
+                            } else {
+                                (name.clone(), None)
+                            };
+
                             let mut ipv4_addresses = Vec::new();
                             let mut ipv6_addresses = Vec::new();
 
@@ -91,20 +156,31 @@ impl NetworkCollector {
                             }
 
                             // Determine if physical and get status
-                            let is_physical = Self::is_physical_interface(&name);
+                            let is_physical = Self::is_physical_interface(&interface_name);
+
+                            // Only filter out virtual interfaces without IPs
+                            // Physical interfaces should always be shown even if down/no IPs
+                            if !is_physical && ipv4_addresses.is_empty() && ipv6_addresses.is_empty() {
+                                continue;
+                            }
+
                             let link_status = if is_physical {
                                 Self::get_link_status(&name)
                             } else {
                                 Status::Unknown  // Virtual interfaces don't have meaningful link status
                             };
 
+                            // Look up VLAN ID from the map (use original name before @ parsing)
+                            let vlan_id = vlan_map.get(&name).copied();
+
                             interfaces.push(NetworkInterfaceData {
-                                name,
+                                name: interface_name,
                                 ipv4_addresses,
                                 ipv6_addresses,
                                 is_physical,
                                 link_status,
-                                parent_interface: None,  // TODO: Implement virtual interface parent detection
+                                parent_interface,
+                                vlan_id,
                             });
                         }
                     }
@@ -118,6 +194,17 @@ impl NetworkCollector {
             }
         }
 
+        // Assign primary physical interface as parent to virtual interfaces without explicit parent
+        let primary_interface = Self::get_primary_physical_interface();
+        if let Some(primary) = primary_interface {
+            for interface in interfaces.iter_mut() {
+                // Only assign parent to virtual interfaces that don't already have one
+                if !interface.is_physical && interface.parent_interface.is_none() {
+                    interface.parent_interface = Some(primary.clone());
+                }
+            }
+        }
+
         interfaces
     }
 }

agent/src/collectors/nixos.rs

@@ -43,8 +43,8 @@ impl NixOSCollector {
         match fs::read_to_string("/etc/hostname") {
             Ok(hostname) => Some(hostname.trim().to_string()),
             Err(_) => {
-                // Fallback to hostname command
+                // Fallback to hostname command (with 2 second timeout)
-                match Command::new("hostname").output() {
+                match Command::new("timeout").args(["2", "hostname"]).output() {
                     Ok(output) => Some(String::from_utf8_lossy(&output.stdout).trim().to_string()),
                     Err(_) => None,
                 }

agent/src/collectors/systemd.rs

@@ -4,7 +4,7 @@ use cm_dashboard_shared::{AgentData, ServiceData, SubServiceData, SubServiceMetr
 use std::process::Command;
 use std::sync::RwLock;
 use std::time::Instant;
-use tracing::debug;
+use tracing::{debug, warn};
 
 use super::{Collector, CollectorError};
 use crate::config::SystemdConfig;
@@ -113,6 +113,7 @@ impl SystemdCollector {
                                 name: site_name.clone(),
                                 service_status: self.calculate_service_status(&site_name, &site_status),
                                 metrics,
+                                service_type: "nginx_site".to_string(),
                             });
                         }
                     }
@@ -123,11 +124,30 @@ impl SystemdCollector {
                             // For now, docker containers have no additional metrics
                             // Future: could add memory_mb, cpu_percent, restart_count, etc.
                             let metrics = Vec::new();
-                            
+
                             sub_services.push(SubServiceData {
                                 name: container_name.clone(),
                                 service_status: self.calculate_service_status(&container_name, &container_status),
                                 metrics,
+                                service_type: "container".to_string(),
+                            });
+                        }
+
+                        // Add Docker images
+                        let docker_images = self.get_docker_images();
+                        for (image_name, image_status, image_size_mb) in docker_images {
+                            let mut metrics = Vec::new();
+                            metrics.push(SubServiceMetric {
+                                label: "size".to_string(),
+                                value: image_size_mb,
+                                unit: Some("MB".to_string()),
+                            });
+
+                            sub_services.push(SubServiceData {
+                                name: image_name.to_string(),
+                                service_status: self.calculate_service_status(&image_name, &image_status),
+                                metrics,
+                                service_type: "image".to_string(),
                             });
                         }
                     }
@@ -151,7 +171,11 @@ impl SystemdCollector {
                 }
             }
         }
-        
+
+        // Sort services alphabetically by name
+        agent_data.services.sort_by(|a, b| a.name.cmp(&b.name));
+        complete_service_data.sort_by(|a, b| a.name.cmp(&b.name));
+
         // Update cached state
         {
             let mut state = self.state.write().unwrap();
@@ -230,18 +254,18 @@ impl SystemdCollector {
 
     /// Auto-discover interesting services to monitor
     fn discover_services_internal(&self) -> Result<(Vec<String>, std::collections::HashMap<String, ServiceStatusInfo>)> {
-        // First: Get all service unit files
+        // First: Get all service unit files (with 3 second timeout)
-        let unit_files_output = Command::new("systemctl")
+        let unit_files_output = Command::new("timeout")
-            .args(&["list-unit-files", "--type=service", "--no-pager", "--plain"])
+            .args(&["3", "systemctl", "list-unit-files", "--type=service", "--no-pager", "--plain"])
             .output()?;
 
         if !unit_files_output.status.success() {
             return Err(anyhow::anyhow!("systemctl list-unit-files command failed"));
         }
 
-        // Second: Get runtime status of all units
+        // Second: Get runtime status of all units (with 3 second timeout)
-        let units_status_output = Command::new("systemctl")
+        let units_status_output = Command::new("timeout")
-            .args(&["list-units", "--type=service", "--all", "--no-pager", "--plain"])
+            .args(&["3", "systemctl", "list-units", "--type=service", "--all", "--no-pager", "--plain"])
             .output()?;
 
         if !units_status_output.status.success() {
@@ -337,16 +361,16 @@ impl SystemdCollector {
             }
         }
 
-        // Fallback to systemctl if not in cache
+        // Fallback to systemctl if not in cache (with 2 second timeout)
-        let output = Command::new("systemctl")
+        let output = Command::new("timeout")
-            .args(&["is-active", &format!("{}.service", service)])
+            .args(&["2", "systemctl", "is-active", &format!("{}.service", service)])
             .output()?;
 
         let active_status = String::from_utf8(output.stdout)?.trim().to_string();
 
-        // Get more detailed info
+        // Get more detailed info (with 2 second timeout)
-        let output = Command::new("systemctl")
+        let output = Command::new("timeout")
-            .args(&["show", &format!("{}.service", service), "--property=LoadState,ActiveState,SubState"])
+            .args(&["2", "systemctl", "show", &format!("{}.service", service), "--property=LoadState,ActiveState,SubState"])
             .output()?;
 
         let detailed_info = String::from_utf8(output.stdout)?;
@@ -398,7 +422,7 @@ impl SystemdCollector {
         if let Some(dirs) = self.config.service_directories.get(service_name) {
             // Service has configured paths - use the first accessible one
             for dir in dirs {
-                if let Some(size) = self.get_directory_size(dir) {
+                if let Some(size) = self.get_directory_size(dir).await {
                     return Ok(size);
                 }
             }
@@ -406,9 +430,9 @@ impl SystemdCollector {
             return Ok(0.0);
         }
 
-        // No configured path - try to get WorkingDirectory from systemctl
+        // No configured path - try to get WorkingDirectory from systemctl (with 2 second timeout)
-        let output = Command::new("systemctl")
+        let output = Command::new("timeout")
-            .args(&["show", &format!("{}.service", service_name), "--property=WorkingDirectory"])
+            .args(&["2", "systemctl", "show", &format!("{}.service", service_name), "--property=WorkingDirectory"])
             .output()
             .map_err(|e| CollectorError::SystemRead {
                 path: format!("WorkingDirectory for {}", service_name),
@@ -420,7 +444,7 @@ impl SystemdCollector {
             if line.starts_with("WorkingDirectory=") && !line.contains("[not set]") {
                 let dir = line.strip_prefix("WorkingDirectory=").unwrap_or("");
                 if !dir.is_empty() && dir != "/" {
-                    return Ok(self.get_directory_size(dir).unwrap_or(0.0));
+                    return Ok(self.get_directory_size(dir).await.unwrap_or(0.0));
                 }
             }
         }
@@ -428,18 +452,23 @@ impl SystemdCollector {
         Ok(0.0)
     }
     
-    /// Get size of a directory in GB
+    /// Get size of a directory in GB (with 2 second timeout)
-    fn get_directory_size(&self, path: &str) -> Option<f32> {
+    async fn get_directory_size(&self, path: &str) -> Option<f32> {
-        let output = Command::new("sudo")
+        use super::run_command_with_timeout;
-            .args(&["du", "-sb", path])
+
-            .output()
+        // Use -s (summary) and --apparent-size for speed, 2 second timeout
-            .ok()?;
+        let mut cmd = Command::new("sudo");
+        cmd.args(&["du", "-s", "--apparent-size", "--block-size=1", path]);
+
+        let output = run_command_with_timeout(cmd, 2).await.ok()?;
 
         if !output.status.success() {
             // Log permission errors for debugging but don't spam logs
             let stderr = String::from_utf8_lossy(&output.stderr);
             if stderr.contains("Permission denied") {
                 debug!("Permission denied accessing directory: {}", path);
+            } else if stderr.contains("timed out") {
+                warn!("Directory size check timed out for {}", path);
             } else {
                 debug!("Failed to get size for directory {}: {}", path, stderr);
             }
@@ -756,9 +785,10 @@ impl SystemdCollector {
     fn get_docker_containers(&self) -> Vec<(String, String)> {
         let mut containers = Vec::new();
 
-        // Check if docker is available (use sudo for permissions)
+        // Check if docker is available (cm-agent user is in docker group)
-        let output = Command::new("sudo")
+        // Use -a to show ALL containers (running and stopped) with 3 second timeout
-            .args(&["docker", "ps", "--format", "{{.Names}},{{.Status}}"])
+        let output = Command::new("timeout")
+            .args(&["3", "docker", "ps", "-a", "--format", "{{.Names}},{{.Status}}"])
             .output();
 
         let output = match output {
@@ -783,10 +813,10 @@ impl SystemdCollector {
 
                 let container_status = if status_str.contains("Up") {
                     "active"
-                } else if status_str.contains("Exited") {
+                } else if status_str.contains("Exited") || status_str.contains("Created") {
-                    "warning" // Match original: Exited → Warning, not inactive
+                    "inactive" // Stopped/created containers are inactive
                 } else {
-                    "failed" // Other states → failed
+                    "failed" // Other states (restarting, paused, dead) → failed
                 };
                 
                 containers.push((format!("docker_{}", container_name), container_status.to_string()));
@@ -795,6 +825,86 @@ impl SystemdCollector {
 
         containers
     }
+
+    /// Get docker images as sub-services
+    fn get_docker_images(&self) -> Vec<(String, String, f32)> {
+        let mut images = Vec::new();
+        // Check if docker is available (cm-agent user is in docker group) with 3 second timeout
+        let output = Command::new("timeout")
+            .args(&["3", "docker", "images", "--format", "{{.Repository}}:{{.Tag}},{{.Size}}"])
+            .output();
+
+        let output = match output {
+            Ok(out) if out.status.success() => out,
+            Ok(_) => {
+                return images;
+            }
+            Err(_) => {
+                return images;
+            }
+        };
+
+        let output_str = match String::from_utf8(output.stdout) {
+            Ok(s) => s,
+            Err(_) => return images,
+        };
+
+        for line in output_str.lines() {
+            if line.trim().is_empty() {
+                continue;
+            }
+
+            let parts: Vec<&str> = line.split(',').collect();
+            if parts.len() >= 2 {
+                let image_name = parts[0].trim();
+                let size_str = parts[1].trim();
+
+                // Skip <none>:<none> images (dangling images)
+                if image_name.contains("<none>") {
+                    continue;
+                }
+
+                // Parse size to MB (sizes come as "142MB", "1.5GB", "512kB", etc.)
+                let size_mb = self.parse_docker_size(size_str);
+
+                images.push((
+                    image_name.to_string(),
+                    "inactive".to_string(), // Images are informational - use inactive for neutral display
+                    size_mb
+                ));
+            }
+        }
+
+        images
+    }
+
+    /// Parse Docker size string to MB
+    fn parse_docker_size(&self, size_str: &str) -> f32 {
+        let size_upper = size_str.to_uppercase();
+
+        // Extract numeric part and unit
+        let mut num_str = String::new();
+        let mut unit = String::new();
+
+        for ch in size_upper.chars() {
+            if ch.is_ascii_digit() || ch == '.' {
+                num_str.push(ch);
+            } else if ch.is_alphabetic() {
+                unit.push(ch);
+            }
+        }
+
+        let value: f32 = num_str.parse().unwrap_or(0.0);
+
+        // Convert to MB
+        match unit.as_str() {
+            "KB" | "K" => value / 1024.0,
+            "MB" | "M" => value,
+            "GB" | "G" => value * 1024.0,
+            "TB" | "T" => value * 1024.0 * 1024.0,
+            _ => value, // Assume bytes if no unit
+        }
+    }
 }
 
 #[async_trait]

dashboard/Cargo.toml

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

dashboard/src/app.rs

@@ -215,7 +215,7 @@ impl Dashboard {
 
                     // Update TUI with new metrics (only if not headless)
                     if let Some(ref mut tui_app) = self.tui_app {
-                        tui_app.update_metrics(&self.metric_store);
+                        tui_app.update_metrics(&mut self.metric_store);
                     }
                 }
                 

dashboard/src/metrics/store.rs

@@ -5,6 +5,14 @@ use tracing::{debug, info, warn};
 
 use super::MetricDataPoint;
 
+/// ZMQ communication statistics per host
+#[derive(Debug, Clone)]
+pub struct ZmqStats {
+    pub packets_received: u64,
+    pub last_packet_time: Instant,
+    pub last_packet_age_secs: f64,
+}
+
 /// Central metric storage for the dashboard
 pub struct MetricStore {
     /// Current structured data: hostname -> AgentData
@@ -13,6 +21,8 @@ pub struct MetricStore {
     historical_metrics: HashMap<String, Vec<MetricDataPoint>>,
     /// Last heartbeat timestamp per host
     last_heartbeat: HashMap<String, Instant>,
+    /// ZMQ communication statistics per host
+    zmq_stats: HashMap<String, ZmqStats>,
     /// Configuration
     max_metrics_per_host: usize,
     history_retention: Duration,
@@ -24,6 +34,7 @@ impl MetricStore {
             current_agent_data: HashMap::new(),
             historical_metrics: HashMap::new(),
             last_heartbeat: HashMap::new(),
+            zmq_stats: HashMap::new(),
             max_metrics_per_host,
             history_retention: Duration::from_secs(history_retention_hours * 3600),
         }
@@ -44,6 +55,16 @@ impl MetricStore {
         self.last_heartbeat.insert(hostname.clone(), now);
         debug!("Updated heartbeat for host {}", hostname);
 
+        // Update ZMQ stats
+        let stats = self.zmq_stats.entry(hostname.clone()).or_insert(ZmqStats {
+            packets_received: 0,
+            last_packet_time: now,
+            last_packet_age_secs: 0.0,
+        });
+        stats.packets_received += 1;
+        stats.last_packet_time = now;
+        stats.last_packet_age_secs = 0.0; // Just received
+
         // Add to history
         let host_history = self
             .historical_metrics
@@ -65,6 +86,15 @@ impl MetricStore {
         self.current_agent_data.get(hostname)
     }
 
+    /// Get ZMQ communication statistics for a host
+    pub fn get_zmq_stats(&mut self, hostname: &str) -> Option<ZmqStats> {
+        let now = Instant::now();
+        self.zmq_stats.get_mut(hostname).map(|stats| {
+            // Update packet age
+            stats.last_packet_age_secs = now.duration_since(stats.last_packet_time).as_secs_f64();
+            stats.clone()
+        })
+    }
 
     /// Get connected hosts (hosts with recent heartbeats)
     pub fn get_connected_hosts(&self, timeout: Duration) -> Vec<String> {

dashboard/src/ui/mod.rs

@@ -100,7 +100,7 @@ impl TuiApp {
     }
 
     /// Update widgets with structured data from store (only for current host)
-    pub fn update_metrics(&mut self, metric_store: &MetricStore) {
+    pub fn update_metrics(&mut self, metric_store: &mut MetricStore) {
         if let Some(hostname) = self.current_host.clone() {
             // Get structured data for this host
             if let Some(agent_data) = metric_store.get_agent_data(&hostname) {
@@ -110,6 +110,14 @@ impl TuiApp {
                 host_widgets.system_widget.update_from_agent_data(agent_data);
                 host_widgets.services_widget.update_from_agent_data(agent_data);
 
+                // Update ZMQ stats
+                if let Some(zmq_stats) = metric_store.get_zmq_stats(&hostname) {
+                    host_widgets.system_widget.update_zmq_stats(
+                        zmq_stats.packets_received,
+                        zmq_stats.last_packet_age_secs
+                    );
+                }
+
                 host_widgets.last_update = Some(Instant::now());
             }
         }

dashboard/src/ui/widgets/services.rs

@@ -32,6 +32,7 @@ struct ServiceInfo {
     disk_gb: Option<f32>,
     metrics: Vec<(String, f32, Option<String>)>, // (label, value, unit)
     widget_status: Status,
+    service_type: String, // "nginx_site", "container", "image", or empty for parent services
 }
 
 impl ServicesWidget {
@@ -169,7 +170,7 @@ impl ServicesWidget {
             // Convert Status enum to display text for sub-services
             match info.widget_status {
                 Status::Ok => "active",
-                Status::Inactive => "inactive", 
+                Status::Inactive => "inactive",
                 Status::Critical => "failed",
                 Status::Pending => "pending",
                 Status::Warning => "warning",
@@ -179,32 +180,62 @@ impl ServicesWidget {
         };
         let tree_symbol = if is_last { "└─" } else { "├─" };
 
-        vec![
+        // Docker images use docker whale icon
-            // Indentation and tree prefix
+        if info.service_type == "image" {
-            ratatui::text::Span::styled(
+            vec![
-                format!("  {} ", tree_symbol),
+                // Indentation and tree prefix
-                Typography::tree(),
+                ratatui::text::Span::styled(
-            ),
+                    format!("  {} ", tree_symbol),
-            // Status icon
+                    Typography::tree(),
-            ratatui::text::Span::styled(
+                ),
-                format!("{} ", icon),
+                // Docker icon (simple character for performance)
-                Style::default().fg(status_color).bg(Theme::background()),
+                ratatui::text::Span::styled(
-            ),
+                    "D ".to_string(),
-            // Service name
+                    Style::default().fg(Theme::highlight()).bg(Theme::background()),
-            ratatui::text::Span::styled(
+                ),
-                format!("{:<18} ", short_name),
+                // Service name
-                Style::default()
+                ratatui::text::Span::styled(
-                    .fg(Theme::secondary_text())
+                    format!("{:<18} ", short_name),
-                    .bg(Theme::background()),
+                    Style::default()
-            ),
+                        .fg(Theme::secondary_text())
-            // Status/latency text
+                        .bg(Theme::background()),
-            ratatui::text::Span::styled(
+                ),
-                status_str,
+                // Status/metrics text
-                Style::default()
+                ratatui::text::Span::styled(
-                    .fg(Theme::secondary_text())
+                    status_str,
-                    .bg(Theme::background()),
+                    Style::default()
-            ),
+                        .fg(Theme::secondary_text())
-        ]
+                        .bg(Theme::background()),
+                ),
+            ]
+        } else {
+            vec![
+                // Indentation and tree prefix
+                ratatui::text::Span::styled(
+                    format!("  {} ", tree_symbol),
+                    Typography::tree(),
+                ),
+                // Status icon
+                ratatui::text::Span::styled(
+                    format!("{} ", icon),
+                    Style::default().fg(status_color).bg(Theme::background()),
+                ),
+                // Service name
+                ratatui::text::Span::styled(
+                    format!("{:<18} ", short_name),
+                    Style::default()
+                        .fg(Theme::secondary_text())
+                        .bg(Theme::background()),
+                ),
+                // Status/latency text
+                ratatui::text::Span::styled(
+                    status_str,
+                    Style::default()
+                        .fg(Theme::secondary_text())
+                        .bg(Theme::background()),
+                ),
+            ]
+        }
     }
 
     /// Move selection up
@@ -282,9 +313,10 @@ impl Widget for ServicesWidget {
                 disk_gb: Some(service.disk_gb),
                 metrics: Vec::new(), // Parent services don't have custom metrics
                 widget_status: service.service_status,
+                service_type: String::new(), // Parent services have no type
             };
             self.parent_services.insert(service.name.clone(), parent_info);
-            
+
             // Process sub-services if any
             if !service.sub_services.is_empty() {
                 let mut sub_list = Vec::new();
@@ -293,12 +325,13 @@ impl Widget for ServicesWidget {
                     let metrics: Vec<(String, f32, Option<String>)> = sub_service.metrics.iter()
                         .map(|m| (m.label.clone(), m.value, m.unit.clone()))
                         .collect();
-                    
+
                     let sub_info = ServiceInfo {
                         memory_mb: None, // Not used for sub-services
                         disk_gb: None,   // Not used for sub-services
                         metrics,
                         widget_status: sub_service.service_status,
+                        service_type: sub_service.service_type.clone(),
                     };
                     sub_list.push((sub_service.name.clone(), sub_info));
                 }
@@ -342,6 +375,7 @@ impl ServicesWidget {
                                     disk_gb: None,
                                     metrics: Vec::new(),
                                     widget_status: Status::Unknown,
+                                    service_type: String::new(),
                                 });
 
                         if metric.name.ends_with("_status") {
@@ -377,6 +411,7 @@ impl ServicesWidget {
                                     disk_gb: None,
                                     metrics: Vec::new(),
                                     widget_status: Status::Unknown,
+                                    service_type: String::new(), // Unknown type in legacy path
                                 },
                             ));
                             &mut sub_service_list.last_mut().unwrap().1

dashboard/src/ui/widgets/system.rs

@@ -15,6 +15,10 @@ pub struct SystemWidget {
     nixos_build: Option<String>,
     agent_hash: Option<String>,
 
+    // ZMQ communication stats
+    zmq_packets_received: Option<u64>,
+    zmq_last_packet_age: Option<f64>,
+
     // Network interfaces
     network_interfaces: Vec<cm_dashboard_shared::NetworkInterfaceData>,
 
@@ -92,6 +96,8 @@ impl SystemWidget {
         Self {
             nixos_build: None,
             agent_hash: None,
+            zmq_packets_received: None,
+            zmq_last_packet_age: None,
             network_interfaces: Vec::new(),
             cpu_load_1min: None,
             cpu_load_5min: None,
@@ -154,6 +160,12 @@ impl SystemWidget {
     pub fn _get_agent_hash(&self) -> Option<&String> {
         self.agent_hash.as_ref()
     }
+
+    /// Update ZMQ communication statistics
+    pub fn update_zmq_stats(&mut self, packets_received: u64, last_packet_age_secs: f64) {
+        self.zmq_packets_received = Some(packets_received);
+        self.zmq_last_packet_age = Some(last_packet_age_secs);
+    }
 }
 
 use super::Widget;
@@ -628,9 +640,24 @@ impl SystemWidget {
         let physical: Vec<_> = self.network_interfaces.iter().filter(|i| i.is_physical).collect();
         let virtual_interfaces: Vec<_> = self.network_interfaces.iter().filter(|i| !i.is_physical).collect();
 
-        // Render physical interfaces
+        // Find standalone virtual interfaces (those without a parent)
+        let mut standalone_virtual: Vec<_> = virtual_interfaces.iter()
+            .filter(|i| i.parent_interface.is_none())
+            .collect();
+
+        // Sort standalone virtual: VLANs first (by VLAN ID), then others alphabetically
+        standalone_virtual.sort_by(|a, b| {
+            match (a.vlan_id, b.vlan_id) {
+                (Some(vlan_a), Some(vlan_b)) => vlan_a.cmp(&vlan_b),
+                (Some(_), None) => std::cmp::Ordering::Less,
+                (None, Some(_)) => std::cmp::Ordering::Greater,
+                (None, None) => a.name.cmp(&b.name),
+            }
+        });
+
+        // Render physical interfaces with their children
         for (phy_idx, interface) in physical.iter().enumerate() {
-            let is_last_physical = phy_idx == physical.len() - 1 && virtual_interfaces.is_empty();
+            let is_last_physical = phy_idx == physical.len() - 1 && standalone_virtual.is_empty();
 
             // Physical interface header with status icon
             let mut header_spans = vec![];
@@ -640,36 +667,93 @@ impl SystemWidget {
             ));
             lines.push(Line::from(header_spans));
 
-            // Show IPs nested under the interface
+            // Find child interfaces for this physical interface
-            let ip_count = interface.ipv4_addresses.len() + interface.ipv6_addresses.len();
+            let mut children: Vec<_> = virtual_interfaces.iter()
-            let mut ip_index = 0;
+                .filter(|vi| {
+                    if let Some(parent) = &vi.parent_interface {
+                        parent == &interface.name
+                    } else {
+                        false
+                    }
+                })
+                .collect();
 
-            // IPv4 addresses
+            // Sort children: VLANs first (by VLAN ID), then others alphabetically
+            children.sort_by(|a, b| {
+                match (a.vlan_id, b.vlan_id) {
+                    (Some(vlan_a), Some(vlan_b)) => vlan_a.cmp(&vlan_b),
+                    (Some(_), None) => std::cmp::Ordering::Less,
+                    (None, Some(_)) => std::cmp::Ordering::Greater,
+                    (None, None) => a.name.cmp(&b.name),
+                }
+            });
+
+            // Count total items under this physical interface (IPs + children)
+            let ip_count = interface.ipv4_addresses.len() + interface.ipv6_addresses.len();
+            let total_children = ip_count + children.len();
+            let mut child_index = 0;
+
+            // IPv4 addresses on the physical interface itself
             for ipv4 in &interface.ipv4_addresses {
-                ip_index += 1;
+                child_index += 1;
-                let is_last_ip = ip_index == ip_count && is_last_physical;
+                let is_last = child_index == total_children && is_last_physical;
-                let tree_symbol = if is_last_ip { "  └─ " } else { "  ├─ " };
+                let tree_symbol = if is_last { "  └─ " } else { "  ├─ " };
                 lines.push(Line::from(vec![
                     Span::styled(tree_symbol, Typography::tree()),
                     Span::styled(format!("ip: {}", ipv4), Typography::secondary()),
                 ]));
             }
 
-            // IPv6 addresses
+            // IPv6 addresses on the physical interface itself
             for ipv6 in &interface.ipv6_addresses {
-                ip_index += 1;
+                child_index += 1;
-                let is_last_ip = ip_index == ip_count && is_last_physical;
+                let is_last = child_index == total_children && is_last_physical;
-                let tree_symbol = if is_last_ip { "  └─ " } else { "  ├─ " };
+                let tree_symbol = if is_last { "  └─ " } else { "  ├─ " };
                 lines.push(Line::from(vec![
                     Span::styled(tree_symbol, Typography::tree()),
                     Span::styled(format!("ip: {}", ipv6), Typography::secondary()),
                 ]));
             }
+
+            // Child virtual interfaces (VLANs, etc.)
+            for child in children {
+                child_index += 1;
+                let is_last = child_index == total_children && is_last_physical;
+                let tree_symbol = if is_last { "  └─ " } else { "  ├─ " };
+
+                let ip_text = if !child.ipv4_addresses.is_empty() {
+                    Self::compress_ipv4_addresses(&child.ipv4_addresses)
+                } else if !child.ipv6_addresses.is_empty() {
+                    child.ipv6_addresses.join(", ")
+                } else {
+                    String::new()
+                };
+
+                // Format: "name (vlan X): IP" or "name: IP"
+                let child_text = if let Some(vlan_id) = child.vlan_id {
+                    if !ip_text.is_empty() {
+                        format!("{} (vlan {}): {}", child.name, vlan_id, ip_text)
+                    } else {
+                        format!("{} (vlan {}):", child.name, vlan_id)
+                    }
+                } else {
+                    if !ip_text.is_empty() {
+                        format!("{}: {}", child.name, ip_text)
+                    } else {
+                        format!("{}:", child.name)
+                    }
+                };
+
+                lines.push(Line::from(vec![
+                    Span::styled(tree_symbol, Typography::tree()),
+                    Span::styled(child_text, Typography::secondary()),
+                ]));
+            }
         }
 
         // Render standalone virtual interfaces (those without a parent)
-        for (virt_idx, interface) in virtual_interfaces.iter().enumerate() {
+        for (virt_idx, interface) in standalone_virtual.iter().enumerate() {
-            let is_last = virt_idx == virtual_interfaces.len() - 1;
+            let is_last = virt_idx == standalone_virtual.len() - 1;
             let tree_symbol = if is_last { "  └─ " } else { "  ├─ " };
 
             // Virtual interface with IPs
@@ -681,10 +765,19 @@ impl SystemWidget {
                 String::new()
             };
 
-            let interface_text = if !ip_text.is_empty() {
+            // Format: "name (vlan X): IP" or "name: IP"
-                format!("{}: {}", interface.name, ip_text)
+            let interface_text = if let Some(vlan_id) = interface.vlan_id {
+                if !ip_text.is_empty() {
+                    format!("{} (vlan {}): {}", interface.name, vlan_id, ip_text)
+                } else {
+                    format!("{} (vlan {}):", interface.name, vlan_id)
+                }
             } else {
-                format!("{}:", interface.name)
+                if !ip_text.is_empty() {
+                    format!("{}: {}", interface.name, ip_text)
+                } else {
+                    format!("{}:", interface.name)
+                }
             };
 
             lines.push(Line::from(vec![
@@ -715,28 +808,30 @@ impl SystemWidget {
             Span::styled(format!("Agent: {}", agent_version_text), Typography::secondary())
         ]));
 
-        // Network section
+        // ZMQ communication stats
-        if !self.network_interfaces.is_empty() {
+        if let (Some(packets), Some(age)) = (self.zmq_packets_received, self.zmq_last_packet_age) {
+            let age_text = if age < 1.0 {
+                format!("{:.0}ms ago", age * 1000.0)
+            } else {
+                format!("{:.1}s ago", age)
+            };
             lines.push(Line::from(vec![
-                Span::styled("Network:", Typography::widget_title())
+                Span::styled(format!("ZMQ: {} pkts, last {}", packets, age_text), Typography::secondary())
             ]));
-
-            let network_lines = self.render_network();
-            lines.extend(network_lines);
         }
 
         // CPU section
         lines.push(Line::from(vec![
             Span::styled("CPU:", Typography::widget_title())
         ]));
-        
+
         let load_text = self.format_cpu_load();
         let cpu_spans = StatusIcons::create_status_spans(
             self.cpu_status.clone(),
             &format!("Load: {}", load_text)
         );
         lines.push(Line::from(cpu_spans));
-        
+
         let freq_text = self.format_cpu_frequency();
         lines.push(Line::from(vec![
             Span::styled("  └─ ", Typography::tree()),
@@ -747,7 +842,7 @@ impl SystemWidget {
         lines.push(Line::from(vec![
             Span::styled("RAM:", Typography::widget_title())
         ]));
-        
+
         let memory_text = self.format_memory_usage();
         let memory_spans = StatusIcons::create_status_spans(
             self.memory_status.clone(),
@@ -759,16 +854,16 @@ impl SystemWidget {
         for (i, tmpfs) in self.tmpfs_mounts.iter().enumerate() {
             let is_last = i == self.tmpfs_mounts.len() - 1;
             let tree_symbol = if is_last { "  └─ " } else { "  ├─ " };
-            
+
             let usage_text = if tmpfs.total_gb > 0.0 {
-                format!("{:.0}% {:.1}GB/{:.1}GB", 
+                format!("{:.0}% {:.1}GB/{:.1}GB",
-                    tmpfs.usage_percent, 
+                    tmpfs.usage_percent,
-                    tmpfs.used_gb, 
+                    tmpfs.used_gb,
                     tmpfs.total_gb)
             } else {
                 "— —/—".to_string()
             };
-            
+
             let mut tmpfs_spans = vec![
                 Span::styled(tree_symbol, Typography::tree()),
             ];
@@ -779,6 +874,16 @@ impl SystemWidget {
             lines.push(Line::from(tmpfs_spans));
         }
 
+        // Network section
+        if !self.network_interfaces.is_empty() {
+            lines.push(Line::from(vec![
+                Span::styled("Network:", Typography::widget_title())
+            ]));
+
+            let network_lines = self.render_network();
+            lines.extend(network_lines);
+        }
+
         // Storage section
         lines.push(Line::from(vec![
             Span::styled("Storage:", Typography::widget_title())

shared/Cargo.toml

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

shared/src/agent_data.rs

@@ -37,6 +37,7 @@ pub struct NetworkInterfaceData {
     pub is_physical: bool,
     pub link_status: Status,
     pub parent_interface: Option<String>,
+    pub vlan_id: Option<u16>,
 }
 
 /// CPU monitoring data
@@ -148,6 +149,9 @@ pub struct SubServiceData {
     pub name: String,
     pub service_status: Status,
     pub metrics: Vec<SubServiceMetric>,
+    /// Type of sub-service: "nginx_site", "container", "image"
+    #[serde(default)]
+    pub service_type: String,
 }
 
 /// Individual metric for a sub-service