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

Fix physical drive grouping logic for unified pool visualization
All checks were successful
Build and Release / build-and-release (push) Successful in 2m11s
Details

Browse Source 
Updated filesystem grouping to use extract_base_device method for proper
partition-to-drive mapping. This ensures nvme0n1p1 and nvme0n1p2 are
correctly grouped under nvme0n1 drive pool instead of separate pools.
This commit is contained in:
Christoffer Martinsson 2025-11-23 13:54:33 +01:00
parent 0e8b149718
commit 7a3ee3d5ba
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
[[package]] [[package]]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.107" version = "0.1.108"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -301,7 +301,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.107" version = "0.1.108"
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.107" version = "0.1.108"
dependencies = [ dependencies = [
"chrono", "chrono",
"serde", "serde",

2
agent/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.108" version = "0.1.109"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

13
agent/src/collectors/disk.rs
View File

@ -419,13 +419,22 @@ impl DiskCollector {
// Get the physical drive name for this mount point // Get the physical drive name for this mount point
if let Some(devices) = self.detected_devices.get(&fs.mount_point) { if let Some(devices) = self.detected_devices.get(&fs.mount_point) {
if let Some(device_name) = devices.first() { if let Some(device_name) = devices.first() {
// Extract drive name (e.g., "nvme0n1" from "nvme0n1") // Extract base drive name from detected device
let drive_name = device_name.clone(); let drive_name = Self::extract_base_device(device_name)
.unwrap_or_else(|| device_name.clone());
debug!("Grouping filesystem {} (device: {}) under drive: {}",
fs.mount_point, device_name, drive_name);
grouped.entry(drive_name).or_insert_with(Vec::new).push(fs.clone()); grouped.entry(drive_name).or_insert_with(Vec::new).push(fs.clone());
} }
} }
} }
debug!("Filesystem grouping result: {} drives with filesystems: {:?}",
grouped.len(),
grouped.keys().collect::<Vec<_>>());
Ok(grouped) Ok(grouped)
} }

2
dashboard/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.108" version = "0.1.109"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
shared/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard-shared" name = "cm-dashboard-shared"
version = "0.1.108" version = "0.1.109"
edition = "2021" edition = "2021"
[dependencies] [dependencies]