`;
return row;
}
@@ -1362,7 +1449,7 @@ document.addEventListener('DOMContentLoaded', function() {
const filterAllRadio = document.getElementById('filter-all');
if(filterAllRadio) filterAllRadio.checked = true;
- filterGuestType = 'all';
+ // REMOVED: filterGuestType = 'all';
const statusAllRadio = document.getElementById('filter-status-all');
if(statusAllRadio) statusAllRadio.checked = true;
@@ -1370,6 +1457,22 @@ document.addEventListener('DOMContentLoaded', function() {
updateDashboardTable();
if (searchInput) searchInput.blur(); // Blur search input after reset
+
+ // ---> ADDED: Reset Backups Tab Filters <---\
+ // const backupTypeAllRadio = document.getElementById('backups-filter-type-all'); // REMOVED
+ // if(backupTypeAllRadio) backupTypeAllRadio.checked = true; // REMOVED
+ // backupsFilterType = 'all'; // REMOVED
+
+ // ---> MODIFIED: Reset Backups Health Filter <---
+ const backupStatusAllRadio = document.getElementById('backups-filter-status-all');
+ if(backupStatusAllRadio) backupStatusAllRadio.checked = true;
+ backupsFilterHealth = 'all';
+ // ---> END MODIFIED <---
+
+ // Reset Type filter for main dashboard
+ const typeAllRadio = document.getElementById('filter-all');
+ if(typeAllRadio) typeAllRadio.checked = true;
+ filterGuestType = 'all';
}
// --- Reset Filters/Sort Listener ---
@@ -1432,6 +1535,9 @@ document.addEventListener('DOMContentLoaded', function() {
// ---> CHANGE: Pass pbsDataArray
// updatePbsInfo(pbsData);
updatePbsInfo(pbsDataArray);
+ // ---> ADDED: Call backup tab update
+ updateBackupsTab();
+ // ---> END ADDED
// <--- END CHANGE
}
@@ -2092,4 +2198,269 @@ document.addEventListener('DOMContentLoaded', function() {
}
// --- End PBS Task Table Toggle Listener ---
+ // --- NEW: Backups Tab Logic ---
+ function updateBackupsTab() {
+ // console.log("[Backups Tab] Updating..."); // Debug log
+ const container = document.getElementById('backups-overview-container');
+ const tableContainer = document.getElementById('backups-table-container');
+ const tableBody = document.getElementById('backups-overview-tbody');
+ const loadingMsg = document.getElementById('backups-loading-message');
+ const noDataMsg = document.getElementById('backups-no-data-message');
+
+ if (!container || !tableContainer || !tableBody || !loadingMsg || !noDataMsg) {
+ console.error("UI elements for Backups tab not found!");
+ return;
+ }
+
+ // Combine VMs and Containers into a single list of guests
+ const allGuests = [
+ ...(vmsData || []),
+ ...(containersData || [])
+ ];
+ // console.log("[Backups Tab DEBUG] All Guests:", JSON.stringify(allGuests.slice(0, 5))); // Log first 5 guests
+
+ // Check if we have guest data and PBS data (even if empty array)
+ if (!initialDataReceived || !pbsDataArray) {
+ // Still loading initial data
+ loadingMsg.classList.remove('hidden');
+ tableContainer.classList.add('hidden');
+ noDataMsg.classList.add('hidden');
+ return;
+ }
+
+ if (allGuests.length === 0) {
+ // No guests found from PVE
+ loadingMsg.classList.add('hidden');
+ tableContainer.classList.add('hidden');
+ noDataMsg.textContent = "No Proxmox guests (VMs/Containers) found.";
+ noDataMsg.classList.remove('hidden');
+ return;
+ }
+
+ // ---> REWRITTEN: Data Processing Logic for Backup Health <---
+ const backupStatusByGuest = [];
+ const now = Math.floor(Date.now() / 1000);
+ const sevenDaysAgo = now - (7 * 24 * 60 * 60);
+ const threeDaysAgo = now - (3 * 24 * 60 * 60);
+
+ // 1. Combine all recent backup tasks from all PBS instances
+ const allRecentBackupTasks = (pbsDataArray || []).flatMap(pbs =>
+ (pbs.backupTasks?.recentTasks || []).map(task => ({ // Ensure recentTasks exists
+ ...task,
+ // Attempt to extract guest ID and type from the task ID (e.g., "vm/101", "ct/102")
+ guestId: task.id?.split('/')[1] || null,
+ guestTypePbs: task.id?.split('/')[0] || null, // vm or ct
+ pbsInstanceName: pbs.pbsInstanceName // Add instance name for reference
+ }))
+ );
+
+ // 2. Flatten snapshots (as before, for total count and latest timestamp fallback)
+ const allSnapshots = (pbsDataArray || []).flatMap(pbsInstance =>
+ (pbsInstance.datastores || []).flatMap(ds =>
+ (ds.snapshots || []).map(snap => ({
+ ...snap,
+ pbsInstanceName: pbsInstance.pbsInstanceName,
+ datastoreName: ds.name,
+ backupType: snap['backup-type'],
+ backupVMID: snap['backup-id']
+ }))
+ )
+ );
+
+ // 3. Process each PVE guest
+ allGuests.forEach(guest => {
+ const guestId = String(guest.vmid);
+ const guestTypePve = guest.type === 'qemu' ? 'vm' : 'ct';
+
+ // Find snapshots for this guest
+ const guestSnapshots = allSnapshots.filter(snap =>
+ String(snap.backupVMID) === guestId && snap.backupType === guestTypePve
+ );
+ const totalBackups = guestSnapshots.length;
+ const latestSnapshot = guestSnapshots.reduce((latest, snap) => {
+ return (!latest || (snap['backup-time'] && snap['backup-time'] > latest['backup-time'])) ? snap : latest;
+ }, null);
+ const latestSnapshotTime = latestSnapshot ? latestSnapshot['backup-time'] : null;
+
+ // Find the latest backup task for this guest
+ const guestTasks = allRecentBackupTasks.filter(task =>
+ task.guestId === guestId && task.guestTypePbs === guestTypePve
+ );
+ const latestTask = guestTasks.reduce((latest, task) => {
+ return (!latest || (task.startTime && task.startTime > latest.startTime)) ? task : latest;
+ }, null);
+
+ // Determine Backup Health Status
+ let healthStatus = 'none';
+ let displayTimestamp = latestSnapshotTime; // Default to snapshot time
+
+ if (latestTask) {
+ displayTimestamp = latestTask.startTime; // Prefer task start time if available
+ if (latestTask.status === 'OK') {
+ if (latestTask.startTime >= threeDaysAgo) {
+ healthStatus = 'ok';
+ } else if (latestTask.startTime >= sevenDaysAgo) {
+ healthStatus = 'stale'; // Successful but 3-7 days old
+ } else {
+ healthStatus = 'old'; // Successful but > 7 days old
+ }
+ } else {
+ // Any non-OK status for the latest task marks it as failed
+ healthStatus = 'failed';
+ }
+ } else if (latestSnapshotTime) {
+ // No recent tasks found, rely on snapshot age
+ if (latestSnapshotTime >= threeDaysAgo) {
+ healthStatus = 'stale'; // Treat as stale if no recent task, even if snapshot < 3d
+ } else if (latestSnapshotTime >= sevenDaysAgo) {
+ healthStatus = 'stale'; // Also stale if 3-7d old snapshot, no task
+ } else {
+ healthStatus = 'old'; // Treat as old if snapshot > 7d, no task
+ }
+ } else {
+ // No tasks and no snapshots
+ healthStatus = 'none';
+ displayTimestamp = null; // Ensure no timestamp shown
+ }
+
+ backupStatusByGuest.push({
+ guestName: guest.name || `Guest ${guest.vmid}`,
+ guestId: guest.vmid,
+ guestType: guest.type === 'qemu' ? 'VM' : 'LXC',
+ node: guest.node,
+ guestPveStatus: guest.status, // Add the PVE status here
+ latestBackupTime: displayTimestamp, // Use determined display timestamp
+ pbsInstanceName: latestSnapshot?.pbsInstanceName || latestTask?.pbsInstanceName || 'N/A',
+ datastoreName: latestSnapshot?.datastoreName || 'N/A', // Only snapshots know datastore
+ totalBackups: totalBackups,
+ backupHealthStatus: healthStatus // Store the calculated health
+ });
+ });
+ // ---> END REWRITTEN Data Processing Logic <---
+
+ // console.log("[Backups Tab] Processed Guest Status with Health:", backupStatusByGuest); // Debug log
+
+ // ---> MODIFIED: Filter the data based on health status <---
+ const filteredBackupStatus = backupStatusByGuest.filter(item => {
+ // Check Health Filter
+ const healthMatch = (backupsFilterHealth === 'all') ||
+ (backupsFilterHealth === 'ok' && (item.backupHealthStatus === 'ok' || item.backupHealthStatus === 'stale')) || // OK includes Stale for filtering
+ (backupsFilterHealth === 'warning' && (item.backupHealthStatus === 'old')) || // Warning = Old
+ (backupsFilterHealth === 'error' && item.backupHealthStatus === 'failed') || // Error = Failed
+ (backupsFilterHealth === 'none' && item.backupHealthStatus === 'none');
+ if (!healthMatch) return false;
+
+ // If all checks pass, include the item
+ return true;
+ });
+ // ---> END MODIFIED <---
+
+ // ---> MODIFIED: Sort the *filtered* data <---
+ const sortedBackupStatus = sortData(filteredBackupStatus, sortState.backups.column, sortState.backups.direction, 'backups');
+ // ---> END MODIFIED <---
+
+ // Populate the table
+ tableBody.innerHTML = ''; // Clear previous content
+ // ---> MODIFIED: Use filtered and sorted data <---
+ if (sortedBackupStatus.length > 0) {
+ sortedBackupStatus.forEach(guestStatus => {
+ // ---> END MODIFIED < ---
+ const row = tableBody.insertRow();
+ // ---> MODIFIED: Add dashboard hover/transition classes < ---
+ // Conditionally add opacity and grayscale if the guest PVE status is 'stopped'
+ row.className = `transition-all duration-150 ease-out hover:bg-gray-100 dark:hover:bg-gray-700 hover:shadow-md hover:-translate-y-px ${guestStatus.guestPveStatus === 'stopped' ? 'opacity-60 grayscale' : ''}`;
+
+ const latestBackupFormatted = guestStatus.latestBackupTime
+ ? formatPbsTimestamp(guestStatus.latestBackupTime)
+ : 'No backups found';
+
+ // Determine the color class based on the latest backup time
+ // ---> ADDED: Determine color/icon based on HEALTH status <---
+ let healthIndicator = '';
+ switch (guestStatus.backupHealthStatus) {
+ case 'ok':
+ healthIndicator = '●';
+ break;
+ case 'stale':
+ healthIndicator = '●';
+ break;
+ case 'failed':
+ healthIndicator = '✖';
+ break;
+ case 'old':
+ healthIndicator = '●';
+ break;
+ case 'none':
+ healthIndicator = '-';
+ break;
+ }
+ // ---> END ADDED <---
+
+ // --- Generate Type Icon ---
+ const typeIconClass = guestStatus.guestType === 'VM'
+ ? 'vm-icon bg-blue-100 dark:bg-blue-900/50 text-blue-700 dark:text-blue-300 px-1.5 py-0.5 font-medium'
+ : 'ct-icon bg-green-100 dark:bg-green-900/50 text-green-700 dark:text-green-300 px-1.5 py-0.5 font-medium';
+ const typeIcon = `${guestStatus.guestType}`;
+ // --- End Type Icon ---
+
+ // ---> MODIFIED: Standardize padding, alignment, and text styles, ADD health indicator < ---
+ row.innerHTML = `
+
${healthIndicator}
+
${guestStatus.guestName}
+
${guestStatus.guestId}
+
${typeIcon}
+
${guestStatus.node}
+
${latestBackupFormatted}
+
${guestStatus.pbsInstanceName}
+
${guestStatus.datastoreName}
+
${guestStatus.totalBackups}
+ `;
+ // ---> END MODIFIED < ---
+ });
+
+ loadingMsg.classList.add('hidden');
+ noDataMsg.classList.add('hidden');
+ tableContainer.classList.remove('hidden'); // Show the table
+ } else {
+ // This case should technically be covered by the initial checks, but added for safety
+ loadingMsg.classList.add('hidden');
+ tableContainer.classList.add('hidden');
+ // ---> MODIFIED: Clearer message if no backups/guests OR if filters cause empty state <---
+ let emptyMessage = "No backup information found for any guests.";
+ if (backupStatusByGuest.length === 0) { // Check original data length before filtering
+ if (allGuests.length === 0) {
+ emptyMessage = "No Proxmox guests (VMs/Containers) found.";
+ } else {
+ emptyMessage = "No backup information found for any guests.";
+ }
+ }
+ // ---> MODIFIED: Use filtered data length for empty message check and improve wording <---
+ else if (filteredBackupStatus.length === 0) { // Check filtered data length
+ const typeFilterText = backupsFilterType === 'all' ? '' : `Type: ${backupsFilterType.toUpperCase()}`;
+ // ---> MODIFIED: Map health filter value to labels for message <---
+ // let statusFilterLabel = '';
+ // switch (backupsFilterHealth) { ... }
+ // const statusFilterText = backupsFilterHealth === 'all' ? '' : `Status: ${statusFilterLabel}`;
+ const filtersApplied = [typeFilterText].filter(Boolean).join(', '); // Only include type filter
+
+ if (filtersApplied) {
+ emptyMessage = `No guests found matching the selected filters (${filtersApplied}).`;
+ } else {
+ // This case shouldn't normally happen if backupStatusByGuest was not empty, but good to have a fallback
+ emptyMessage = "No guests with backup information found.";
+ }
+ }
+ // ---> END MODIFIED < ---
+ noDataMsg.textContent = emptyMessage;
+ // ---> END MODIFIED < ---
+ noDataMsg.classList.remove('hidden');
+ }
+ // ---> ADDED: Update sort UI for backups table < ---
+ const backupsSortColumn = sortState.backups.column;
+ const backupsHeader = document.querySelector(`#backups-overview-table th[data-sort="${backupsSortColumn}"]`);
+ updateSortUI('backups-overview-table', backupsHeader);
+ // ---> END ADDED < ---
+ }
+ // --- END: Backups Tab Logic ---
+
}); // End DOMContentLoaded
\ No newline at end of file
diff --git a/src/public/index.html b/src/public/index.html
index c700b2bd7..ad50fa1a0 100644
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -80,6 +80,11 @@
Storage
+
+
+
+ Backups
+
@@ -219,7 +224,7 @@
-
Proxmox Backup Server Status
+
Proxmox Backup Server Status
Loading PBS data...
@@ -229,11 +234,58 @@
+
+
+
Guest Backup Status
+
+
+
Loading backup status overview...
+
+
+
+
+
+
+
+
+
+
+
Guest Name
+
ID
+
Type
+
Node
+
Latest Backup
+
PBS Instance
+
Datastore
+
# Backups
+
+
+
+
+
+
+
No Proxmox guests found or no PBS backup data available.