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

Fix lsblk parsing for filesystem discovery
All checks were successful
Build and Release / build-and-release (push) Successful in 1m9s
Details

Browse Source 
Remove unused debug code and fix device name parsing to properly
handle lsblk tree characters. This resolves the issue where only
/boot filesystem was discovered instead of both /boot and /.
This commit is contained in:
Christoffer Martinsson 2025-11-23 16:09:48 +01:00
parent 07422cd0a7
commit 006f27f7d9
5 changed files with 7 additions and 15 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.115" version = "0.1.116"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
@ -301,7 +301,7 @@ dependencies = [
[[package]] [[package]]
name = "cm-dashboard-agent" name = "cm-dashboard-agent"
version = "0.1.115" version = "0.1.116"
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.115" version = "0.1.116"
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.115" version = "0.1.116"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

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

@ -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
@ -665,11 +662,6 @@ impl DiskCollector {
}); });
// Individual filesystem metrics // Individual filesystem metrics
debug!("Drive {} has {} filesystems", drive_name, drive.filesystems.len());
for filesystem in &drive.filesystems {
debug!("Filesystem {}: {} bytes used / {} bytes total",
filesystem.mount_point, filesystem.used_bytes, filesystem.total_bytes);
}
for filesystem in &drive.filesystems { for filesystem in &drive.filesystems {
let fs_name = if filesystem.mount_point == "/" { let fs_name = if filesystem.mount_point == "/" {
"root".to_string() "root".to_string()

2
dashboard/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "cm-dashboard" name = "cm-dashboard"
version = "0.1.115" version = "0.1.116"
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.115" version = "0.1.116"
edition = "2021" edition = "2021"
[dependencies] [dependencies]