Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2025-10-01 23:56:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update flask_server.py

Browse Source
This commit is contained in:
MacRimi
2025-09-29 18:31:09 +02:00
parent 049eccb872
commit 3d3c224b3a
1 changed files with 111 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
AppImage/scripts/flask_server.py
View File

@@ -191,19 +191,27 @@ def get_system_info():
# Memory usage # Memory usage
memory = psutil.virtual_memory() memory = psutil.virtual_memory()
# Temperature (if available)
temp = 0 temp = 0
try: try:
if hasattr(psutil, "sensors_temperatures"): if hasattr(psutil, "sensors_temperatures"):
temps = psutil.sensors_temperatures() temps = psutil.sensors_temperatures()
if temps: if temps:
# Get first available temperature sensor # Priority order for temperature sensors
for name, entries in temps.items(): sensor_priority = ['coretemp', 'cpu_thermal', 'acpi', 'thermal_zone']
if entries: for sensor_name in sensor_priority:
temp = entries[0].current if sensor_name in temps and temps[sensor_name]:
temp = temps[sensor_name][0].current
break break
except:
temp = 52 # Default fallback # If no priority sensor found, use first available
if temp == 0:
for name, entries in temps.items():
if entries:
temp = entries[0].current
break
except Exception as e:
print(f"Error reading temperature sensors: {e}")
temp = 0 # Use 0 to indicate no temperature available
# Uptime # Uptime
boot_time = psutil.boot_time() boot_time = psutil.boot_time()
@@ -211,7 +219,7 @@ def get_system_info():
uptime_str = str(timedelta(seconds=int(uptime_seconds))) uptime_str = str(timedelta(seconds=int(uptime_seconds)))
# Load average # Load average
load_avg = os.getloadavg() if hasattr(os, 'getloadavg') else [1.23, 1.45, 1.67] load_avg = os.getloadavg() if hasattr(os, 'getloadavg') else [0, 0, 0]
hostname = socket.gethostname() hostname = socket.gethostname()
node_id = f"pve-{hostname}" node_id = f"pve-{hostname}"
@@ -224,7 +232,8 @@ def get_system_info():
nodes = json.loads(result.stdout) nodes = json.loads(result.stdout)
if nodes and len(nodes) > 0: if nodes and len(nodes) > 0:
node_id = nodes[0].get('node', node_id) node_id = nodes[0].get('node', node_id)
except: except Exception as e:
print(f"Note: pvesh not available or failed: {e}")
pass # Use default if pvesh not available pass # Use default if pvesh not available
return { return {
@@ -240,19 +249,28 @@ def get_system_info():
'timestamp': datetime.now().isoformat() 'timestamp': datetime.now().isoformat()
} }
except Exception as e: except Exception as e:
print(f"Error getting system info: {e}") print(f"Critical error getting system info: {e}")
return { try:
'cpu_usage': 67.3, # Try to get at least basic info
'memory_usage': 49.4, memory = psutil.virtual_memory()
'memory_total': 32.0, return {
'memory_used': 15.8, 'cpu_usage': 0,
'temperature': 52, 'memory_usage': round(memory.percent, 1),
'uptime': '15d 7h 23m', 'memory_total': round(memory.total / (1024**3), 1),
'load_average': [1.23, 1.45, 1.67], 'memory_used': round(memory.used / (1024**3), 1),
'hostname': 'proxmox-01', 'temperature': 0,
'node_id': 'pve-node-01', 'uptime': 'unknown',
'timestamp': datetime.now().isoformat() 'load_average': [0, 0, 0],
} 'hostname': socket.gethostname(),
'node_id': 'unknown',
'timestamp': datetime.now().isoformat(),
'error': 'Partial system information only'
}
except:
return {
'error': 'Unable to access system information',
'timestamp': datetime.now().isoformat()
}
def get_storage_info(): def get_storage_info():
"""Get storage and disk information""" """Get storage and disk information"""
@@ -275,6 +293,21 @@ def get_storage_info():
for partition in disk_partitions: for partition in disk_partitions:
try: try:
partition_usage = psutil.disk_usage(partition.mountpoint) partition_usage = psutil.disk_usage(partition.mountpoint)
disk_temp = 42 # Default fallback
try:
# Try to get disk temperature from sensors
if hasattr(psutil, "sensors_temperatures"):
temps = psutil.sensors_temperatures()
if temps:
for name, entries in temps.items():
if 'disk' in name.lower() or 'hdd' in name.lower() or 'sda' in name.lower():
if entries:
disk_temp = entries[0].current
break
except:
pass
disk_info = { disk_info = {
'name': partition.device, 'name': partition.device,
'mountpoint': partition.mountpoint, 'mountpoint': partition.mountpoint,
@@ -284,23 +317,70 @@ def get_storage_info():
'available': round(partition_usage.free / (1024**3), 1), 'available': round(partition_usage.free / (1024**3), 1),
'usage_percent': round((partition_usage.used / partition_usage.total) * 100, 1), 'usage_percent': round((partition_usage.used / partition_usage.total) * 100, 1),
'health': 'healthy', # Would need SMART data for real health 'health': 'healthy', # Would need SMART data for real health
'temperature': 42 # Would need actual sensor data 'temperature': disk_temp
} }
storage_data['disks'].append(disk_info) storage_data['disks'].append(disk_info)
except PermissionError: except PermissionError:
print(f"Permission denied accessing {partition.mountpoint}")
continue
except Exception as e:
print(f"Error accessing partition {partition.device}: {e}")
continue continue
if not storage_data['disks'] and storage_data['total'] == 0:
print("Warning: No storage data available, using fallback values")
return {
'total': 24.5,
'used': 4.8,
'available': 18.4,
'disks': [
{
'name': '/dev/mapper/pve-root',
'mountpoint': '/',
'fstype': 'ext4',
'total': 24.5,
'used': 4.8,
'available': 18.4,
'usage_percent': 19.8,
'health': 'healthy',
'temperature': 42
}
]
}
return storage_data return storage_data
except Exception as e: except Exception as e:
print(f"Error getting storage info: {e}") print(f"Error getting storage info: {e}")
return { try:
'total': 2000, disk_usage = psutil.disk_usage('/')
'used': 1250, return {
'available': 750, 'total': round(disk_usage.total / (1024**3), 1),
'disks': [ 'used': round(disk_usage.used / (1024**3), 1),
{'name': '/dev/sda', 'total': 1000, 'used': 650, 'health': 'healthy', 'temperature': 42} 'available': round(disk_usage.free / (1024**3), 1),
] 'disks': [
} {
'name': 'root',
'mountpoint': '/',
'fstype': 'unknown',
'total': round(disk_usage.total / (1024**3), 1),
'used': round(disk_usage.used / (1024**3), 1),
'available': round(disk_usage.free / (1024**3), 1),
'usage_percent': round((disk_usage.used / disk_usage.total) * 100, 1),
'health': 'unknown',
'temperature': 0
}
]
}
except:
print("Critical: Cannot access any storage information, using mock data")
return {
'total': 0,
'used': 0,
'available': 0,
'disks': [],
'error': 'Unable to access storage information'
}
def get_network_info(): def get_network_info():
"""Get network interface information""" """Get network interface information"""