Fix unified pool visualization filesystem children display issues
All checks were successful
Build and Release / build-and-release (push) Successful in 2m14s
All checks were successful
Build and Release / build-and-release (push) Successful in 2m14s
- Fix extract_pool_name() to handle filesystem metrics (_fs_) correctly - Prevent individual filesystem pools (nvme0n1_fs_boot, nvme0n1_fs_root) from being created - Fix incorrect mount point names (was showing /root/mount instead of /) - Only create filesystem entries when receiving mount_point metrics - Add available_gb field to FileSystem struct for proper available space handling - Ensure filesystem children show correct usage data instead of —% —GB/—GB
This commit is contained in:
parent
d68ecfbc64
commit
c3626cc362
4
Cargo.lock
generated
4
Cargo.lock
generated
@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.102"
|
version = "0.1.103"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@ -301,7 +301,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.102"
|
version = "0.1.103"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-trait",
|
"async-trait",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-agent"
|
name = "cm-dashboard-agent"
|
||||||
version = "0.1.103"
|
version = "0.1.104"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard"
|
name = "cm-dashboard"
|
||||||
version = "0.1.103"
|
version = "0.1.104"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@ -70,6 +70,7 @@ struct FileSystem {
|
|||||||
usage_percent: Option<f32>,
|
usage_percent: Option<f32>,
|
||||||
used_gb: Option<f32>,
|
used_gb: Option<f32>,
|
||||||
total_gb: Option<f32>,
|
total_gb: Option<f32>,
|
||||||
|
available_gb: Option<f32>,
|
||||||
status: Status,
|
status: Status,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -255,15 +256,21 @@ impl SystemWidget {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if !fs_exists {
|
if !fs_exists {
|
||||||
// Extract actual mount point from mount_point metric if available
|
// Only create filesystem entry if we have the mount_point metric
|
||||||
let mount_point = if metric_type == "mount_point" {
|
// This ensures we get the correct mount point path
|
||||||
if let MetricValue::String(mount) = &metric.value {
|
if metric_type != "mount_point" {
|
||||||
mount.clone()
|
continue; // Skip non-mount_point metrics if filesystem doesn't exist yet
|
||||||
|
}
|
||||||
|
|
||||||
|
let mount_point = if let MetricValue::String(mount) = &metric.value {
|
||||||
|
mount.clone()
|
||||||
|
} else {
|
||||||
|
// Fallback: handle special cases
|
||||||
|
if fs_name == "root" {
|
||||||
|
"/".to_string()
|
||||||
} else {
|
} else {
|
||||||
format!("/{}", fs_name.replace('_', "/"))
|
format!("/{}", fs_name.replace('_', "/"))
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
format!("/{}", fs_name.replace('_', "/"))
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pool.filesystems.push(FileSystem {
|
pool.filesystems.push(FileSystem {
|
||||||
@ -271,6 +278,7 @@ impl SystemWidget {
|
|||||||
usage_percent: None,
|
usage_percent: None,
|
||||||
used_gb: None,
|
used_gb: None,
|
||||||
total_gb: None,
|
total_gb: None,
|
||||||
|
available_gb: None,
|
||||||
status: Status::Unknown,
|
status: Status::Unknown,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -301,6 +309,11 @@ impl SystemWidget {
|
|||||||
filesystem.total_gb = Some(total);
|
filesystem.total_gb = Some(total);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
"available_gb" => {
|
||||||
|
if let MetricValue::Float(available) = metric.value {
|
||||||
|
filesystem.available_gb = Some(available);
|
||||||
|
}
|
||||||
|
}
|
||||||
"mount_point" => {
|
"mount_point" => {
|
||||||
if let MetricValue::String(mount) = &metric.value {
|
if let MetricValue::String(mount) = &metric.value {
|
||||||
filesystem.mount_point = mount.clone();
|
filesystem.mount_point = mount.clone();
|
||||||
@ -336,10 +349,17 @@ impl SystemWidget {
|
|||||||
return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
|
return Some(metric_name[5..drive_start].to_string()); // Skip "disk_"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Handle filesystem metrics: disk_{pool}_fs_{filesystem}_{metric}
|
||||||
|
else if metric_name.contains("_fs_") {
|
||||||
|
if let Some(fs_pos) = metric_name.find("_fs_") {
|
||||||
|
return Some(metric_name[5..fs_pos].to_string()); // Skip "disk_", extract pool name before "_fs_"
|
||||||
|
}
|
||||||
|
}
|
||||||
// For pool-level metrics (usage_percent, used_gb, total_gb), take everything before the metric suffix
|
// For pool-level metrics (usage_percent, used_gb, total_gb), take everything before the metric suffix
|
||||||
else if let Some(suffix_pos) = metric_name.rfind("_usage_percent")
|
else if let Some(suffix_pos) = metric_name.rfind("_usage_percent")
|
||||||
.or_else(|| metric_name.rfind("_used_gb"))
|
.or_else(|| metric_name.rfind("_used_gb"))
|
||||||
.or_else(|| metric_name.rfind("_total_gb")) {
|
.or_else(|| metric_name.rfind("_total_gb"))
|
||||||
|
.or_else(|| metric_name.rfind("_available_gb")) {
|
||||||
return Some(metric_name[5..suffix_pos].to_string()); // Skip "disk_"
|
return Some(metric_name[5..suffix_pos].to_string()); // Skip "disk_"
|
||||||
}
|
}
|
||||||
// Fallback to old behavior for unknown patterns
|
// Fallback to old behavior for unknown patterns
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "cm-dashboard-shared"
|
name = "cm-dashboard-shared"
|
||||||
version = "0.1.103"
|
version = "0.1.104"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user