cm/cm-dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 273 Wiki Activity

Fix unified pool visualization filesystem children display issues
All checks were successful
Build and Release / build-and-release (push) Successful in 2m14s
Details

Browse Source 
- 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:
Christoffer Martinsson
2025-11-23 12:58:16 +01:00
parent d68ecfbc64
commit c3626cc362
5 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dashboard/src/ui/widgets/system.rs
View File

@@ -70,6 +70,7 @@ struct FileSystem {
usage_percent: Option<f32>,
used_gb: Option<f32>,
total_gb: Option<f32>,
available_gb: Option<f32>,
status: Status,
}
@@ -255,15 +256,21 @@ impl SystemWidget {
});
if !fs_exists {
// Extract actual mount point from mount_point metric if available
let mount_point = if metric_type == "mount_point" {
if let MetricValue::String(mount) = &metric.value {
mount.clone()
// Only create filesystem entry if we have the mount_point metric
// This ensures we get the correct mount point path
if metric_type != "mount_point" {
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 {
format!("/{}", fs_name.replace('_', "/"))
}
} else {
format!("/{}", fs_name.replace('_', "/"))
};
pool.filesystems.push(FileSystem {
@@ -271,6 +278,7 @@ impl SystemWidget {
usage_percent: None,
used_gb: None,
total_gb: None,
available_gb: None,
status: Status::Unknown,
});
}
@@ -301,6 +309,11 @@ impl SystemWidget {
filesystem.total_gb = Some(total);
}
}
"available_gb" => {
if let MetricValue::Float(available) = metric.value {
filesystem.available_gb = Some(available);
}
}
"mount_point" => {
if let MetricValue::String(mount) = &metric.value {
filesystem.mount_point = mount.clone();
@@ -336,10 +349,17 @@ impl SystemWidget {
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
else if let Some(suffix_pos) = metric_name.rfind("_usage_percent")
.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_"
}
// Fallback to old behavior for unknown patterns