gsadmin/pulse
1
0
Fork 0
mirror of https://github.com/rcourtman/Pulse.git synced 2026-09-22 19:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(storage): Ensure PVE storage data is correctly aggregated

Browse Source
This commit is contained in:
courtmanr@gmail.com
2025-04-27 19:47:43 +01:00
parent d4e20dddee
commit 4668477bcd
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/index.js
+4 -10
View File
@@ -380,14 +380,7 @@ app.get('/api/storage', async (req, res) => {
// Transform currentNodes into the format expected by updateStorageInfo
const storageInfoByNode = {};
(currentNodes || []).forEach(node => {
// Assuming storage details are fetched and stored within the node object
// during the discovery cycle. Need to find where Proxmox stores this.
// Use the `storage` property added by the updated `fetchDataForNode` function
storageInfoByNode[node.node] = node.storage || []; // Use node name as key
if (!node.storage) {
// This warning should ideally not appear now unless the storage fetch itself failed
console.warn(`[API /api/storage] No storage data found for node: ${node.node}. Sending empty array.`);
}
});
res.json(storageInfoByNode); // Return the transformed object
} catch (error) {
@@ -726,7 +719,7 @@ async function fetchDiscoveryData() {
}
});
console.log(`[Discovery Cycle - ${endpointName}] Completed. Found: ${endpointNodes.length} nodes, ${endpointVms.length} VMs, ${endpointContainers.length} containers.`);
// Return combined results for this endpoint
// Return combined results for this endpoint, including the enriched endpointNodes
return { endpointId: endpointName, status: 'fulfilled', value: { nodes: endpointNodes, vms: endpointVms, containers: endpointContainers } };
} catch (error) {
const status = error.response?.status ? ` (Status: ${error.response.status})` : '';
@@ -744,10 +737,11 @@ async function fetchDiscoveryData() {
pveOutcomes.forEach(endpointOutcome => {
if (endpointOutcome.status === 'fulfilled' && endpointOutcome.value.status === 'fulfilled' && endpointOutcome.value.value) {
// Successfully fetched data for this endpoint
const { nodes, vms, containers } = endpointOutcome.value.value;
// Destructure the correct node array which includes storage data
const { nodes: endpointNodesWithStorage, vms, containers } = endpointOutcome.value.value;
const successfulEndpointId = endpointOutcome.value.endpointId; // Use the returned endpointId/name
// console.log(`[Discovery Cycle] Accumulating data from endpoint: ${successfulEndpointId}`); // Debug log
tempNodes.push(...nodes);
tempNodes.push(...endpointNodesWithStorage); // Push the nodes that have storage attached
tempVms.push(...vms);
tempContainers.push(...containers);
} else {