Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e1962a168 | |||
| 5bb7d6cf57 | |||
| 7a0dc27846 | |||
| 5bc250a738 | |||
| 5c3ac8b15e | |||
| bdfff942f7 |
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.237"
|
version = "0.1.242"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.237"
|
version = "0.1.242"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -325,7 +325,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.237"
|
version = "0.1.242"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.237"
|
version = "0.1.243"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -119,6 +119,71 @@ impl CpuCollector {
|
|||||||
utils::parse_u64(content.trim())
|
utils::parse_u64(content.trim())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Collect static CPU information from /proc/cpuinfo (only once at startup)
|
||||||
|
async fn collect_cpu_info(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
|
||||||
|
let content = utils::read_proc_file("/proc/cpuinfo")?;
|
||||||
|
|
||||||
|
let mut model_name: Option<String> = None;
|
||||||
|
let mut core_count: u32 = 0;
|
||||||
|
|
||||||
|
for line in content.lines() {
|
||||||
|
if line.starts_with("model name") {
|
||||||
|
if let Some(colon_pos) = line.find(':') {
|
||||||
|
let full_name = line[colon_pos + 1..].trim();
|
||||||
|
// Extract just the model number (e.g., "i7-9700" from "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz")
|
||||||
|
let model = Self::extract_cpu_model(full_name);
|
||||||
|
if model_name.is_none() {
|
||||||
|
model_name = Some(model);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if line.starts_with("processor") {
|
||||||
|
core_count += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
agent_data.system.cpu.model_name = model_name;
|
||||||
|
if core_count > 0 {
|
||||||
|
agent_data.system.cpu.core_count = Some(core_count);
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Extract CPU model number from full model name
|
||||||
|
/// Examples:
|
||||||
|
/// - "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz" -> "i7-9700"
|
||||||
|
/// - "12th Gen Intel(R) Core(TM) i7-12700K" -> "i7-12700K"
|
||||||
|
/// - "AMD Ryzen 9 5950X 16-Core Processor" -> "Ryzen 9 5950X"
|
||||||
|
fn extract_cpu_model(full_name: &str) -> String {
|
||||||
|
// Look for Intel Core patterns (both old and new gen): i3, i5, i7, i9
|
||||||
|
// Match pattern like "i7-12700K" or "i7-9700"
|
||||||
|
for prefix in &["i3-", "i5-", "i7-", "i9-"] {
|
||||||
|
if let Some(pos) = full_name.find(prefix) {
|
||||||
|
// Find end of model number (until space or end of string)
|
||||||
|
let after_prefix = &full_name[pos..];
|
||||||
|
let end = after_prefix.find(' ').unwrap_or(after_prefix.len());
|
||||||
|
return after_prefix[..end].to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Look for AMD Ryzen pattern
|
||||||
|
if let Some(pos) = full_name.find("Ryzen") {
|
||||||
|
// Extract "Ryzen X XXXX" pattern
|
||||||
|
let after_ryzen = &full_name[pos..];
|
||||||
|
let parts: Vec<&str> = after_ryzen.split_whitespace().collect();
|
||||||
|
if parts.len() >= 3 {
|
||||||
|
return format!("{} {} {}", parts[0], parts[1], parts[2]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: return first 15 characters or full name if shorter
|
||||||
|
if full_name.len() > 15 {
|
||||||
|
full_name[..15].to_string()
|
||||||
|
} else {
|
||||||
|
full_name.to_string()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Collect CPU C-state (idle depth) and populate AgentData with top 3 C-states by usage
|
/// 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> {
|
async fn collect_cstate(&self, agent_data: &mut AgentData) -> Result<(), CollectorError> {
|
||||||
// Read C-state usage from first CPU (representative of overall system)
|
// Read C-state usage from first CPU (representative of overall system)
|
||||||
@@ -192,6 +257,11 @@ impl Collector for CpuCollector {
|
|||||||
debug!("Collecting CPU metrics");
|
debug!("Collecting CPU metrics");
|
||||||
let start = std::time::Instant::now();
|
let start = std::time::Instant::now();
|
||||||
|
|
||||||
|
// Collect static CPU info (only once at startup)
|
||||||
|
if agent_data.system.cpu.model_name.is_none() || agent_data.system.cpu.core_count.is_none() {
|
||||||
|
self.collect_cpu_info(agent_data).await?;
|
||||||
|
}
|
||||||
|
|
||||||
// Collect load averages (always available)
|
// Collect load averages (always available)
|
||||||
self.collect_load_averages(agent_data).await?;
|
self.collect_load_averages(agent_data).await?;
|
||||||
|
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ impl SystemdCollector {
|
|||||||
|
|
||||||
sub_services.push(SubServiceData {
|
sub_services.push(SubServiceData {
|
||||||
name: image_name.to_string(),
|
name: image_name.to_string(),
|
||||||
service_status: self.calculate_service_status(&image_name, &image_status),
|
service_status: Status::Info, // Informational only, no status icon
|
||||||
metrics,
|
metrics,
|
||||||
service_type: "image".to_string(),
|
service_type: "image".to_string(),
|
||||||
});
|
});
|
||||||
@@ -160,22 +160,15 @@ impl SystemdCollector {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if service_name == "openvpn-vpn-connection" && status_info.active_state == "active" {
|
if service_name == "openvpn-vpn-connection" && status_info.active_state == "active" {
|
||||||
tracing::info!("Checking VPN external IP for service: {}", service_name);
|
if let Some(external_ip) = self.get_vpn_external_ip() {
|
||||||
match self.get_vpn_external_ip() {
|
let metrics = Vec::new();
|
||||||
Some(external_ip) => {
|
|
||||||
tracing::info!("Got VPN external IP: {}", external_ip);
|
|
||||||
let metrics = Vec::new();
|
|
||||||
|
|
||||||
sub_services.push(SubServiceData {
|
sub_services.push(SubServiceData {
|
||||||
name: format!("ip: {}", external_ip),
|
name: format!("ip: {}", external_ip),
|
||||||
service_status: Status::Info,
|
service_status: Status::Info,
|
||||||
metrics,
|
metrics,
|
||||||
service_type: "vpn_route".to_string(),
|
service_type: "vpn_route".to_string(),
|
||||||
});
|
});
|
||||||
}
|
|
||||||
None => {
|
|
||||||
tracing::warn!("Failed to get VPN external IP");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -883,8 +876,6 @@ impl SystemdCollector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
|
||||||
tracing::warn!("VPN external IP query failed. Exit code: {:?}, stderr: {}", output.status.code(), stderr);
|
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.237"
|
version = "0.1.243"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -110,14 +110,6 @@ impl TuiApp {
|
|||||||
host_widgets.system_widget.update_from_agent_data(agent_data);
|
host_widgets.system_widget.update_from_agent_data(agent_data);
|
||||||
host_widgets.services_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());
|
host_widgets.last_update = Some(Instant::now());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -273,37 +273,9 @@ impl ServicesWidget {
|
|||||||
};
|
};
|
||||||
let tree_symbol = if is_last { "└─" } else { "├─" };
|
let tree_symbol = if is_last { "└─" } else { "├─" };
|
||||||
|
|
||||||
// Docker images use docker whale icon
|
if info.widget_status == Status::Info {
|
||||||
if info.service_type == "image" {
|
// Informational data - no status icon, show metrics if available
|
||||||
vec![
|
let mut spans = vec![
|
||||||
// Indentation and tree prefix
|
|
||||||
ratatui::text::Span::styled(
|
|
||||||
format!(" {} ", tree_symbol),
|
|
||||||
Typography::tree(),
|
|
||||||
),
|
|
||||||
// Docker icon (simple character for performance)
|
|
||||||
ratatui::text::Span::styled(
|
|
||||||
"D ".to_string(),
|
|
||||||
Style::default().fg(Theme::highlight()).bg(Theme::background()),
|
|
||||||
),
|
|
||||||
// Service name
|
|
||||||
ratatui::text::Span::styled(
|
|
||||||
format!("{:<18} ", short_name),
|
|
||||||
Style::default()
|
|
||||||
.fg(Theme::secondary_text())
|
|
||||||
.bg(Theme::background()),
|
|
||||||
),
|
|
||||||
// Status/metrics text
|
|
||||||
ratatui::text::Span::styled(
|
|
||||||
status_str,
|
|
||||||
Style::default()
|
|
||||||
.fg(Theme::secondary_text())
|
|
||||||
.bg(Theme::background()),
|
|
||||||
),
|
|
||||||
]
|
|
||||||
} else if info.widget_status == Status::Info {
|
|
||||||
// Informational data - no status icon
|
|
||||||
vec![
|
|
||||||
// Indentation and tree prefix
|
// Indentation and tree prefix
|
||||||
ratatui::text::Span::styled(
|
ratatui::text::Span::styled(
|
||||||
format!(" {} ", tree_symbol),
|
format!(" {} ", tree_symbol),
|
||||||
@@ -311,12 +283,24 @@ impl ServicesWidget {
|
|||||||
),
|
),
|
||||||
// Service name (no icon)
|
// Service name (no icon)
|
||||||
ratatui::text::Span::styled(
|
ratatui::text::Span::styled(
|
||||||
short_name,
|
format!("{:<18} ", short_name),
|
||||||
Style::default()
|
Style::default()
|
||||||
.fg(Theme::secondary_text())
|
.fg(Theme::secondary_text())
|
||||||
.bg(Theme::background()),
|
.bg(Theme::background()),
|
||||||
),
|
),
|
||||||
]
|
];
|
||||||
|
|
||||||
|
// Add metrics if available (e.g., Docker image size)
|
||||||
|
if !status_str.is_empty() {
|
||||||
|
spans.push(ratatui::text::Span::styled(
|
||||||
|
status_str,
|
||||||
|
Style::default()
|
||||||
|
.fg(Theme::secondary_text())
|
||||||
|
.bg(Theme::background()),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
spans
|
||||||
} else {
|
} else {
|
||||||
vec![
|
vec![
|
||||||
// Indentation and tree prefix
|
// Indentation and tree prefix
|
||||||
|
|||||||
@@ -15,10 +15,6 @@ pub struct SystemWidget {
|
|||||||
nixos_build: Option<String>,
|
nixos_build: Option<String>,
|
||||||
agent_hash: Option<String>,
|
agent_hash: Option<String>,
|
||||||
|
|
||||||
// ZMQ communication stats
|
|
||||||
zmq_packets_received: Option<u64>,
|
|
||||||
zmq_last_packet_age: Option<f64>,
|
|
||||||
|
|
||||||
// Network interfaces
|
// Network interfaces
|
||||||
network_interfaces: Vec<cm_dashboard_shared::NetworkInterfaceData>,
|
network_interfaces: Vec<cm_dashboard_shared::NetworkInterfaceData>,
|
||||||
|
|
||||||
@@ -27,6 +23,8 @@ pub struct SystemWidget {
|
|||||||
cpu_load_5min: Option<f32>,
|
cpu_load_5min: Option<f32>,
|
||||||
cpu_load_15min: Option<f32>,
|
cpu_load_15min: Option<f32>,
|
||||||
cpu_cstates: Vec<cm_dashboard_shared::CStateInfo>,
|
cpu_cstates: Vec<cm_dashboard_shared::CStateInfo>,
|
||||||
|
cpu_model_name: Option<String>,
|
||||||
|
cpu_core_count: Option<u32>,
|
||||||
cpu_status: Status,
|
cpu_status: Status,
|
||||||
|
|
||||||
// Memory metrics
|
// Memory metrics
|
||||||
@@ -90,13 +88,13 @@ impl SystemWidget {
|
|||||||
Self {
|
Self {
|
||||||
nixos_build: None,
|
nixos_build: None,
|
||||||
agent_hash: None,
|
agent_hash: None,
|
||||||
zmq_packets_received: None,
|
|
||||||
zmq_last_packet_age: None,
|
|
||||||
network_interfaces: Vec::new(),
|
network_interfaces: Vec::new(),
|
||||||
cpu_load_1min: None,
|
cpu_load_1min: None,
|
||||||
cpu_load_5min: None,
|
cpu_load_5min: None,
|
||||||
cpu_load_15min: None,
|
cpu_load_15min: None,
|
||||||
cpu_cstates: Vec::new(),
|
cpu_cstates: Vec::new(),
|
||||||
|
cpu_model_name: None,
|
||||||
|
cpu_core_count: None,
|
||||||
cpu_status: Status::Unknown,
|
cpu_status: Status::Unknown,
|
||||||
memory_usage_percent: None,
|
memory_usage_percent: None,
|
||||||
memory_used_gb: None,
|
memory_used_gb: None,
|
||||||
@@ -155,12 +153,6 @@ impl SystemWidget {
|
|||||||
pub fn _get_agent_hash(&self) -> Option<&String> {
|
pub fn _get_agent_hash(&self) -> Option<&String> {
|
||||||
self.agent_hash.as_ref()
|
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;
|
use super::Widget;
|
||||||
@@ -184,6 +176,8 @@ impl Widget for SystemWidget {
|
|||||||
self.cpu_load_5min = Some(cpu.load_5min);
|
self.cpu_load_5min = Some(cpu.load_5min);
|
||||||
self.cpu_load_15min = Some(cpu.load_15min);
|
self.cpu_load_15min = Some(cpu.load_15min);
|
||||||
self.cpu_cstates = cpu.cstates.clone();
|
self.cpu_cstates = cpu.cstates.clone();
|
||||||
|
self.cpu_model_name = cpu.model_name.clone();
|
||||||
|
self.cpu_core_count = cpu.core_count;
|
||||||
self.cpu_status = Status::Ok;
|
self.cpu_status = Status::Ok;
|
||||||
|
|
||||||
// Extract memory data directly
|
// Extract memory data directly
|
||||||
@@ -805,18 +799,6 @@ impl SystemWidget {
|
|||||||
Span::styled(format!("Agent: {}", agent_version_text), Typography::secondary())
|
Span::styled(format!("Agent: {}", agent_version_text), Typography::secondary())
|
||||||
]));
|
]));
|
||||||
|
|
||||||
// ZMQ communication stats
|
|
||||||
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(format!("ZMQ: {} pkts, last {}", packets, age_text), Typography::secondary())
|
|
||||||
]));
|
|
||||||
}
|
|
||||||
|
|
||||||
// CPU section
|
// CPU section
|
||||||
lines.push(Line::from(vec![
|
lines.push(Line::from(vec![
|
||||||
Span::styled("CPU:", Typography::widget_title())
|
Span::styled("CPU:", Typography::widget_title())
|
||||||
@@ -830,11 +812,31 @@ impl SystemWidget {
|
|||||||
lines.push(Line::from(cpu_spans));
|
lines.push(Line::from(cpu_spans));
|
||||||
|
|
||||||
let cstate_text = self.format_cpu_cstate();
|
let cstate_text = self.format_cpu_cstate();
|
||||||
|
let has_cpu_info = self.cpu_model_name.is_some() || self.cpu_core_count.is_some();
|
||||||
|
let cstate_tree = if has_cpu_info { " ├─ " } else { " └─ " };
|
||||||
lines.push(Line::from(vec![
|
lines.push(Line::from(vec![
|
||||||
Span::styled(" └─ ", Typography::tree()),
|
Span::styled(cstate_tree, Typography::tree()),
|
||||||
Span::styled(format!("C-state: {}", cstate_text), Typography::secondary())
|
Span::styled(format!("C-state: {}", cstate_text), Typography::secondary())
|
||||||
]));
|
]));
|
||||||
|
|
||||||
|
// CPU model and core count (if available)
|
||||||
|
if let (Some(model), Some(cores)) = (&self.cpu_model_name, self.cpu_core_count) {
|
||||||
|
lines.push(Line::from(vec![
|
||||||
|
Span::styled(" └─ ", Typography::tree()),
|
||||||
|
Span::styled(format!("{} ({} cores)", model, cores), Typography::secondary())
|
||||||
|
]));
|
||||||
|
} else if let Some(model) = &self.cpu_model_name {
|
||||||
|
lines.push(Line::from(vec![
|
||||||
|
Span::styled(" └─ ", Typography::tree()),
|
||||||
|
Span::styled(model.clone(), Typography::secondary())
|
||||||
|
]));
|
||||||
|
} else if let Some(cores) = self.cpu_core_count {
|
||||||
|
lines.push(Line::from(vec![
|
||||||
|
Span::styled(" └─ ", Typography::tree()),
|
||||||
|
Span::styled(format!("{} cores", cores), Typography::secondary())
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
// RAM section
|
// RAM section
|
||||||
lines.push(Line::from(vec![
|
lines.push(Line::from(vec![
|
||||||
Span::styled("RAM:", Typography::widget_title())
|
Span::styled("RAM:", Typography::widget_title())
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.237"
|
version = "0.1.243"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -57,6 +57,11 @@ pub struct CpuData {
|
|||||||
pub temperature_celsius: Option<f32>,
|
pub temperature_celsius: Option<f32>,
|
||||||
pub load_status: Status,
|
pub load_status: Status,
|
||||||
pub temperature_status: Status,
|
pub temperature_status: Status,
|
||||||
|
// Static CPU information (collected once at startup)
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub model_name: Option<String>,
|
||||||
|
#[serde(skip_serializing_if = "Option::is_none")]
|
||||||
|
pub core_count: Option<u32>,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Memory monitoring data
|
/// Memory monitoring data
|
||||||
@@ -219,6 +224,8 @@ impl AgentData {
|
|||||||
temperature_celsius: None,
|
temperature_celsius: None,
|
||||||
load_status: Status::Unknown,
|
load_status: Status::Unknown,
|
||||||
temperature_status: Status::Unknown,
|
temperature_status: Status::Unknown,
|
||||||
|
model_name: None,
|
||||||
|
core_count: None,
|
||||||
},
|
},
|
||||||
memory: MemoryData {
|
memory: MemoryData {
|
||||||
usage_percent: 0.0,
|
usage_percent: 0.0,
|
||||||
|
|||||||
Reference in New Issue
Block a user