Skip to content

Make load-average gauges use CPU thresholds, not fixed 70/100% #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LarsLaskowski merged 1 commit into from
Aug 21, 2026
Merged

Make load-average gauges use CPU thresholds, not fixed 70/100% #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/web/assets/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,9 @@
setText('cpu-info', lastCPUCount + (lastCPUCount === 1 ? ' core' : ' cores') + (cpuModel ? ' · ' + cpuModel : ''));

// Load average gauges
renderGauge('gauge-load1', 'load1-value', snap.load_average.load1);
renderGauge('gauge-load5', 'load5-value', snap.load_average.load5);
renderGauge('gauge-load15', 'load15-value', snap.load_average.load15);
renderGauge('gauge-load1', 'load1-value', snap.load_average.load1, t.cpu_warn_percent, t.cpu_crit_percent);
renderGauge('gauge-load5', 'load5-value', snap.load_average.load5, t.cpu_warn_percent, t.cpu_crit_percent);
renderGauge('gauge-load15', 'load15-value', snap.load_average.load15, t.cpu_warn_percent, t.cpu_crit_percent);

// Temperature
const tempEl = document.getElementById('temp-value');
Expand Down Expand Up @@ -516,9 +516,9 @@
});
}

function renderGauge(canvasId, valueId, value) {
function renderGauge(canvasId, valueId, value, warnPercent, critPercent) {
const canvas = document.getElementById(canvasId);
const cls = levelClass(value, lastCPUCount * 0.7, lastCPUCount * 1.0);
const cls = levelClass(value, lastCPUCount * warnPercent / 100, lastCPUCount * critPercent / 100);
drawGauge(canvas, value, Math.max(lastCPUCount, 1), cls);
setText(valueId, value.toFixed(2));
}
Expand Down
35 changes: 35 additions & 0 deletions internal/web/gauge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package web

import (
"strings"
"testing"
)

// TestAppJS_LoadGaugeUsesCPUThresholds guards against regressing issue #67:
// the load-average gauge color scale must derive from the configured
// cpu_warn_percent/cpu_crit_percent thresholds (relative to core count), as
// documented in packaging/pimonitor.example.yaml, rather than a hardcoded
// 70 %/100 % of core count.
func TestAppJS_LoadGaugeUsesCPUThresholds(t *testing.T) {
data, err := assetsFS.ReadFile("assets/app.js")
if err != nil {
t.Fatalf("read app.js: %v", err)
}
js := string(data)

if strings.Contains(js, "lastCPUCount * 0.7") || strings.Contains(js, "lastCPUCount * 1.0") {
t.Error("app.js: found hardcoded 0.7/1.0 core-count gauge thresholds; the load gauges must use the configured cpu_warn_percent/cpu_crit_percent instead")
}
if !strings.Contains(js, "lastCPUCount * warnPercent / 100") || !strings.Contains(js, "lastCPUCount * critPercent / 100") {
t.Error("app.js: expected renderGauge to scale cpu_warn_percent/cpu_crit_percent by lastCPUCount")
}
for _, call := range []string{
"renderGauge('gauge-load1', 'load1-value', snap.load_average.load1, t.cpu_warn_percent, t.cpu_crit_percent);",
"renderGauge('gauge-load5', 'load5-value', snap.load_average.load5, t.cpu_warn_percent, t.cpu_crit_percent);",
"renderGauge('gauge-load15', 'load15-value', snap.load_average.load15, t.cpu_warn_percent, t.cpu_crit_percent);",
} {
if !strings.Contains(js, call) {
t.Errorf("app.js: expected call %q", call)
}
}
}
Loading