Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1da7b5f6e7 | |||
| 006f27f7d9 | |||
| 07422cd0a7 | |||
| de30b80219 |
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.113"
|
version = "0.1.117"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.113"
|
version = "0.1.117"
|
||||||
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.113"
|
version = "0.1.117"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.113"
|
version = "0.1.117"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -119,10 +119,7 @@ impl DiskCollector {
|
|||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||||
if parts.len() >= 2 {
|
if parts.len() >= 2 {
|
||||||
let device_name = parts[0]
|
let device_name = parts[0]
|
||||||
.trim_start_matches('├')
|
.trim_start_matches(&['├', '└', '─', ' '][..]);
|
||||||
.trim_start_matches('└')
|
|
||||||
.trim_start_matches('─')
|
|
||||||
.trim();
|
|
||||||
let mount_point = parts[1];
|
let mount_point = parts[1];
|
||||||
|
|
||||||
// Skip unwanted mount points
|
// Skip unwanted mount points
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.113"
|
version = "0.1.117"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -185,11 +185,13 @@ impl SystemWidget {
|
|||||||
pool.usage_percent = Some(usage);
|
pool.usage_percent = Some(usage);
|
||||||
pool.status = metric.status.clone();
|
pool.status = metric.status.clone();
|
||||||
}
|
}
|
||||||
} else if metric.name.contains("_used_gb") {
|
} else if metric.name.contains("_used_gb") && !metric.name.contains("_fs_") {
|
||||||
|
// Only use drive-level metrics for pool totals, not filesystem metrics
|
||||||
if let MetricValue::Float(used) = metric.value {
|
if let MetricValue::Float(used) = metric.value {
|
||||||
pool.used_gb = Some(used);
|
pool.used_gb = Some(used);
|
||||||
}
|
}
|
||||||
} else if metric.name.contains("_total_gb") {
|
} else if metric.name.contains("_total_gb") && !metric.name.contains("_fs_") {
|
||||||
|
// Only use drive-level metrics for pool totals, not filesystem metrics
|
||||||
if let MetricValue::Float(total) = metric.value {
|
if let MetricValue::Float(total) = metric.value {
|
||||||
pool.total_gb = Some(total);
|
pool.total_gb = Some(total);
|
||||||
}
|
}
|
||||||
@@ -391,8 +393,11 @@ impl SystemWidget {
|
|||||||
|
|
||||||
for suffix in known_suffixes {
|
for suffix in known_suffixes {
|
||||||
if after_fs.ends_with(suffix) {
|
if after_fs.ends_with(suffix) {
|
||||||
let fs_name = after_fs[..after_fs.len() - suffix.len() - 1].to_string(); // Remove suffix + underscore
|
// Extract filesystem name by removing suffix and underscore
|
||||||
return (Some(fs_name), Some(suffix.to_string()));
|
if let Some(underscore_pos) = after_fs.rfind(&format!("_{}", suffix)) {
|
||||||
|
let fs_name = after_fs[..underscore_pos].to_string();
|
||||||
|
return (Some(fs_name), Some(suffix.to_string()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.113"
|
version = "0.1.117"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user