Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5bc250a738 | |||
| 5c3ac8b15e |
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.238"
|
version = "0.1.239"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.238"
|
version = "0.1.239"
|
||||||
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.238"
|
version = "0.1.239"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.238"
|
version = "0.1.240"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -119,6 +119,34 @@ 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 name = line[colon_pos + 1..].trim().to_string();
|
||||||
|
if model_name.is_none() {
|
||||||
|
model_name = Some(name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} 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(())
|
||||||
|
}
|
||||||
|
|
||||||
/// 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 +220,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(),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.238"
|
version = "0.1.240"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -27,6 +27,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
|
||||||
@@ -97,6 +99,8 @@ impl SystemWidget {
|
|||||||
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,
|
||||||
@@ -184,6 +188,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
|
||||||
@@ -830,11 +836,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.238"
|
version = "0.1.240"
|
||||||
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