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

Update AppImage

Browse Source
This commit is contained in:
MacRimi
2025-10-04 19:58:12 +02:00
parent 79525284b1
commit 98c5c5827c
2 changed files with 118 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
AppImage/scripts/flask_server.py
View File

@@ -857,7 +857,7 @@ def get_proxmox_storage():
print(f"[v0] pvesm status failed with return code {result.returncode}")
print(f"[v0] stderr: {result.stderr}")
return {
'error': 'pvesh command not available or failed',
'error': 'pvesm command not available or failed',
'storage': []
}
@@ -1001,12 +1001,11 @@ def get_bridge_info(bridge_name):
return bridge_info
def get_network_info():
"""Get network interface information - Enhanced with separation of physical and bridge interfaces"""
"""Get network interface information - Enhanced with VM/LXC interface separation"""
try:
network_data = {
'physical_interfaces': [], # Separated physical interfaces
'bridge_interfaces': [], # Separated bridge interfaces
'vm_lxc_interfaces': [],
'interfaces': [],
'vm_lxc_interfaces': [], # Added separate list for VM/LXC interfaces
'traffic': {'bytes_sent': 0, 'bytes_recv': 0, 'packets_sent': 0, 'packets_recv': 0}
}
@@ -1022,10 +1021,8 @@ def get_network_info():
print(f"[v0] Error getting per-NIC stats: {e}")
net_io_per_nic = {}
physical_active_count = 0
physical_total_count = 0
bridge_active_count = 0
bridge_total_count = 0
active_count = 0
total_count = 0
vm_lxc_active_count = 0
vm_lxc_total_count = 0
@@ -1044,14 +1041,10 @@ def get_network_info():
vm_lxc_total_count += 1
if stats.isup:
vm_lxc_active_count += 1
elif interface_type == 'physical':
physical_total_count += 1
else:
total_count += 1
if stats.isup:
physical_active_count += 1
elif interface_type == 'bridge':
bridge_total_count += 1
if stats.isup:
bridge_active_count += 1
active_count += 1
interface_info = {
'name': interface_name,
@@ -1122,20 +1115,15 @@ def get_network_info():
if interface_type == 'vm_lxc':
network_data['vm_lxc_interfaces'].append(interface_info)
elif interface_type == 'physical':
network_data['physical_interfaces'].append(interface_info)
elif interface_type == 'bridge':
network_data['bridge_interfaces'].append(interface_info)
else:
network_data['interfaces'].append(interface_info)
network_data['physical_active_count'] = physical_active_count
network_data['physical_total_count'] = physical_total_count
network_data['bridge_active_count'] = bridge_active_count
network_data['bridge_total_count'] = bridge_total_count
network_data['active_count'] = active_count
network_data['total_count'] = total_count
network_data['vm_lxc_active_count'] = vm_lxc_active_count
network_data['vm_lxc_total_count'] = vm_lxc_total_count
print(f"[v0] Physical interfaces: {physical_active_count} active out of {physical_total_count} total")
print(f"[v0] Bridge interfaces: {bridge_active_count} active out of {bridge_total_count} total")
print(f"[v0] Physical interfaces: {active_count} active out of {total_count} total")
print(f"[v0] VM/LXC interfaces: {vm_lxc_active_count} active out of {vm_lxc_total_count} total")
# Get network I/O statistics (global)
@@ -1171,14 +1159,11 @@ def get_network_info():
traceback.print_exc()
return {
'error': f'Unable to access network information: {str(e)}',
'physical_interfaces': [],
'bridge_interfaces': [],
'interfaces': [],
'vm_lxc_interfaces': [],
'traffic': {'bytes_sent': 0, 'bytes_recv': 0, 'packets_sent': 0, 'packets_recv': 0},
'physical_active_count': 0,
'physical_total_count': 0,
'bridge_active_count': 0,
'bridge_total_count': 0,
'active_count': 0,
'total_count': 0,
'vm_lxc_active_count': 0,
'vm_lxc_total_count': 0
}