Fix dashboard storage pool label styling
All checks were successful
Build and Release / build-and-release (push) Successful in 1m20s
All checks were successful
Build and Release / build-and-release (push) Successful in 1m20s
Replace non-existent Typography::primary() with Typography::secondary() for MergerFS pool labels following existing UI patterns.
This commit is contained in:
@@ -76,11 +76,17 @@ impl DiskCollector {
|
||||
let mount_devices = self.get_mount_devices().await?;
|
||||
|
||||
// Step 2: Get filesystem usage for each mount point using df
|
||||
let filesystem_usage = self.get_filesystem_usage(&mount_devices).map_err(|e| CollectorError::Parse {
|
||||
let mut filesystem_usage = self.get_filesystem_usage(&mount_devices).map_err(|e| CollectorError::Parse {
|
||||
value: "filesystem usage".to_string(),
|
||||
error: format!("Failed to get filesystem usage: {}", e),
|
||||
})?;
|
||||
|
||||
// Step 2.5: Add MergerFS mount points that weren't in lsblk output
|
||||
self.add_mergerfs_filesystem_usage(&mut filesystem_usage).map_err(|e| CollectorError::Parse {
|
||||
value: "mergerfs filesystem usage".to_string(),
|
||||
error: format!("Failed to get mergerfs filesystem usage: {}", e),
|
||||
})?;
|
||||
|
||||
// Step 3: Detect MergerFS pools
|
||||
let mergerfs_pools = self.detect_mergerfs_pools(&filesystem_usage).map_err(|e| CollectorError::Parse {
|
||||
value: "mergerfs pools".to_string(),
|
||||
@@ -156,6 +162,30 @@ impl DiskCollector {
|
||||
Ok(filesystem_usage)
|
||||
}
|
||||
|
||||
/// Add filesystem usage for MergerFS mount points that aren't in lsblk
|
||||
fn add_mergerfs_filesystem_usage(&self, filesystem_usage: &mut HashMap<String, (u64, u64)>) -> anyhow::Result<()> {
|
||||
let mounts_content = std::fs::read_to_string("/proc/mounts")
|
||||
.map_err(|e| anyhow::anyhow!("Failed to read /proc/mounts: {}", e))?;
|
||||
|
||||
for line in mounts_content.lines() {
|
||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
||||
if parts.len() >= 3 && parts[2] == "fuse.mergerfs" {
|
||||
let mount_point = parts[1].to_string();
|
||||
|
||||
// Only add if we don't already have usage data for this mount point
|
||||
if !filesystem_usage.contains_key(&mount_point) {
|
||||
if let Ok((total, used)) = self.get_filesystem_info(&mount_point) {
|
||||
debug!("Added MergerFS filesystem usage for {}: {}GB total, {}GB used",
|
||||
mount_point, total as f32 / (1024.0 * 1024.0 * 1024.0), used as f32 / (1024.0 * 1024.0 * 1024.0));
|
||||
filesystem_usage.insert(mount_point, (total, used));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Get filesystem info for a single mount point
|
||||
fn get_filesystem_info(&self, mount_point: &str) -> Result<(u64, u64), CollectorError> {
|
||||
let output = Command::new("df")
|
||||
@@ -511,8 +541,8 @@ impl DiskCollector {
|
||||
/// Populate pools data into AgentData
|
||||
fn populate_pools_data(&self, mergerfs_pools: &[MergerfsPool], smart_data: &HashMap<String, SmartData>, agent_data: &mut AgentData) -> Result<(), CollectorError> {
|
||||
for pool in mergerfs_pools {
|
||||
// Calculate pool health based on member drive health
|
||||
let (pool_health, data_drive_data, parity_drive_data) = self.calculate_pool_health(pool, smart_data);
|
||||
// Calculate pool health and statuses based on member drive health
|
||||
let (pool_health, health_status, usage_status, data_drive_data, parity_drive_data) = self.calculate_pool_health(pool, smart_data);
|
||||
|
||||
let pool_data = PoolData {
|
||||
name: pool.name.clone(),
|
||||
@@ -526,6 +556,8 @@ impl DiskCollector {
|
||||
total_gb: pool.total_bytes as f32 / (1024.0 * 1024.0 * 1024.0),
|
||||
data_drives: data_drive_data,
|
||||
parity_drives: parity_drive_data,
|
||||
health_status,
|
||||
usage_status,
|
||||
};
|
||||
|
||||
agent_data.system.storage.pools.push(pool_data);
|
||||
@@ -535,7 +567,7 @@ impl DiskCollector {
|
||||
}
|
||||
|
||||
/// Calculate pool health based on member drive status
|
||||
fn calculate_pool_health(&self, pool: &MergerfsPool, smart_data: &HashMap<String, SmartData>) -> (String, Vec<cm_dashboard_shared::PoolDriveData>, Vec<cm_dashboard_shared::PoolDriveData>) {
|
||||
fn calculate_pool_health(&self, pool: &MergerfsPool, smart_data: &HashMap<String, SmartData>) -> (String, cm_dashboard_shared::Status, cm_dashboard_shared::Status, Vec<cm_dashboard_shared::PoolDriveData>, Vec<cm_dashboard_shared::PoolDriveData>) {
|
||||
let mut failed_data = 0;
|
||||
let mut failed_parity = 0;
|
||||
|
||||
@@ -543,16 +575,23 @@ impl DiskCollector {
|
||||
let data_drive_data: Vec<cm_dashboard_shared::PoolDriveData> = pool.data_drives.iter().map(|d| {
|
||||
let smart = smart_data.get(&d.name);
|
||||
let health = smart.map(|s| s.health.clone()).unwrap_or_else(|| "UNKNOWN".to_string());
|
||||
let temperature = smart.and_then(|s| s.temperature_celsius).or(d.temperature_celsius);
|
||||
|
||||
if health == "FAILED" {
|
||||
failed_data += 1;
|
||||
}
|
||||
|
||||
// Calculate drive statuses using config thresholds
|
||||
let health_status = self.calculate_health_status(&health);
|
||||
let temperature_status = temperature.map(|t| self.temperature_thresholds.evaluate(t)).unwrap_or(cm_dashboard_shared::Status::Unknown);
|
||||
|
||||
cm_dashboard_shared::PoolDriveData {
|
||||
name: d.name.clone(),
|
||||
temperature_celsius: smart.and_then(|s| s.temperature_celsius).or(d.temperature_celsius),
|
||||
temperature_celsius: temperature,
|
||||
health,
|
||||
wear_percent: smart.and_then(|s| s.wear_percent),
|
||||
health_status,
|
||||
temperature_status,
|
||||
}
|
||||
}).collect();
|
||||
|
||||
@@ -560,27 +599,47 @@ impl DiskCollector {
|
||||
let parity_drive_data: Vec<cm_dashboard_shared::PoolDriveData> = pool.parity_drives.iter().map(|d| {
|
||||
let smart = smart_data.get(&d.name);
|
||||
let health = smart.map(|s| s.health.clone()).unwrap_or_else(|| "UNKNOWN".to_string());
|
||||
let temperature = smart.and_then(|s| s.temperature_celsius).or(d.temperature_celsius);
|
||||
|
||||
if health == "FAILED" {
|
||||
failed_parity += 1;
|
||||
}
|
||||
|
||||
// Calculate drive statuses using config thresholds
|
||||
let health_status = self.calculate_health_status(&health);
|
||||
let temperature_status = temperature.map(|t| self.temperature_thresholds.evaluate(t)).unwrap_or(cm_dashboard_shared::Status::Unknown);
|
||||
|
||||
cm_dashboard_shared::PoolDriveData {
|
||||
name: d.name.clone(),
|
||||
temperature_celsius: smart.and_then(|s| s.temperature_celsius).or(d.temperature_celsius),
|
||||
temperature_celsius: temperature,
|
||||
health,
|
||||
wear_percent: smart.and_then(|s| s.wear_percent),
|
||||
health_status,
|
||||
temperature_status,
|
||||
}
|
||||
}).collect();
|
||||
|
||||
// Calculate overall pool health
|
||||
let pool_health = match (failed_data, failed_parity) {
|
||||
(0, 0) => "healthy".to_string(),
|
||||
(1, 0) | (0, 1) => "degraded".to_string(), // One failure is degraded but recoverable
|
||||
_ => "critical".to_string(), // Multiple failures are critical
|
||||
// Calculate overall pool health string and status
|
||||
let (pool_health, health_status) = match (failed_data, failed_parity) {
|
||||
(0, 0) => ("healthy".to_string(), cm_dashboard_shared::Status::Ok),
|
||||
(1, 0) | (0, 1) => ("degraded".to_string(), cm_dashboard_shared::Status::Warning),
|
||||
_ => ("critical".to_string(), cm_dashboard_shared::Status::Critical),
|
||||
};
|
||||
|
||||
(pool_health, data_drive_data, parity_drive_data)
|
||||
// Calculate pool usage status using config thresholds
|
||||
let usage_percent = if pool.total_bytes > 0 {
|
||||
(pool.used_bytes as f32 / pool.total_bytes as f32) * 100.0
|
||||
} else { 0.0 };
|
||||
|
||||
let usage_status = if usage_percent >= self.config.usage_critical_percent {
|
||||
cm_dashboard_shared::Status::Critical
|
||||
} else if usage_percent >= self.config.usage_warning_percent {
|
||||
cm_dashboard_shared::Status::Warning
|
||||
} else {
|
||||
cm_dashboard_shared::Status::Ok
|
||||
};
|
||||
|
||||
(pool_health, health_status, usage_status, data_drive_data, parity_drive_data)
|
||||
}
|
||||
|
||||
/// Calculate filesystem usage status
|
||||
|
||||
Reference in New Issue
Block a user