diff --git a/virtweb_frontend/src/api/ServerApi.ts b/virtweb_frontend/src/api/ServerApi.ts index 845fd77..51e90d1 100644 --- a/virtweb_frontend/src/api/ServerApi.ts +++ b/virtweb_frontend/src/api/ServerApi.ts @@ -73,7 +73,7 @@ interface SystemInfo { secs: number; nanos: number; }; - global_cpu_info: GlobalCPUInfo; + global_cpu_usage: number; cpus: CpuCore[]; physical_core_count: number; total_memory: number; @@ -94,14 +94,6 @@ interface SystemInfo { host_name: string; } -interface GlobalCPUInfo { - cpu_usage: number; - name: string; - vendor_id: string; - brand: string; - frequency: number; -} - interface CpuCore { cpu_usage: number; name: string; diff --git a/virtweb_frontend/src/routes/SysInfoRoute.tsx b/virtweb_frontend/src/routes/SysInfoRoute.tsx index 9e903ad..4bb2e04 100644 --- a/virtweb_frontend/src/routes/SysInfoRoute.tsx +++ b/virtweb_frontend/src/routes/SysInfoRoute.tsx @@ -134,13 +134,13 @@ export function SysInfoRouteInner(p: { data: [ { id: 1, - value: 100 - p.info.system.global_cpu_info.cpu_usage, + value: 100 - p.info.system.global_cpu_usage, label: "Free", }, { id: 2, - value: p.info.system.global_cpu_info.cpu_usage, + value: p.info.system.global_cpu_usage, label: "Used", }, ], @@ -180,18 +180,18 @@ export function SysInfoRouteInner(p: { label="CPU info" icon={} entries={[ - { label: "Brand", value: p.info.system.global_cpu_info.brand }, + { label: "Brand", value: p.info.system.cpus[0].brand }, { label: "Vendor ID", - value: p.info.system.global_cpu_info.vendor_id, + value: p.info.system.cpus[0].vendor_id, }, { label: "CPU usage", - value: p.info.system.global_cpu_info.cpu_usage, + value: p.info.system.cpus[0].cpu_usage, }, { label: "Name", - value: p.info.system.global_cpu_info.name, + value: p.info.system.cpus[0].name, }, { label: "CPU model",