diff --git a/AppImage/components/network-metrics.tsx b/AppImage/components/network-metrics.tsx index f0003ec..b17739a 100644 --- a/AppImage/components/network-metrics.tsx +++ b/AppImage/components/network-metrics.tsx @@ -8,7 +8,9 @@ import { Wifi, Globe, Shield, Activity, Network, Router, AlertCircle, Zap } from import useSWR from "swr" interface NetworkData { - interfaces: NetworkInterface[] + physical_interfaces?: NetworkInterface[] // Separated physical interfaces + bridge_interfaces?: NetworkInterface[] // Separated bridge interfaces + interfaces?: NetworkInterface[] // Keep for backward compatibility vm_lxc_interfaces?: NetworkInterface[] traffic: { bytes_sent: number @@ -20,8 +22,12 @@ interface NetworkData { dropin?: number dropout?: number } - active_count?: number - total_count?: number + physical_active_count?: number // Physical interfaces active count + physical_total_count?: number // Physical interfaces total count + bridge_active_count?: number // Bridge interfaces active count + bridge_total_count?: number // Bridge interfaces total count + active_count?: number // Keep for backward compatibility + total_count?: number // Keep for backward compatibility vm_lxc_active_count?: number vm_lxc_total_count?: number } @@ -164,6 +170,10 @@ export function NetworkMetrics() { const trafficOutGB = (networkData.traffic.bytes_sent / 1024 ** 3).toFixed(2) const packetsRecvK = networkData.traffic.packets_recv ? (networkData.traffic.packets_recv / 1000).toFixed(0) : "0" + const physicalInterfaces = networkData.physical_interfaces || [] + const bridgeInterfaces = networkData.bridge_interfaces || [] + const vmLxcInterfaces = networkData.vm_lxc_interfaces || [] + return (
{/* Network Overview Cards */} @@ -189,13 +199,23 @@ export function NetworkMetrics() { -
{networkData.active_count ?? 0}
-
- - Online - +
+ {(networkData.physical_active_count ?? 0) + (networkData.bridge_active_count ?? 0)} +
+
+
+ Physical: + + {networkData.physical_active_count ?? 0}/{networkData.physical_total_count ?? 0} + +
+
+ Bridges: + + {networkData.bridge_active_count ?? 0}/{networkData.bridge_total_count ?? 0} + +
-

{networkData.total_count ?? 0} total interfaces

@@ -237,89 +257,178 @@ export function NetworkMetrics() {
- {/* Network Interfaces */} - - - - - Network Interfaces - - - -
- {networkData.interfaces.map((interface_, index) => { - const typeBadge = getInterfaceTypeBadge(interface_.type) + {physicalInterfaces.length > 0 && ( + + + + + Physical Interfaces + + {networkData.physical_active_count ?? 0} / {networkData.physical_total_count ?? 0} Active + + + + +
+ {physicalInterfaces.map((interface_, index) => { + const typeBadge = getInterfaceTypeBadge(interface_.type) - return ( -
setSelectedInterface(interface_)} - > - {/* First row: Icon, Name, Type Badge, Status */} -
- -
-
{interface_.name}
- - {typeBadge.label} + return ( +
setSelectedInterface(interface_)} + > + {/* First row: Icon, Name, Type Badge, Status */} +
+ +
+
{interface_.name}
+ + {typeBadge.label} + +
+ + {interface_.status.toUpperCase()}
- - {interface_.status.toUpperCase()} - -
- {/* Second row: Details - Responsive layout */} -
-
-
IP Address
-
- {interface_.addresses.length > 0 ? interface_.addresses[0].ip : "N/A"} -
-
- -
-
Speed
-
- - {formatSpeed(interface_.speed)} -
-
- -
-
Traffic
-
- ↓ {formatBytes(interface_.bytes_recv)} - {" / "} - ↑ {formatBytes(interface_.bytes_sent)} -
-
- - {interface_.mac_address && ( -
-
MAC
-
- {interface_.mac_address} + {/* Second row: Details - Responsive layout */} +
+
+
IP Address
+
+ {interface_.addresses.length > 0 ? interface_.addresses[0].ip : "N/A"}
- )} -
-
- ) - })} -
- - - {networkData.vm_lxc_interfaces && networkData.vm_lxc_interfaces.length > 0 && ( +
+
Speed
+
+ + {formatSpeed(interface_.speed)} +
+
+ +
+
Traffic
+
+ ↓ {formatBytes(interface_.bytes_recv)} + {" / "} + ↑ {formatBytes(interface_.bytes_sent)} +
+
+ + {interface_.mac_address && ( +
+
MAC
+
+ {interface_.mac_address} +
+
+ )} +
+
+ ) + })} +
+ + + )} + + {bridgeInterfaces.length > 0 && ( + + + + + Bridge Interfaces + + {networkData.bridge_active_count ?? 0} / {networkData.bridge_total_count ?? 0} Active + + + + +
+ {bridgeInterfaces.map((interface_, index) => { + const typeBadge = getInterfaceTypeBadge(interface_.type) + + return ( +
setSelectedInterface(interface_)} + > +
+ +
+
{interface_.name}
+ + {typeBadge.label} + +
+ + {interface_.status.toUpperCase()} + +
+ +
+
+
IP Address
+
+ {interface_.addresses.length > 0 ? interface_.addresses[0].ip : "N/A"} +
+
+ +
+
Speed
+
+ + {formatSpeed(interface_.speed)} +
+
+ +
+
Traffic
+
+ ↓ {formatBytes(interface_.bytes_recv)} + {" / "} + ↑ {formatBytes(interface_.bytes_sent)} +
+
+ + {interface_.mac_address && ( +
+
MAC
+
+ {interface_.mac_address} +
+
+ )} +
+
+ ) + })} +
+ + + )} + + {/* VM & LXC Network Interfaces */} + {vmLxcInterfaces.length > 0 && ( @@ -332,7 +441,7 @@ export function NetworkMetrics() {
- {networkData.vm_lxc_interfaces.map((interface_, index) => { + {vmLxcInterfaces.map((interface_, index) => { const vmTypeBadge = getVMTypeBadge(interface_.vm_type) return ( @@ -406,7 +515,6 @@ export function NetworkMetrics() { )} - {/* Interface Details Modal */} setSelectedInterface(null)}> diff --git a/AppImage/scripts/flask_server.py b/AppImage/scripts/flask_server.py index 0cbb0cc..a06ca40 100644 --- a/AppImage/scripts/flask_server.py +++ b/AppImage/scripts/flask_server.py @@ -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': 'pvesm command not available or failed', + 'error': 'pvesh command not available or failed', 'storage': [] } @@ -1001,11 +1001,12 @@ def get_bridge_info(bridge_name): return bridge_info def get_network_info(): - """Get network interface information - Enhanced with VM/LXC interface separation""" + """Get network interface information - Enhanced with separation of physical and bridge interfaces""" try: network_data = { - 'interfaces': [], - 'vm_lxc_interfaces': [], # Added separate list for VM/LXC interfaces + 'physical_interfaces': [], # Separated physical interfaces + 'bridge_interfaces': [], # Separated bridge interfaces + 'vm_lxc_interfaces': [], 'traffic': {'bytes_sent': 0, 'bytes_recv': 0, 'packets_sent': 0, 'packets_recv': 0} } @@ -1021,8 +1022,10 @@ def get_network_info(): print(f"[v0] Error getting per-NIC stats: {e}") net_io_per_nic = {} - active_count = 0 - total_count = 0 + physical_active_count = 0 + physical_total_count = 0 + bridge_active_count = 0 + bridge_total_count = 0 vm_lxc_active_count = 0 vm_lxc_total_count = 0 @@ -1041,10 +1044,14 @@ def get_network_info(): vm_lxc_total_count += 1 if stats.isup: vm_lxc_active_count += 1 - else: - total_count += 1 + elif interface_type == 'physical': + physical_total_count += 1 if stats.isup: - active_count += 1 + physical_active_count += 1 + elif interface_type == 'bridge': + bridge_total_count += 1 + if stats.isup: + bridge_active_count += 1 interface_info = { 'name': interface_name, @@ -1115,15 +1122,20 @@ def get_network_info(): if interface_type == 'vm_lxc': network_data['vm_lxc_interfaces'].append(interface_info) - else: - network_data['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) - network_data['active_count'] = active_count - network_data['total_count'] = total_count + 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['vm_lxc_active_count'] = vm_lxc_active_count network_data['vm_lxc_total_count'] = vm_lxc_total_count - print(f"[v0] Physical interfaces: {active_count} active out of {total_count} total") + 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] VM/LXC interfaces: {vm_lxc_active_count} active out of {vm_lxc_total_count} total") # Get network I/O statistics (global) @@ -1159,11 +1171,14 @@ def get_network_info(): traceback.print_exc() return { 'error': f'Unable to access network information: {str(e)}', - 'interfaces': [], + 'physical_interfaces': [], + 'bridge_interfaces': [], 'vm_lxc_interfaces': [], 'traffic': {'bytes_sent': 0, 'bytes_recv': 0, 'packets_sent': 0, 'packets_recv': 0}, - 'active_count': 0, - 'total_count': 0, + 'physical_active_count': 0, + 'physical_total_count': 0, + 'bridge_active_count': 0, + 'bridge_total_count': 0, 'vm_lxc_active_count': 0, 'vm_lxc_total_count': 0 }