anobre/openshift-resource-governance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: revert to working API endpoints while fixing batch processing configuration

Browse Source
This commit is contained in:
Anderson
2025-10-15 16:42:37 -03:00
parent cea7e2c0cd
commit 9faa4516f2
2 changed files with 50 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
app/static/index.html
View File

@@ -2006,161 +2006,81 @@
async function loadWorkloadScanner() { async function loadWorkloadScanner() {
try { try {
// Show fullscreen loading modal with batch processing info // Show fullscreen loading modal
showFullscreenLoading( showFullscreenLoading(
'Analyzing Cluster Resources', 'Analyzing Cluster Resources',
'Starting intelligent batch processing pipeline... Processing pods in batches of 100 for optimal performance.' 'Starting background analysis pipeline... This may take up to 2 minutes for large clusters.'
); );
// Start smart loading system // Start smart loading system
startSmartLoading(); startSmartLoading();
// Step 1: Get batch statistics first // Step 1: Start background cluster analysis
updateSmartProgress(0, 'Analyzing cluster size and calculating batch requirements...'); updateSmartProgress(0, 'Starting background cluster analysis...');
const statsResponse = await fetch('/api/v1/batch/statistics', { const analysisResponse = await fetch('/api/v1/tasks/cluster/analyze', {
method: 'GET',
headers: {
'Content-Type': 'application/json'
}
});
if (!statsResponse.ok) {
throw new Error(`HTTP error! status: ${statsResponse.status}`);
}
const statsData = await statsResponse.json();
const statsTaskId = statsData.task_id;
// Wait for statistics to complete
let statsCompleted = false;
let statsAttempts = 0;
const maxStatsAttempts = 30; // 30 seconds max for stats
while (!statsCompleted && statsAttempts < maxStatsAttempts) {
await new Promise(resolve => setTimeout(resolve, 1000));
statsAttempts++;
try {
const statsStatusResponse = await fetch(`/api/v1/batch/statistics/${statsTaskId}`);
if (!statsStatusResponse.ok) {
throw new Error(`HTTP error! status: ${statsStatusResponse.status}`);
}
const statsStatusData = await statsStatusResponse.json();
if (statsStatusData.status === 'success') {
statsCompleted = true;
const batchStats = statsStatusData.result.statistics;
updateSmartProgress(1, `Cluster analysis: ${batchStats.total_pods} pods in ${batchStats.total_batches} batches (${batchStats.batch_size} pods/batch)`);
// Step 2: Start batch processing
updateSmartProgress(2, 'Starting intelligent batch processing...');
const batchResponse = await fetch('/api/v1/batch/process', {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type': 'application/json' 'Content-Type': 'application/json'
}, }
body: JSON.stringify({
batch_size: batchStats.recommended_batch_size || 100,
include_system_namespaces: false
})
}); });
if (!batchResponse.ok) { if (!analysisResponse.ok) {
throw new Error(`HTTP error! status: ${batchResponse.status}`); throw new Error(`HTTP error! status: ${analysisResponse.status}`);
} }
const batchData = await batchResponse.json(); const analysisData = await analysisResponse.json();
const batchTaskId = batchData.task_id; const taskId = analysisData.task_id;
updateSmartProgress(3, 'Batch processing started, monitoring progress...'); updateSmartProgress(1, 'Background analysis started, monitoring progress...');
// Step 3: Monitor batch processing progress // Step 2: Monitor task progress
let batchCompleted = false; let taskCompleted = false;
let batchAttempts = 0; let attempts = 0;
const maxBatchAttempts = 300; // 5 minutes max for large clusters const maxAttempts = 120; // 2 minutes max
while (!batchCompleted && batchAttempts < maxBatchAttempts) { while (!taskCompleted && attempts < maxAttempts) {
await new Promise(resolve => setTimeout(resolve, 2000)); // Check every 2 seconds await new Promise(resolve => setTimeout(resolve, 1000)); // Wait 1 second
batchAttempts++; attempts++;
try { try {
const batchStatusResponse = await fetch(`/api/v1/batch/process/${batchTaskId}`); const statusResponse = await fetch(`/api/v1/tasks/${taskId}/status`);
if (!batchStatusResponse.ok) { if (!statusResponse.ok) {
throw new Error(`HTTP error! status: ${batchStatusResponse.status}`); throw new Error(`HTTP error! status: ${statusResponse.status}`);
} }
const batchStatusData = await batchStatusResponse.json(); const statusData = await statusResponse.json();
if (batchStatusData.status === 'progress') { if (statusData.state === 'PROGRESS') {
const meta = batchStatusData.meta; const progress = Math.round((statusData.current / statusData.total) * 100);
const progress = Math.round((meta.current / meta.total_batches) * 100); updateSmartProgress(progress, statusData.status);
const batchProgress = `Batch ${meta.batch_number}/${meta.total_batches} - ${meta.pods_processed}/${meta.total_pods} pods processed`; } else if (statusData.state === 'SUCCESS') {
const validationsFound = meta.validations_found || 0; updateSmartProgress(100, 'Analysis completed successfully!');
const recommendationsGenerated = meta.recommendations_generated || 0;
updateSmartProgress(progress, `${batchProgress} | ${validationsFound} validations found | ${recommendationsGenerated} recommendations generated`); // Update metrics cards with results
} else if (batchStatusData.status === 'success') { updateMetricsCards(statusData.result);
batchCompleted = true;
const result = batchStatusData.result;
updateSmartProgress(100, `Batch processing completed! ${result.total_validations} validations found, ${result.total_recommendations} recommendations generated`); // Load dashboard charts
updateSmartProgress(100, 'Loading dashboard charts...');
await loadDashboardCharts();
// Update metrics cards with batch results currentData = { cluster: statusData.result };
updateMetricsCards({ taskCompleted = true;
total_pods: result.total_pods,
total_namespaces: result.statistics.total_namespaces, } else if (statusData.state === 'FAILURE') {
total_nodes: 0, // Not provided in batch result throw new Error(`Analysis failed: ${statusData.error}`);
total_errors: result.total_errors,
total_warnings: result.total_validations,
overcommit: {
cpu_overcommit_percent: 0,
memory_overcommit_percent: 0,
namespaces_in_overcommit: 0,
resource_utilization: 0,
cpu_capacity: 0,
cpu_requests: 0,
memory_capacity: 0,
memory_requests: 0
} }
});
// Load validations using batch processing
await loadBatchValidations();
// Load charts with batch data
await loadCharts();
// Set current data for other functions
currentData = result;
console.log('Batch processing completed successfully:', result);
} else if (batchStatusData.status === 'error') {
throw new Error(`Batch processing failed: ${batchStatusData.error}`);
}
} catch (error) { } catch (error) {
console.error('Error checking batch status:', error); console.warn('Error checking task status:', error);
// Continue trying if (attempts >= maxAttempts) {
throw new Error('Analysis timeout - please try again');
}
} }
} }
if (!batchCompleted) { if (!taskCompleted) {
throw new Error('Batch processing timeout - process took too long'); throw new Error('Analysis timeout - please try again');
}
} else if (statsStatusData.status === 'error') {
throw new Error(`Statistics calculation failed: ${statsStatusData.error}`);
}
} catch (error) {
console.error('Error checking statistics status:', error);
// Continue trying
}
}
if (!statsCompleted) {
throw new Error('Statistics calculation timeout');
} }
// Hide loading modal // Hide loading modal
@@ -2184,24 +2104,16 @@
try { try {
showLoading('workloads-table-container'); showLoading('workloads-table-container');
// Use batch validations for better performance // Load validations (load all pages to ensure we get all namespaces)
const response = await fetch('/api/v1/batch/validations?page=1&page_size=100'); const validationsResponse = await fetch('/api/v1/validations?page=1&page_size=10000');
if (!response.ok) { const validationsData = await validationsResponse.json();
throw new Error(`HTTP error! status: ${response.status}`);
}
const data = await response.json();
console.log(`Loaded ${data.validations.length} validations using batch processing`);
// Update the table with batch data
updateValidationsTable(data.validations);
hideLoading('workloads-table-container'); hideLoading('workloads-table-container');
currentData = { validations: data.validations }; currentData = { validations: validationsData };
// Update workloads accordion // Update workloads accordion
updateWorkloadsTable(data.validations); updateWorkloadsTable(validationsData);
// Pre-load all workload details // Pre-load all workload details
await preloadAllWorkloadDetails(); await preloadAllWorkloadDetails();

2
app/tasks/cluster_analysis.py
View File

@@ -58,7 +58,7 @@ def analyze_cluster(self, cluster_config=None):
import os import os
# Get the API base URL from environment # Get the API base URL from environment
api_base_url = os.getenv('API_BASE_URL', 'http://localhost:8080') api_base_url = os.getenv('API_BASE_URL', 'http://resource-governance-service:8080')
try: try:
# Call the real cluster status API # Call the real cluster status API