Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6d4da1b7da |
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.109"
|
version = "0.1.110"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.109"
|
version = "0.1.110"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
@@ -324,7 +324,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.109"
|
version = "0.1.110"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.110"
|
version = "0.1.111"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.110"
|
version = "0.1.111"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -157,13 +157,17 @@ impl SystemWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Parse storage metrics into pools and drives
|
/// Parse storage metrics into pools and drives
|
||||||
fn update_storage_from_metrics(&mut self, metrics: &[&Metric]) {
|
fn update_storage_from_metrics(&mut self, metrics: &[&Metric]) {
|
||||||
let mut pools: std::collections::HashMap<String, StoragePool> = std::collections::HashMap::new();
|
let mut pools: std::collections::HashMap<String, StoragePool> = std::collections::HashMap::new();
|
||||||
|
|
||||||
for metric in metrics {
|
for metric in metrics {
|
||||||
if metric.name.starts_with("disk_") {
|
if metric.name.starts_with("disk_") {
|
||||||
if let Some(pool_name) = self.extract_pool_name(&metric.name) {
|
// Wrap individual metric parsing in error handling
|
||||||
|
if let Ok(pool_name) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
|
self.extract_pool_name(&metric.name)
|
||||||
|
})) {
|
||||||
|
if let Some(pool_name) = pool_name {
|
||||||
let mount_point = self.get_mount_point_for_pool(&pool_name);
|
let mount_point = self.get_mount_point_for_pool(&pool_name);
|
||||||
let pool = pools.entry(pool_name.clone()).or_insert_with(|| StoragePool {
|
let pool = pools.entry(pool_name.clone()).or_insert_with(|| StoragePool {
|
||||||
name: pool_name.clone(),
|
name: pool_name.clone(),
|
||||||
@@ -328,7 +332,10 @@ impl SystemWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} // Close pool_name Some check
|
||||||
|
} else {
|
||||||
|
tracing::warn!("Failed to extract pool name from metric: {}", metric.name);
|
||||||
|
} // Close error handling for extract_pool_name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -705,8 +712,13 @@ impl Widget for SystemWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update storage from all disk metrics
|
// Update storage from all disk metrics (with error handling)
|
||||||
self.update_storage_from_metrics(metrics);
|
if let Err(e) = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
|
||||||
|
self.update_storage_from_metrics(metrics);
|
||||||
|
})) {
|
||||||
|
tracing::error!("Storage metrics parsing failed, continuing with empty storage: {:?}", e);
|
||||||
|
self.storage_pools = Vec::new();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.110"
|
version = "0.1.111"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user