update virtual-machines.tsx

This commit is contained in:
MacRimi
2026-04-05 11:51:26 +02:00
parent 5826b0419b
commit e9851da12f
6 changed files with 59 additions and 29 deletions

View File

@@ -621,7 +621,8 @@ const handleDownloadLogs = async (vmid: number, vmName: string) => {
}
}
const safeVMData = vmData || []
// Ensure vmData is always an array (backend may return object on error)
const safeVMData = Array.isArray(vmData) ? vmData : []
// Total allocated RAM for ALL VMs/LXCs (running + stopped)
const totalAllocatedMemoryGB = useMemo(() => {

View File

@@ -953,7 +953,7 @@ def proxmox_webhook():
return jsonify({'accepted': False, 'error': 'internal_error', 'detail': str(e)}), 200
# ─── Internal Shutdown Event Endpoint ────────────<EFBFBD><EFBFBD><EFBFBD>────────────────
# ─── Internal Shutdown Event Endpoint ────────────────────────────
@notification_bp.route('/api/internal/shutdown-event', methods=['POST'])
def internal_shutdown_event():

View File

@@ -3534,24 +3534,18 @@ def get_proxmox_vms():
return all_vms
else:
return {
'error': 'pvesh command not available or failed',
'vms': []
}
# Return empty array instead of error object - frontend expects array
return []
except Exception as e:
# print(f"[v0] Error getting VM/LXC info: {e}")
pass
return {
'error': 'Unable to access VM information: {str(e)}',
'vms': []
}
# Return empty array instead of error object - frontend expects array
return []
except Exception as e:
# print(f"Error getting VM info: {e}")
pass
return {
'error': f'Unable to access VM information: {str(e)}',
'vms': []
}
# Return empty array instead of error object - frontend expects array
return []
def get_ipmi_fans():
"""Get fan information from IPMI"""

View File

@@ -2618,6 +2618,28 @@ class HealthMonitor:
return True
return False
def _is_vm_running(self, vmid: str) -> bool:
"""Check if a VM or CT is currently running."""
import subprocess
try:
# Check VM status
result = subprocess.run(
['qm', 'status', vmid],
capture_output=True, text=True, timeout=2
)
if result.returncode == 0 and 'running' in result.stdout.lower():
return True
# Check CT status
result = subprocess.run(
['pct', 'status', vmid],
capture_output=True, text=True, timeout=2
)
if result.returncode == 0 and 'running' in result.stdout.lower():
return True
except Exception:
pass
return False
def _check_vms_cts_optimized(self) -> Dict[str, Any]:
"""
Optimized VM/CT check - detects qmp failures and startup errors from logs.
@@ -2658,6 +2680,12 @@ class HealthMonitor:
# Skip if VM no longer exists (stale journal entry)
if not self._vm_ct_exists(vmid):
continue
# Skip if VM is now running - the QMP error is stale/resolved
# This prevents re-detecting old journal entries after VM recovery
if self._is_vm_running(vmid):
# Auto-resolve any existing error for this VM
health_persistence.check_vm_running(vmid)
continue
vm_name = self._resolve_vm_name(vmid)
display = f"VM {vmid} ({vm_name})" if vm_name else f"VM {vmid}"
key = f'vm_{vmid}'
@@ -2835,18 +2863,25 @@ class HealthMonitor:
for line in journalctl_output.split('\n'):
line_lower = line.lower()
# VM QMP errors (skip during active backup -- normal behavior)
vm_qmp_match = re.search(r'vm\s+(\d+)\s+qmp\s+command.*(?:failed|unable|timeout)', line_lower)
if vm_qmp_match:
if _vzdump_running:
continue # Normal during backup
vmid = vm_qmp_match.group(1)
# Skip if VM no longer exists (deleted after error occurred)
if not self._vm_ct_exists(vmid):
continue
vm_name = self._resolve_vm_name(vmid)
# VM QMP errors (skip during active backup -- normal behavior)
vm_qmp_match = re.search(r'vm\s+(\d+)\s+qmp\s+command.*(?:failed|unable|timeout)', line_lower)
if vm_qmp_match:
if _vzdump_running:
continue # Normal during backup
vmid = vm_qmp_match.group(1)
# Skip if VM no longer exists (deleted after error occurred)
if not self._vm_ct_exists(vmid):
continue
# Skip if VM is now running - the QMP error is stale/resolved
# This prevents re-detecting old journal entries after VM recovery
if self._is_vm_running(vmid):
# Auto-resolve any existing error for this VM
health_persistence.check_vm_running(vmid)
continue
vm_name = self._resolve_vm_name(vmid)
display = f"VM {vmid} ({vm_name})" if vm_name else f"VM {vmid}"
error_key = f'vm_{vmid}'
if error_key not in vm_details:

View File

@@ -620,7 +620,7 @@ class EmailChannel(NotificationChannel):
<td colspan="2" style="padding:8px 12px;font-size:13px;color:#1f2937;border-bottom:1px solid #e5e7eb;">{value}</td>
</tr>'''
# ── Reason / details block (long text, displayed separately) <EFBFBD><EFBFBD><EFBFBD>
# ── Reason / details block (long text, displayed separately)
reason = data.get('reason', '')
reason_html = ''
if reason and len(reason) > 80:

View File

@@ -557,7 +557,7 @@ test_vmct() {
test_system() {
header "SYSTEM EVENT TESTS (syslog injection)"
# ─ Test S1: Authentication failures ──
# <EFBFBD><EFBFBD>─ Test S1: Authentication failures ──
log ""
log "${BOLD} Test S1: SSH auth failure injection${NC}"
info "Injecting SSH auth failure messages into syslog."
@@ -684,7 +684,7 @@ show_menu() {
echo -ne " Select: "
}
# ── Main ──────<EFBFBD><EFBFBD><EFBFBD>─────────────────────────────────────────────────
# ── Main ───────────────────────────────────────────────────────
main() {
local mode="${1:-menu}"