Move transmission interval to ZMQ config section

- Changed code to use zmq.transmission_interval_seconds instead of top-level collection_interval_seconds
- Removed collection_interval_seconds from AgentConfig
- Updated validation to check zmq.transmission_interval_seconds
- Improves config organization by grouping all ZMQ settings together

Bump version to v0.1.210

Co-Authored-By: Claude <noreply@anthropic.com>

Cargo.lock

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

agent/Cargo.toml

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

agent/src/agent.rs

@@ -114,7 +114,7 @@ impl Agent {
 
         // Set up intervals
         let mut transmission_interval = interval(Duration::from_secs(
-            self.config.collection_interval_seconds,
+            self.config.zmq.transmission_interval_seconds,
         ));
         let mut notification_interval = interval(Duration::from_secs(30)); // Check notifications every 30s
 

agent/src/collectors/cpu.rs

@@ -119,36 +119,56 @@ impl CpuCollector {
         utils::parse_u64(content.trim())
     }
 
-    /// Collect CPU frequency and populate AgentData
-    async fn collect_frequency(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
-        // Try scaling frequency first (more accurate for current frequency)
-        if let Ok(freq) =
-            utils::read_proc_file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq")
-        {
-            if let Ok(freq_khz) = utils::parse_u64(freq.trim()) {
-                let freq_mhz = freq_khz as f32 / 1000.0;
-                agent_data.system.cpu.frequency_mhz = freq_mhz;
-                return Ok(());
-            }
-        }
+    /// Collect CPU C-state (idle depth) and populate AgentData with top 3 C-states by usage
+    async fn collect_cstate(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
+        // Read C-state usage from first CPU (representative of overall system)
+        // C-states indicate CPU idle depth: C1=light sleep, C6=deep sleep, C10=deepest
 
-        // Fallback: parse /proc/cpuinfo for base frequency
-        if let Ok(content) = utils::read_proc_file("/proc/cpuinfo") {
-            for line in content.lines() {
-                if line.starts_with("cpu MHz") {
-                    if let Some(freq_str) = line.split(':').nth(1) {
-                        if let Ok(freq_mhz) = utils::parse_f32(freq_str) {
-                            agent_data.system.cpu.frequency_mhz = freq_mhz;
-                            return Ok(());
+        let mut cstate_times: Vec<(String, u64)> = Vec::new();
+        let mut total_time: u64 = 0;
+
+        // Collect all C-state times from CPU0
+        for state_num in 0..=10 {
+            let time_path = format!("/sys/devices/system/cpu/cpu0/cpuidle/state{}/time", state_num);
+            let name_path = format!("/sys/devices/system/cpu/cpu0/cpuidle/state{}/name", state_num);
+
+            if let Ok(time_str) = utils::read_proc_file(&time_path) {
+                if let Ok(time) = utils::parse_u64(time_str.trim()) {
+                    if let Ok(name) = utils::read_proc_file(&name_path) {
+                        let state_name = name.trim().to_string();
+                        // Skip POLL state (not real idle)
+                        if state_name != "POLL" && time > 0 {
+                            cstate_times.push((state_name, time));
+                            total_time += time;
                         }
                     }
-                    break; // Only need first CPU entry
                 }
+            } else {
+                // No more states available
+                break;
             }
         }
 
-        debug!("CPU frequency not available");
-        // Leave frequency as 0.0 if not available
+        // Sort by time descending to get top 3
+        cstate_times.sort_by(|a, b| b.1.cmp(&a.1));
+
+        // Calculate percentages for top 3 and populate AgentData
+        agent_data.system.cpu.cstates = cstate_times
+            .iter()
+            .take(3)
+            .map(|(name, time)| {
+                let percent = if total_time > 0 {
+                    (*time as f32 / total_time as f32) * 100.0
+                } else {
+                    0.0
+                };
+                cm_dashboard_shared::CStateInfo {
+                    name: name.clone(),
+                    percent,
+                }
+            })
+            .collect();
+
         Ok(())
     }
 }
@@ -165,8 +185,8 @@ impl Collector for CpuCollector {
         // Collect temperature (optional)
         self.collect_temperature(agent_data).await?;
 
-        // Collect frequency (optional)
-        self.collect_frequency(agent_data).await?;
+        // Collect C-state (CPU idle depth)
+        self.collect_cstate(agent_data).await?;
 
         let duration = start.elapsed();
         debug!("CPU collection completed in {:?}", duration);

agent/src/collectors/systemd.rs

@@ -43,9 +43,10 @@ struct ServiceCacheState {
 /// Cached service status information from systemctl list-units
 #[derive(Debug, Clone)]
 struct ServiceStatusInfo {
-    load_state: String,
     active_state: String,
-    sub_state: String,
+    memory_bytes: Option<u64>,
+    restart_count: Option<u32>,
+    start_timestamp: Option<u64>,
 }
 
 impl SystemdCollector {
@@ -86,11 +87,20 @@ impl SystemdCollector {
         let mut complete_service_data = Vec::new();
         for service_name in &monitored_services {
             match self.get_service_status(service_name) {
-                Ok((active_status, _detailed_info)) => {
+                Ok(status_info) => {
                     let mut sub_services = Vec::new();
 
+                    // Calculate uptime if we have start timestamp
+                    let uptime_seconds = status_info.start_timestamp.and_then(|start| {
+                        let now = std::time::SystemTime::now()
+                            .duration_since(std::time::UNIX_EPOCH)
+                            .ok()?
+                            .as_secs();
+                        Some(now.saturating_sub(start))
+                    });
+
                     // Sub-service metrics for specific services (always include cached results)
-                    if service_name.contains("nginx") && active_status == "active" {
+                    if service_name.contains("nginx") && status_info.active_state == "active" {
                         let nginx_sites = self.get_nginx_site_metrics();
                         for (site_name, latency_ms) in nginx_sites {
                             let site_status = if latency_ms >= 0.0 && latency_ms < self.config.nginx_latency_critical_ms {
@@ -115,7 +125,7 @@ impl SystemdCollector {
                         }
                     }
 
-                    if service_name.contains("docker") && active_status == "active" {
+                    if service_name.contains("docker") && status_info.active_state == "active" {
                         let docker_containers = self.get_docker_containers();
                         for (container_name, container_status) in docker_containers {
                             // For now, docker containers have no additional metrics
@@ -153,8 +163,11 @@ impl SystemdCollector {
                     let service_data = ServiceData {
                         name: service_name.clone(),
                         user_stopped: false, // TODO: Integrate with service tracker
-                        service_status: self.calculate_service_status(service_name, &active_status),
+                        service_status: self.calculate_service_status(service_name, &status_info.active_state),
                         sub_services,
+                        memory_bytes: status_info.memory_bytes,
+                        restart_count: status_info.restart_count,
+                        uptime_seconds,
                     };
 
                     // Add to AgentData and cache
@@ -290,14 +303,13 @@ impl SystemdCollector {
             let fields: Vec<&str> = line.split_whitespace().collect();
             if fields.len() >= 4 && fields[0].ends_with(".service") {
                 let service_name = fields[0].trim_end_matches(".service");
-                let load_state = fields.get(1).unwrap_or(&"unknown").to_string();
                 let active_state = fields.get(2).unwrap_or(&"unknown").to_string();
-                let sub_state = fields.get(3).unwrap_or(&"unknown").to_string();
 
                 status_cache.insert(service_name.to_string(), ServiceStatusInfo {
-                    load_state,
                     active_state,
-                    sub_state,
+                    memory_bytes: None,
+                    restart_count: None,
+                    start_timestamp: None,
                 });
             }
         }
@@ -306,9 +318,10 @@ impl SystemdCollector {
         for service_name in &all_service_names {
             if !status_cache.contains_key(service_name) {
                 status_cache.insert(service_name.to_string(), ServiceStatusInfo {
-                    load_state: "not-loaded".to_string(),
                     active_state: "inactive".to_string(),
-                    sub_state: "dead".to_string(),
+                    memory_bytes: None,
+                    restart_count: None,
+                    start_timestamp: None,
                 });
             }
         }
@@ -340,36 +353,60 @@ impl SystemdCollector {
         Ok((services, status_cache))
     }
 
-    /// Get service status from cache (if available) or fallback to systemctl
-    fn get_service_status(&self, service: &str) -> Result<(String, String)> {
-        // Try to get status from cache first
-        if let Ok(state) = self.state.read() {
-            if let Some(cached_info) = state.service_status_cache.get(service) {
-                let active_status = cached_info.active_state.clone();
-                let detailed_info = format!(
-                    "LoadState={}\nActiveState={}\nSubState={}",
-                    cached_info.load_state,
-                    cached_info.active_state,
-                    cached_info.sub_state
-                );
-                return Ok((active_status, detailed_info));
+    /// Get service status with detailed metrics from systemctl
+    fn get_service_status(&self, service: &str) -> Result<ServiceStatusInfo> {
+        // Always fetch fresh data to get detailed metrics (memory, restarts, uptime)
+        // Note: Cache in service_status_cache only has basic active_state from discovery,
+        // with all detailed metrics set to None. We need fresh systemctl show data.
+
+        let output = Command::new("timeout")
+            .args(&[
+                "2",
+                "systemctl",
+                "show",
+                &format!("{}.service", service),
+                "--property=LoadState,ActiveState,SubState,MemoryCurrent,NRestarts,ExecMainStartTimestamp"
+            ])
+            .output()?;
+
+        let output_str = String::from_utf8(output.stdout)?;
+
+        // Parse properties
+        let mut active_state = String::new();
+        let mut memory_bytes = None;
+        let mut restart_count = None;
+        let mut start_timestamp = None;
+
+        for line in output_str.lines() {
+            if let Some(value) = line.strip_prefix("ActiveState=") {
+                active_state = value.to_string();
+            } else if let Some(value) = line.strip_prefix("MemoryCurrent=") {
+                if value != "[not set]" {
+                    memory_bytes = value.parse().ok();
+                }
+            } else if let Some(value) = line.strip_prefix("NRestarts=") {
+                restart_count = value.parse().ok();
+            } else if let Some(value) = line.strip_prefix("ExecMainStartTimestamp=") {
+                if value != "[not set]" && !value.is_empty() {
+                    // Parse timestamp to seconds since epoch
+                    if let Ok(output) = Command::new("date")
+                        .args(&["+%s", "-d", value])
+                        .output()
+                    {
+                        if let Ok(timestamp_str) = String::from_utf8(output.stdout) {
+                            start_timestamp = timestamp_str.trim().parse().ok();
+                        }
+                    }
+                }
             }
         }
 
-        // Fallback to systemctl if not in cache (with 2 second timeout)
-        let output = Command::new("timeout")
-            .args(&["2", "systemctl", "is-active", &format!("{}.service", service)])
-            .output()?;
-
-        let active_status = String::from_utf8(output.stdout)?.trim().to_string();
-
-        // Get more detailed info (with 2 second timeout)
-        let output = Command::new("timeout")
-            .args(&["2", "systemctl", "show", &format!("{}.service", service), "--property=LoadState,ActiveState,SubState"])
-            .output()?;
-
-        let detailed_info = String::from_utf8(output.stdout)?;
-        Ok((active_status, detailed_info))
+        Ok(ServiceStatusInfo {
+            active_state,
+            memory_bytes,
+            restart_count,
+            start_timestamp,
+        })
     }
 
     /// Check if service name matches pattern (supports wildcards like nginx*)

agent/src/config/mod.rs

@@ -13,7 +13,6 @@ pub struct AgentConfig {
     pub collectors: CollectorConfig,
     pub cache: CacheConfig,
     pub notifications: NotificationConfig,
-    pub collection_interval_seconds: u64,
 }
 
 /// ZMQ communication configuration

agent/src/config/validation.rs

@@ -11,9 +11,9 @@ pub fn validate_config(config: &AgentConfig) -> Result<()> {
         bail!("ZMQ bind address cannot be empty");
     }
 
-    // Validate collection interval
-    if config.collection_interval_seconds == 0 {
-        bail!("Collection interval cannot be 0");
+    // Validate ZMQ transmission interval
+    if config.zmq.transmission_interval_seconds == 0 {
+        bail!("ZMQ transmission interval cannot be 0");
     }
 
     // Validate CPU thresholds

dashboard/Cargo.toml

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

dashboard/src/ui/widgets/services.rs

@@ -31,6 +31,9 @@ struct ServiceInfo {
     metrics: Vec<(String, f32, Option<String>)>, // (label, value, unit)
     widget_status: Status,
     service_type: String, // "nginx_site", "container", "image", or empty for parent services
+    memory_bytes: Option<u64>,
+    restart_count: Option<u32>,
+    uptime_seconds: Option<u64>,
 }
 
 impl ServicesWidget {
@@ -84,7 +87,7 @@ impl ServicesWidget {
         // Convert Status enum to display text
         let status_str = match info.widget_status {
             Status::Ok => "active",
-            Status::Inactive => "inactive", 
+            Status::Inactive => "inactive",
             Status::Critical => "failed",
             Status::Pending => "pending",
             Status::Warning => "warning",
@@ -92,9 +95,43 @@ impl ServicesWidget {
             Status::Offline => "offline",
         };
 
+        // Format memory
+        let memory_str = info.memory_bytes.map_or("-".to_string(), |bytes| {
+            let mb = bytes as f64 / (1024.0 * 1024.0);
+            if mb >= 1000.0 {
+                format!("{:.1}G", mb / 1024.0)
+            } else {
+                format!("{:.0}M", mb)
+            }
+        });
+
+        // Format uptime
+        let uptime_str = info.uptime_seconds.map_or("-".to_string(), |secs| {
+            let days = secs / 86400;
+            let hours = (secs % 86400) / 3600;
+            let mins = (secs % 3600) / 60;
+
+            if days > 0 {
+                format!("{}d{}h", days, hours)
+            } else if hours > 0 {
+                format!("{}h{}m", hours, mins)
+            } else {
+                format!("{}m", mins)
+            }
+        });
+
+        // Format restarts (show "!" if > 0 to indicate instability)
+        let restart_str = info.restart_count.map_or("-".to_string(), |count| {
+            if count > 0 {
+                format!("!{}", count)
+            } else {
+                "0".to_string()
+            }
+        });
+
         format!(
-            "{:<23} {:<10}",
-            short_name, status_str
+            "{:<23} {:<10} {:<8} {:<8} {:<5}",
+            short_name, status_str, memory_str, uptime_str, restart_str
         )
     }
 
@@ -280,6 +317,9 @@ impl Widget for ServicesWidget {
                 metrics: Vec::new(), // Parent services don't have custom metrics
                 widget_status: service.service_status,
                 service_type: String::new(), // Parent services have no type
+                memory_bytes: service.memory_bytes,
+                restart_count: service.restart_count,
+                uptime_seconds: service.uptime_seconds,
             };
             self.parent_services.insert(service.name.clone(), parent_info);
 
@@ -296,6 +336,9 @@ impl Widget for ServicesWidget {
                         metrics,
                         widget_status: sub_service.service_status,
                         service_type: sub_service.service_type.clone(),
+                        memory_bytes: None, // Sub-services don't have individual metrics yet
+                        restart_count: None,
+                        uptime_seconds: None,
                     };
                     sub_list.push((sub_service.name.clone(), sub_info));
                 }
@@ -338,6 +381,9 @@ impl ServicesWidget {
                                     metrics: Vec::new(),
                                     widget_status: Status::Unknown,
                                     service_type: String::new(),
+                                    memory_bytes: None,
+                                    restart_count: None,
+                                    uptime_seconds: None,
                                 });
 
                         if metric.name.ends_with("_status") {
@@ -364,6 +410,9 @@ impl ServicesWidget {
                                     metrics: Vec::new(),
                                     widget_status: Status::Unknown,
                                     service_type: String::new(), // Unknown type in legacy path
+                                    memory_bytes: None,
+                                    restart_count: None,
+                                    uptime_seconds: None,
                                 },
                             ));
                             &mut sub_service_list.last_mut().unwrap().1
@@ -429,8 +478,8 @@ impl ServicesWidget {
 
         // Header
         let header = format!(
-            "{:<25} {:<10} {:<8} {:<8}",
-            "Service:", "Status:", "RAM:", "Disk:"
+            "{:<25} {:<10} {:<8} {:<8} {:<5}",
+            "Service:", "Status:", "RAM:", "Uptime:", "↻:"
         );
         let header_para = Paragraph::new(header).style(Typography::muted());
         frame.render_widget(header_para, content_chunks[0]);

dashboard/src/ui/widgets/system.rs

@@ -26,7 +26,7 @@ pub struct SystemWidget {
     cpu_load_1min: Option<f32>,
     cpu_load_5min: Option<f32>,
     cpu_load_15min: Option<f32>,
-    cpu_frequency: Option<f32>,
+    cpu_cstates: Vec<cm_dashboard_shared::CStateInfo>,
     cpu_status: Status,
     
     // Memory metrics
@@ -102,7 +102,7 @@ impl SystemWidget {
             cpu_load_1min: None,
             cpu_load_5min: None,
             cpu_load_15min: None,
-            cpu_frequency: None,
+            cpu_cstates: Vec::new(),
             cpu_status: Status::Unknown,
             memory_usage_percent: None,
             memory_used_gb: None,
@@ -137,12 +137,18 @@ impl SystemWidget {
         }
     }
 
-    /// Format CPU frequency
-    fn format_cpu_frequency(&self) -> String {
-        match self.cpu_frequency {
-            Some(freq) => format!("{:.0} MHz", freq),
-            None => "— MHz".to_string(),
+    /// Format CPU C-states (idle depth) with percentages
+    fn format_cpu_cstate(&self) -> String {
+        if self.cpu_cstates.is_empty() {
+            return "—".to_string();
         }
+
+        // Format top 3 C-states with percentages: "C10:79% C8:10% C6:8%"
+        self.cpu_cstates
+            .iter()
+            .map(|cs| format!("{}:{:.0}%", cs.name, cs.percent))
+            .collect::<Vec<_>>()
+            .join(" ")
     }
 
     /// Format memory usage
@@ -188,7 +194,7 @@ impl Widget for SystemWidget {
         self.cpu_load_1min = Some(cpu.load_1min);
         self.cpu_load_5min = Some(cpu.load_5min);
         self.cpu_load_15min = Some(cpu.load_15min);
-        self.cpu_frequency = Some(cpu.frequency_mhz);
+        self.cpu_cstates = cpu.cstates.clone();
         self.cpu_status = Status::Ok;
 
         // Extract memory data directly
@@ -832,10 +838,10 @@ impl SystemWidget {
         );
         lines.push(Line::from(cpu_spans));
 
-        let freq_text = self.format_cpu_frequency();
+        let cstate_text = self.format_cpu_cstate();
         lines.push(Line::from(vec![
             Span::styled("  └─ ", Typography::tree()),
-            Span::styled(format!("Freq: {}", freq_text), Typography::secondary())
+            Span::styled(format!("C-state: {}", cstate_text), Typography::secondary())
         ]));
 
         // RAM section

shared/Cargo.toml

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

shared/src/agent_data.rs

@@ -40,13 +40,20 @@ pub struct NetworkInterfaceData {
     pub vlan_id: Option<u16>,
 }
 
+/// CPU C-state usage information
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CStateInfo {
+    pub name: String,
+    pub percent: f32,
+}
+
 /// CPU monitoring data
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct CpuData {
     pub load_1min: f32,
     pub load_5min: f32,
     pub load_15min: f32,
-    pub frequency_mhz: f32,
+    pub cstates: Vec<CStateInfo>, // C-state usage percentages (C1, C6, C10, etc.) - indicates CPU idle depth distribution
     pub temperature_celsius: Option<f32>,
     pub load_status: Status,
     pub temperature_status: Status,
@@ -139,6 +146,12 @@ pub struct ServiceData {
     pub user_stopped: bool,
     pub service_status: Status,
     pub sub_services: Vec<SubServiceData>,
+    /// Memory usage in bytes (from MemoryCurrent)
+    pub memory_bytes: Option<u64>,
+    /// Number of service restarts (from NRestarts)
+    pub restart_count: Option<u32>,
+    /// Uptime in seconds (calculated from ExecMainStartTimestamp)
+    pub uptime_seconds: Option<u64>,
 }
 
 /// Sub-service data (nginx sites, docker containers, etc.)
@@ -198,7 +211,7 @@ impl AgentData {
                     load_1min: 0.0,
                     load_5min: 0.0,
                     load_15min: 0.0,
-                    frequency_mhz: 0.0,
+                    cstates: Vec::new(),
                     temperature_celsius: None,
                     load_status: Status::Unknown,
                     temperature_status: Status::Unknown,