Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0e8b149718 | |||
| 2c27d0e1db | |||
| 9f18488752 |
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.104"
|
version = "0.1.107"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.104"
|
version = "0.1.107"
|
||||||
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.104"
|
version = "0.1.107"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"serde",
|
"serde",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.105"
|
version = "0.1.108"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.105"
|
version = "0.1.108"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -384,11 +384,14 @@ impl SystemWidget {
|
|||||||
if let Some(fs_start) = metric_name.find("_fs_") {
|
if let Some(fs_start) = metric_name.find("_fs_") {
|
||||||
let after_fs = &metric_name[fs_start + 4..]; // Skip "_fs_"
|
let after_fs = &metric_name[fs_start + 4..]; // Skip "_fs_"
|
||||||
|
|
||||||
// Find the last underscore to separate filesystem name from metric type
|
// Look for known metric suffixes (these can contain underscores)
|
||||||
if let Some(last_underscore) = after_fs.rfind('_') {
|
let known_suffixes = ["usage_percent", "used_gb", "total_gb", "available_gb", "mount_point"];
|
||||||
let fs_name = after_fs[..last_underscore].to_string();
|
|
||||||
let metric_type = after_fs[last_underscore + 1..].to_string();
|
for suffix in known_suffixes {
|
||||||
return (Some(fs_name), Some(metric_type));
|
if after_fs.ends_with(suffix) {
|
||||||
|
let fs_name = after_fs[..after_fs.len() - suffix.len() - 1].to_string(); // Remove suffix + underscore
|
||||||
|
return (Some(fs_name), Some(suffix.to_string()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -559,6 +562,15 @@ impl SystemWidget {
|
|||||||
(Some(pct), Some(used), Some(total)) => {
|
(Some(pct), Some(used), Some(total)) => {
|
||||||
format!("{}: {:.0}% {:.1}GB/{:.1}GB", filesystem.mount_point, pct, used, total)
|
format!("{}: {:.0}% {:.1}GB/{:.1}GB", filesystem.mount_point, pct, used, total)
|
||||||
}
|
}
|
||||||
|
(Some(pct), _, Some(total)) => {
|
||||||
|
format!("{}: {:.0}% —GB/{:.1}GB", filesystem.mount_point, pct, total)
|
||||||
|
}
|
||||||
|
(Some(pct), _, _) => {
|
||||||
|
format!("{}: {:.0}% —GB/—GB", filesystem.mount_point, pct)
|
||||||
|
}
|
||||||
|
(_, Some(used), Some(total)) => {
|
||||||
|
format!("{}: —% {:.1}GB/{:.1}GB", filesystem.mount_point, used, total)
|
||||||
|
}
|
||||||
_ => format!("{}: —% —GB/—GB", filesystem.mount_point),
|
_ => format!("{}: —% —GB/—GB", filesystem.mount_point),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.105"
|
version = "0.1.108"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Reference in New Issue
Block a user