Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 12:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into fix/load_not_cpu

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2025-03-06 17:34:14 +01:00
parent 362ffac148 556aa65103
commit afd595de72
11 changed files with 88 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/js/footer.js
View File

@@ -330,8 +330,20 @@ function updateSystemInfo() {
var system = data.system;
var percentRAM = system.memory.ram["%used"];
var percentSwap = system.memory.swap["%used"];
var totalRAMGB = system.memory.ram.total / 1024 / 1024;
var totalSwapGB = system.memory.swap.total / 1024 / 1024;
let totalRAM = system.memory.ram.total / 1024;
let totalRAMUnit = "MB";
if (totalRAM > 1024) {
totalRAM /= 1024;
totalRAMUnit = "GB";
}
let totalSwap = system.memory.swap.total / 1024;
let totalSwapUnit = "MB";
if (totalSwap > 1024) {
totalSwap /= 1024;
totalSwapUnit = "GB";
}
var swap =
system.memory.swap.total > 0
? ((1e2 * system.memory.swap.used) / system.memory.swap.total).toFixed(1) + " %"
@@ -347,14 +359,14 @@ function updateSystemInfo() {
);
$("#memory").prop(
"title",
"Total memory: " + totalRAMGB.toFixed(1) + " GB, Swap usage: " + swap
"Total memory: " + totalRAM.toFixed(1) + " " + totalRAMUnit + ", Swap usage: " + swap
);
$("#sysinfo-memory-ram").text(
percentRAM.toFixed(1) + "% of " + totalRAMGB.toFixed(1) + " GB is used"
percentRAM.toFixed(1) + "% of " + totalRAM.toFixed(1) + " " + totalRAMUnit + " is used"
);
if (system.memory.swap.total > 0) {
$("#sysinfo-memory-swap").text(
percentSwap.toFixed(1) + "% of " + totalSwapGB.toFixed(1) + " GB is used"
percentSwap.toFixed(1) + "% of " + totalSwap.toFixed(1) + " " + totalSwapUnit + " is used"
);
} else {
$("#sysinfo-memory-swap").text("No swap space available");
@@ -375,7 +387,9 @@ function updateSystemInfo() {
"title",
"Load averages for the past 1, 5, and 15 minutes\non a system with " +
system.cpu.nprocs +
" cores and running " +
" core" +
(system.cpu.nprocs > 1 ? "s" : "") +
" running " +
system.procs +
" processes " +
(system.cpu.load.raw[0] > system.cpu.nprocs
@@ -386,7 +400,9 @@ function updateSystemInfo() {
system.cpu["%cpu"].toFixed(1) +
"% on " +
system.cpu.nprocs +
" cores running " +
" core" +
(system.cpu.nprocs > 1 ? "s" : "") +
" running " +
system.procs +
" processes"
);