diff --git a/Cargo.lock b/Cargo.lock index c009d05..0d6c917 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,7 +279,7 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "cm-dashboard" -version = "0.1.117" +version = "0.1.118" dependencies = [ "anyhow", "chrono", @@ -301,7 +301,7 @@ dependencies = [ [[package]] name = "cm-dashboard-agent" -version = "0.1.117" +version = "0.1.118" dependencies = [ "anyhow", "async-trait", @@ -324,7 +324,7 @@ dependencies = [ [[package]] name = "cm-dashboard-shared" -version = "0.1.117" +version = "0.1.118" dependencies = [ "chrono", "serde", diff --git a/agent/Cargo.toml b/agent/Cargo.toml index ca37396..dd2be83 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-agent" -version = "0.1.117" +version = "0.1.118" edition = "2021" [dependencies] diff --git a/agent/src/collectors/disk.rs b/agent/src/collectors/disk.rs index 6bd7133..ca09f7d 100644 --- a/agent/src/collectors/disk.rs +++ b/agent/src/collectors/disk.rs @@ -695,7 +695,7 @@ impl DiskCollector { value: MetricValue::Float(self.bytes_to_gb(filesystem.used_bytes)), unit: Some("GB".to_string()), description: Some(format!("{}: {}", filesystem.mount_point, self.bytes_to_human_readable(filesystem.used_bytes))), - status: Status::Ok, + status: fs_status.clone(), timestamp, }); @@ -704,7 +704,7 @@ impl DiskCollector { value: MetricValue::Float(self.bytes_to_gb(filesystem.total_bytes)), unit: Some("GB".to_string()), description: Some(format!("{}: {}", filesystem.mount_point, self.bytes_to_human_readable(filesystem.total_bytes))), - status: Status::Ok, + status: fs_status.clone(), timestamp, }); diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index bd55909..0cd0f7c 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard" -version = "0.1.117" +version = "0.1.118" edition = "2021" [dependencies] diff --git a/dashboard/src/ui/widgets/system.rs b/dashboard/src/ui/widgets/system.rs index 8eea131..52dc00d 100644 --- a/dashboard/src/ui/widgets/system.rs +++ b/dashboard/src/ui/widgets/system.rs @@ -180,7 +180,8 @@ impl SystemWidget { }); // Parse different metric types - if metric.name.contains("_usage_percent") { + if metric.name.contains("_usage_percent") && !metric.name.contains("_fs_") { + // Only use drive-level metrics for pool totals, not filesystem metrics if let MetricValue::Float(usage) = metric.value { pool.usage_percent = Some(usage); pool.status = metric.status.clone(); diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 8c46436..241d28a 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cm-dashboard-shared" -version = "0.1.117" +version = "0.1.118" edition = "2021" [dependencies]