HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix cpu/memory stats widget

Browse source
This commit is contained in:
Laura Hausmann 2023-07-23 12:14:33 +02:00 committed by ThatOneCalculator
parent 0301e3fe80
commit 56bf7a0ffb
No known key found for this signature in database
GPG key ID: 8703CACD01000000
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/src/daemons/server-stats.ts
View file

@ -37,6 +37,7 @@ export default function () {
mem: { mem: {
used: round(memStats.used - memStats.buffers - memStats.cached), used: round(memStats.used - memStats.buffers - memStats.cached),
active: round(memStats.active), active: round(memStats.active),
total: round(memStats.total),
}, },
net: { net: {
rx: round(Math.max(0, netStats.rx_sec)), rx: round(Math.max(0, netStats.rx_sec)),

4
packages/client/src/pages/admin/overview.metrics.vue
View file

@ -84,8 +84,8 @@ const diskAvailable = $computed(() => meta.fs.total - meta.fs.used);
function onStats(stats) { function onStats(stats) {
cpuUsage = stats.cpu; cpuUsage = stats.cpu;
memUsage = stats.mem.active / meta.mem.total; memUsage = stats.mem.active / stats.mem.total;
memTotal = meta.mem.total; memTotal = stats.mem.total;
memUsed = stats.mem.active; memUsed = stats.mem.active;
memFree = memTotal - memUsed; memFree = memTotal - memUsed;

4
packages/client/src/widgets/server-metric/cpu-mem.vue
View file

@ -131,7 +131,7 @@ function onStats(connStats) {
]); ]);
const memPolylinePointsStats = stats.map((s, i) => [ const memPolylinePointsStats = stats.map((s, i) => [
viewBoxX - (stats.length - 1 - i), viewBoxX - (stats.length - 1 - i),
(1 - s.mem.active / props.meta.mem.total) * viewBoxY, (1 - s.mem.active / s.mem.total) * viewBoxY,
]); ]);
cpuPolylinePoints = cpuPolylinePointsStats cpuPolylinePoints = cpuPolylinePointsStats
.map((xy) => `${xy[0]},${xy[1]}`) .map((xy) => `${xy[0]},${xy[1]}`)
@ -153,7 +153,7 @@ function onStats(connStats) {
memHeadY = memPolylinePointsStats[memPolylinePointsStats.length - 1][1]; memHeadY = memPolylinePointsStats[memPolylinePointsStats.length - 1][1];
cpuP = (connStats.cpu * 100).toFixed(0); cpuP = (connStats.cpu * 100).toFixed(0);
memP = ((connStats.mem.active / props.meta.mem.total) * 100).toFixed(0); memP = ((connStats.mem.active / connStats.mem.total) * 100).toFixed(0);
} }
function onStatsLog(statsLog) { function onStatsLog(statsLog) {

4
packages/client/src/widgets/server-metric/mem.vue
View file

@ -26,8 +26,8 @@ let usage: number = $ref(0),
free: number = $ref(0); free: number = $ref(0);
function onStats(stats) { function onStats(stats) {
usage = stats.mem.active / props.meta.mem.total; usage = stats.mem.active / stats.mem.total;
total = props.meta.mem.total; total = stats.mem.total;
used = stats.mem.active; used = stats.mem.active;
free = total - used; free = total - used;
} }