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

Remove legacy indexed disk metrics parsing

Browse Source 
Eliminate duplicate storage entries by removing old disk_count dependency.
Dashboard now uses pure auto-discovery of disk_{pool}_usage_percent metrics.
Fixes multiple storage instances (Storage 0, Storage 1, Storage root)
showing only proper tree structure format.
This commit is contained in:
Christoffer Martinsson 2025-10-22 21:27:11 +02:00
parent b1f294cf2f
commit 52d630a2e5
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
dashboard/src/ui/mod.rs
View File

@ -432,31 +432,6 @@ impl TuiApp {
} }
if let Some(ref hostname) = self.current_host { if let Some(ref hostname) = self.current_host {
// Get storage pool count (renamed from disk_count in new architecture)
let pool_count =
if let Some(count_metric) = metric_store.get_metric(hostname, "disk_count") {
count_metric.value.as_i64().unwrap_or(0) as usize
} else {
0
};
if pool_count == 0 {
// No storage pools found - show error/waiting message
let content_chunks = ratatui::layout::Layout::default()
.direction(Direction::Vertical)
.constraints([Constraint::Length(1), Constraint::Min(0)])
.split(area);
let storage_title = Paragraph::new("Storage:").style(Typography::widget_title());
frame.render_widget(storage_title, content_chunks[0]);
let no_storage_spans =
StatusIcons::create_status_spans(Status::Unknown, "No storage pools detected");
let no_storage_para = Paragraph::new(ratatui::text::Line::from(no_storage_spans));
frame.render_widget(no_storage_para, content_chunks[1]);
return;
}
// Discover storage pools from metrics (look for disk_{pool}_usage_percent patterns) // Discover storage pools from metrics (look for disk_{pool}_usage_percent patterns)
let mut storage_pools: std::collections::HashMap<String, Vec<String>> = let mut storage_pools: std::collections::HashMap<String, Vec<String>> =
std::collections::HashMap::new(); std::collections::HashMap::new();
@ -498,6 +473,24 @@ impl TuiApp {
} }
} }
// Check if we found any storage pools
if storage_pools.is_empty() {
// No storage pools found - show error/waiting message
let content_chunks = ratatui::layout::Layout::default()
.direction(Direction::Vertical)
.constraints([Constraint::Length(1), Constraint::Min(0)])
.split(area);
let storage_title = Paragraph::new("Storage:").style(Typography::widget_title());
frame.render_widget(storage_title, content_chunks[0]);
let no_storage_spans =
StatusIcons::create_status_spans(Status::Unknown, "No storage pools detected");
let no_storage_para = Paragraph::new(ratatui::text::Line::from(no_storage_spans));
frame.render_widget(no_storage_para, content_chunks[1]);
return;
}
let available_lines = area.height as usize; let available_lines = area.height as usize;
let mut constraints = Vec::new(); let mut constraints = Vec::new();
let mut pools_to_show = Vec::new(); let mut pools_to_show = Vec::new();
@ -507,19 +500,30 @@ impl TuiApp {
let mut sorted_pools: Vec<_> = storage_pools.iter().collect(); let mut sorted_pools: Vec<_> = storage_pools.iter().collect();
sorted_pools.sort_by_key(|(pool_name, _)| pool_name.as_str()); sorted_pools.sort_by_key(|(pool_name, _)| pool_name.as_str());
// Add section title if we have pools
let mut title_added = false;
for (pool_name, drives) in sorted_pools { for (pool_name, drives) in sorted_pools {
// Calculate lines needed: title + usage + 1 line per drive // Calculate lines needed: pool header + drives + usage line (+ section title if first)
let lines_for_this_pool = 2 + drives.len(); let section_title_lines = if !title_added { 1 } else { 0 };
let lines_for_this_pool = section_title_lines + 1 + drives.len() + 1;
if current_line + lines_for_this_pool <= available_lines { if current_line + lines_for_this_pool <= available_lines {
pools_to_show.push((pool_name.clone(), drives.clone())); pools_to_show.push((pool_name.clone(), drives.clone()));
// Add constraints for this pool // Add section title constraint if this is the first pool
constraints.push(Constraint::Length(1)); // Pool title if !title_added {
constraints.push(Constraint::Length(1)); // Pool usage line constraints.push(Constraint::Length(1)); // "Storage:" section title
for _ in 0..drives.len() { title_added = true;
constraints.push(Constraint::Length(1)); // Drive line (health/temp/wear)
} }
// Add constraints for this pool
constraints.push(Constraint::Length(1)); // Pool header with status
for _ in 0..drives.len() {
constraints.push(Constraint::Length(1)); // Drive line with tree symbol
}
constraints.push(Constraint::Length(1)); // Usage line with end tree symbol
current_line += lines_for_this_pool; current_line += lines_for_this_pool;
} else { } else {
break; // Can't fit more pools break; // Can't fit more pools
@ -538,6 +542,13 @@ impl TuiApp {
let mut chunk_index = 0; let mut chunk_index = 0;
// Render "Storage:" section title if we have pools
if !pools_to_show.is_empty() {
let storage_title = Paragraph::new("Storage:").style(Typography::widget_title());
frame.render_widget(storage_title, content_chunks[chunk_index]);
chunk_index += 1;
}
// Display each storage pool with tree structure // Display each storage pool with tree structure
for (pool_name, drives) in &pools_to_show { for (pool_name, drives) in &pools_to_show {
// Pool header with status icon and type // Pool header with status icon and type
@ -558,7 +569,7 @@ impl TuiApp {
// Create pool header with status icon // Create pool header with status icon
let pool_status_icon = StatusIcons::get_icon(pool_status); let pool_status_icon = StatusIcons::get_icon(pool_status);
let pool_status_color = Theme::status_color(pool_status); let pool_status_color = Theme::status_color(pool_status);
let pool_header_text = format!("Storage {} ({}):", pool_display_name, pool_type); let pool_header_text = format!("{} ({}):", pool_display_name, pool_type);
let pool_header_spans = vec![ let pool_header_spans = vec![
ratatui::text::Span::styled( ratatui::text::Span::styled(