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 flask_server.py

Browse Source
This commit is contained in:
MacRimi
2025-10-16 19:34:45 +02:00
parent 9cabb1afbd
commit 70a3d5af07
1 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
AppImage/scripts/flask_server.py
View File

@@ -664,24 +664,13 @@ def get_storage_info():
print(f"Error accessing partition {partition.device}: {e}") print(f"Error accessing partition {partition.device}: {e}")
continue continue
print(f"[v0] Starting ZFS pool detection...")
try: try:
result = subprocess.run(['zpool', 'list', '-H', '-p', '-o', 'name,size,alloc,free,health'], result = subprocess.run(['zpool', 'list', '-H', '-p', '-o', 'name,size,alloc,free,health'],
capture_output=True, text=True, timeout=5) capture_output=True, text=True, timeout=5)
print(f"[v0] zpool list return code: {result.returncode}")
print(f"[v0] zpool list stdout: {result.stdout}")
print(f"[v0] zpool list stderr: {result.stderr}")
if result.returncode == 0: if result.returncode == 0:
lines = result.stdout.strip().split('\n') for line in result.stdout.strip().split('\n'):
print(f"[v0] Found {len(lines)} ZFS pool(s)")
for line in lines:
if line: if line:
parts = line.split('\t') parts = line.split('\t')
print(f"[v0] Processing ZFS line: {line}")
print(f"[v0] Split into {len(parts)} parts: {parts}")
if len(parts) >= 5: if len(parts) >= 5:
pool_name = parts[0] pool_name = parts[0]
pool_size_bytes = int(parts[1]) pool_size_bytes = int(parts[1])
@@ -689,18 +678,11 @@ def get_storage_info():
pool_free_bytes = int(parts[3]) pool_free_bytes = int(parts[3])
pool_health = parts[4] pool_health = parts[4]
print(f"[v0] ZFS Pool {pool_name}:")
print(f"[v0] - Size: {pool_size_bytes} bytes ({pool_size_bytes / (1024**3):.2f}GB)")
print(f"[v0] - Allocated: {pool_alloc_bytes} bytes ({pool_alloc_bytes / (1024**3):.2f}GB)")
print(f"[v0] - Free: {pool_free_bytes} bytes ({pool_free_bytes / (1024**3):.2f}GB)")
print(f"[v0] - Health: {pool_health}")
print(f"[v0] Adding {pool_alloc_bytes} bytes to total_used (before: {total_used})")
total_used += pool_alloc_bytes total_used += pool_alloc_bytes
print(f"[v0] total_used after adding ZFS: {total_used} bytes ({total_used / (1024**3):.2f}GB)")
total_available += pool_free_bytes total_available += pool_free_bytes
print(f"[v0] ZFS Pool {pool_name}: allocated={pool_alloc_bytes / (1024**3):.2f}GB, free={pool_free_bytes / (1024**3):.2f}GB")
def format_zfs_size(size_bytes): def format_zfs_size(size_bytes):
size_tb = size_bytes / (1024**4) size_tb = size_bytes / (1024**4)
size_gb = size_bytes / (1024**3) size_gb = size_bytes / (1024**3)
@@ -717,7 +699,6 @@ def get_storage_info():
'health': pool_health 'health': pool_health
} }
storage_data['zfs_pools'].append(pool_info) storage_data['zfs_pools'].append(pool_info)
print(f"[v0] Added pool info to storage_data: {pool_info}")
try: try:
pool_status = subprocess.run(['zpool', 'status', pool_name], pool_status = subprocess.run(['zpool', 'status', pool_name],
@@ -728,24 +709,16 @@ def get_storage_info():
if disk_name in status_line: if disk_name in status_line:
zfs_disks.add(disk_name) zfs_disks.add(disk_name)
except Exception as e: except Exception as e:
print(f"[v0] Error getting ZFS pool status for {pool_name}: {e}") print(f"Error getting ZFS pool status for {pool_name}: {e}")
else:
print(f"[v0] WARNING: ZFS line has less than 5 parts, skipping: {line}")
else:
print(f"[v0] zpool list command failed with return code {result.returncode}")
except FileNotFoundError: except FileNotFoundError:
print("[v0] Note: ZFS not installed (zpool command not found)") print("[v0] Note: ZFS not installed")
except Exception as e: except Exception as e:
print(f"[v0] Error running zpool list: {e}") print(f"[v0] Note: ZFS not available or no pools: {e}")
import traceback
print(f"[v0] Traceback: {traceback.format_exc()}")
print(f"[v0] Final total_used before conversion: {total_used} bytes ({total_used / (1024**3):.2f}GB)")
storage_data['used'] = round(total_used / (1024**3), 1) storage_data['used'] = round(total_used / (1024**3), 1)
storage_data['available'] = round(total_available / (1024**3), 1) storage_data['available'] = round(total_available / (1024**3), 1)
print(f"[v0] Final storage_data['used']: {storage_data['used']}GB")
print(f"[v0] Total storage used: {storage_data['used']}GB (including ZFS pools)") print(f"[v0] Total storage used: {storage_data['used']}GB (including ZFS pools)")
except Exception as e: except Exception as e:
@@ -959,6 +932,7 @@ def get_smart_data(disk_name):
print(f"[v0] SSD Life Left (ID 231): {smart_data['ssd_life_left']}%") print(f"[v0] SSD Life Left (ID 231): {smart_data['ssd_life_left']}%")
elif attr_id == '241': # Total_LBAs_Written elif attr_id == '241': # Total_LBAs_Written
# Convertir a GB (raw_value es en sectores de 512 bytes) # Convertir a GB (raw_value es en sectores de 512 bytes)
# Corrected the conversion for Total_LBAs_Written (ID 241)
try: try:
raw_int = int(raw_value.replace(',', '')) raw_int = int(raw_value.replace(',', ''))
total_gb = (raw_int * 512) / (1024 * 1024 * 1024) total_gb = (raw_int * 512) / (1024 * 1024 * 1024)
@@ -2139,8 +2113,6 @@ def get_detailed_gpu_info(gpu):
break break
except json.JSONDecodeError: except json.JSONDecodeError:
pass pass
except Exception as e: # Catch any other JSON processing errors
print(f"[v0] Error processing JSON object: {e}", flush=True)
buffer = "" buffer = ""
in_json = False in_json = False
elif in_json: elif in_json:
@@ -2635,7 +2607,7 @@ def get_detailed_gpu_info(gpu):
mem_clock = clocks['GFX_MCLK'] mem_clock = clocks['GFX_MCLK']
if 'value' in mem_clock: if 'value' in mem_clock:
detailed_info['clock_memory'] = f"{mem_clock['value']} MHz" detailed_info['clock_memory'] = f"{mem_clock['value']} MHz"
print(f"[v0] Memory Clock: {detailed_info['clock_memory']}", flush=True) print(f"[v0] Memory Clock: {detailed_info['clock_memory']} MHz", flush=True)
data_retrieved = True data_retrieved = True
# Parse GPU activity (gpu_activity.GFX) # Parse GPU activity (gpu_activity.GFX)
@@ -3599,8 +3571,8 @@ def get_hardware_info():
}) })
print(f"[v0] Fan sensor: {identified_name} ({sensor_name}) = {fan_speed} RPM") print(f"[v0] Fan sensor: {identified_name} ({sensor_name}) = {fan_speed} RPM")
hardware_data['sensors']['fans'].extend(fans) hardware_data['sensors']['fans'] = fans
print(f"[v0] Found {len(fans)} fan sensor(s) from sensors command") print(f"[v0] Found {len(fans)} fan sensor(s)")
except Exception as e: except Exception as e:
print(f"[v0] Error getting fan info: {e}") print(f"[v0] Error getting fan info: {e}")
except Exception as e: except Exception as e:
@@ -4046,7 +4018,7 @@ def api_notifications_download():
@app.route('/api/backups', methods=['GET']) @app.route('/api/backups', methods=['GET'])
def api_backups(): def api_backups():
"""Get list of backup files from Proxmox storage""" """Get list of all backup files from Proxmox storage"""
try: try:
backups = [] backups = []
@@ -4656,7 +4628,7 @@ def api_hardware():
print(f"[v0] /api/hardware returning data") print(f"[v0] /api/hardware returning data")
print(f"[v0] - CPU: {formatted_data['cpu'].get('model', 'Unknown')}") print(f"[v0] - CPU: {formatted_data['cpu'].get('model', 'Unknown')}")
print(f"[v0] - Temperatures: {len(formatted_data['temperatures'])} sensors") print(f"[v0] - Temperatures: {len(formatted_data['temperatures'])} sensors")
print(f"[v0] - Fans: {len(formatted_data['fans'])} fans") # Includes IPMI fans print(f"[v0] - Fans: {len(formatted_data['fans'])} fans") # Now includes IPMI fans
print(f"[v0] - Power supplies: {len(formatted_data['power_supplies'])} PSUs") 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] - Power meter: {'Yes' if formatted_data['power_meter'] else 'No'}")
print(f"[v0] - UPS: {'Yes' if formatted_data['ups'] else 'No'}") print(f"[v0] - UPS: {'Yes' if formatted_data['ups'] else 'No'}")