Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-11-18 03:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-16 19:57:55 +02:00
parent 70a3d5af07
commit 598cbc4d11
2 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AppImage/components/storage-overview.tsx
View File

@@ -396,6 +396,16 @@ export function StorageOverview() {
const diskHealthBreakdown = getDiskHealthBreakdown()
const diskTypesBreakdown = getDiskTypesBreakdown()
const totalProxmoxUsed =
proxmoxStorage && proxmoxStorage.storage
? proxmoxStorage.storage
.filter((storage) => storage.total > 0 && storage.status.toLowerCase() === "active")
.reduce((sum, storage) => sum + storage.used, 0)
: 0
const usagePercent =
storageData.total > 0 ? ((totalProxmoxUsed / (storageData.total * 1024)) * 100).toFixed(2) : "0.00"
if (loading) {
return (
<div className="flex items-center justify-center h-64">
@@ -412,14 +422,6 @@ export function StorageOverview() {
)
}
const totalProxmoxUsed =
proxmoxStorage && proxmoxStorage.storage
? proxmoxStorage.storage.reduce((sum, storage) => sum + storage.used, 0)
: 0
const usagePercent =
storageData.total > 0 ? ((totalProxmoxUsed / (storageData.total * 1024)) * 100).toFixed(2) : "0.00"
return (
<div className="space-y-6">
{/* Storage Summary */}

28
AppImage/scripts/flask_server.py
View File

@@ -932,7 +932,6 @@ def get_smart_data(disk_name):
print(f"[v0] SSD Life Left (ID 231): {smart_data['ssd_life_left']}%")
elif attr_id == '241': # Total_LBAs_Written
# Convertir a GB (raw_value es en sectores de 512 bytes)
# Corrected the conversion for Total_LBAs_Written (ID 241)
try:
raw_int = int(raw_value.replace(',', ''))
total_gb = (raw_int * 512) / (1024 * 1024 * 1024)
@@ -1194,10 +1193,29 @@ def get_proxmox_storage():
name = parts[0]
storage_type = parts[1]
status = parts[2]
try:
total = int(parts[3])
used = int(parts[4])
available = int(parts[5])
percent = float(parts[6].rstrip('%')) if len(parts) > 6 else 0.0
except (ValueError, IndexError):
print(f"[v0] Skipping storage {name} - invalid numeric data")
continue
try:
percent = float(parts[6].rstrip('%')) if len(parts) > 6 and parts[6] != 'N/A' else 0.0
except (ValueError, IndexError):
percent = 0.0
# Si total es 0, significa que hay un error de conexión o el datastore no está disponible
if total == 0:
print(f"[v0] Skipping storage {name} - invalid data (total=0, likely connection error)")
continue
# Si el status es "inactive", también lo omitimos
if status.lower() == "inactive":
print(f"[v0] Skipping storage {name} - status is inactive")
continue
# Convert bytes to GB
total_gb = round(total / (1024**2), 2)
@@ -2922,7 +2940,7 @@ def get_network_hardware_info(pci_slot):
if width_match:
net_info['current_link_width'] = f"x{width_match.group(1)}"
# Get network interface name and status
# Get interface name and status
try:
result = subprocess.run(['ls', '/sys/class/net/'],
capture_output=True, text=True, timeout=5)
@@ -2959,8 +2977,6 @@ def get_network_hardware_info(pci_slot):
return net_info
# The get_gpu_info function is updated to include Matrox vendor detection
# and uses the new identify_gpu_type function.
def get_gpu_info():
"""Detect and return information about GPUs in the system"""
gpus = []
@@ -4628,7 +4644,7 @@ def api_hardware():
print(f"[v0] /api/hardware returning data")
print(f"[v0] - CPU: {formatted_data['cpu'].get('model', 'Unknown')}")
print(f"[v0] - Temperatures: {len(formatted_data['temperatures'])} sensors")
print(f"[v0] - Fans: {len(formatted_data['fans'])} fans") # Now includes IPMI fans
print(f"[v0] - Fans: {len(formatted_data['fans'])} fans") # Includes IPMI fans
print(f"[v0] - Power supplies: {len(formatted_data['power_supplies'])} PSUs")
print(f"[v0] - Power meter: {'Yes' if formatted_data['power_meter'] else 'No'}")
print(f"[v0] - UPS: {'Yes' if formatted_data['ups'] else 'No'}")