Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e1962a168 | |||
| 5bb7d6cf57 |
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.240"
|
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.240"
|
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.240"
|
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.241"
|
version = "0.1.243"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -152,27 +152,17 @@ impl CpuCollector {
|
|||||||
/// Extract CPU model number from full model name
|
/// Extract CPU model number from full model name
|
||||||
/// Examples:
|
/// Examples:
|
||||||
/// - "Intel(R) Core(TM) i7-9700 CPU @ 3.00GHz" -> "i7-9700"
|
/// - "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"
|
/// - "AMD Ryzen 9 5950X 16-Core Processor" -> "Ryzen 9 5950X"
|
||||||
fn extract_cpu_model(full_name: &str) -> String {
|
fn extract_cpu_model(full_name: &str) -> String {
|
||||||
// Look for common Intel patterns: i3, i5, i7, i9, Xeon
|
// Look for Intel Core patterns (both old and new gen): i3, i5, i7, i9
|
||||||
if let Some(pos) = full_name.find("i3-") {
|
// Match pattern like "i7-12700K" or "i7-9700"
|
||||||
if let Some(end) = full_name[pos..].find(' ') {
|
for prefix in &["i3-", "i5-", "i7-", "i9-"] {
|
||||||
return full_name[pos..pos + end].to_string();
|
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..];
|
||||||
if let Some(pos) = full_name.find("i5-") {
|
let end = after_prefix.find(' ').unwrap_or(after_prefix.len());
|
||||||
if let Some(end) = full_name[pos..].find(' ') {
|
return after_prefix[..end].to_string();
|
||||||
return full_name[pos..pos + end].to_string();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Some(pos) = full_name.find("i7-") {
|
|
||||||
if let Some(end) = full_name[pos..].find(' ') {
|
|
||||||
return full_name[pos..pos + end].to_string();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if let Some(pos) = full_name.find("i9-") {
|
|
||||||
if let Some(end) = full_name[pos..].find(' ') {
|
|
||||||
return full_name[pos..pos + end].to_string();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -186,9 +176,9 @@ impl CpuCollector {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fallback: return first 20 characters or full name if shorter
|
// Fallback: return first 15 characters or full name if shorter
|
||||||
if full_name.len() > 20 {
|
if full_name.len() > 15 {
|
||||||
full_name[..20].to_string()
|
full_name[..15].to_string()
|
||||||
} else {
|
} else {
|
||||||
full_name.to_string()
|
full_name.to_string()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.241"
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>,
|
||||||
|
|
||||||
@@ -92,8 +88,6 @@ 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,
|
||||||
@@ -159,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;
|
||||||
@@ -811,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())
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.241"
|
version = "0.1.243"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user