jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-09-30 05:17:49 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

fix(site): show gaps in network monitor charts for failed probes and disconnects (#2428)

Browse Source 
Co-authored-by: henrygd <hank@henrygd.me>
This commit is contained in:
Sven van Ginkel
2026-09-27 17:08:50 +02:00
committed by GitHub
parent 739649a6db
commit c1505804bd
7 changed files with 150 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
internal/site/tests/network-monitor-utils.test.ts
View File

@@ -5,7 +5,7 @@ mock.module("@lingui/core/macro", () => ({
plural: (_count: number, forms: { other?: string }) => forms.other ?? "",
}))
const { getMonitorStats } = await import("../src/lib/network-monitor-utils")
const { getMonitorStats, withMonitorGaps } = await import("../src/lib/network-monitor-utils")
describe("monitor stats derived from stored counts", () => {
test("retains probe weights and response precision", () => {
@@ -39,10 +39,10 @@ describe("monitor stats derived from stored counts", () => {
})
test.each([
{ total_count: 3, success_count: 0, loss: 100 },
{ total_count: 0, success_count: 0, loss: 0 },
{ total_count: 1, success_count: 1, loss: 0 },
])("handles zero sums with $total_count attempts and $success_count successes", ({ loss, ...counts }) => {
{ total_count: 3, success_count: 0, loss: 100, res: null },
{ total_count: 0, success_count: 0, loss: 0, res: null },
{ total_count: 1, success_count: 1, loss: 0, res: 0 },
])("handles zero sums with $total_count attempts and $success_count successes", ({ loss, res, ...counts }) => {
const stats = getMonitorStats({
monitor: "monitor1",
created: 1000,
@@ -51,6 +51,39 @@ describe("monitor stats derived from stored counts", () => {
res_sum: 0,
...counts,
})
expect(stats).toEqual({ res_avg: 0, res_min: 0, res_max: 0, loss })
expect(stats).toEqual({ res_avg: res, res_min: res, res_max: res, loss })
})
})
describe("monitor gaps", () => {
const monitor = { id: "m1", interval: 30 }
const stats = { res_avg: 1, res_min: 1, res_max: 1, loss: 0 }
const record = (created: number | null, id = monitor.id) => ({ created, stats: { [id]: stats } })
test("does not insert markers at the expected cadence", () => {
const records = [record(0), record(60_000), record(120_000)]
expect(withMonitorGaps(records, monitor, 60_000)).toEqual(records)
})
test("inserts a marker between records further apart than expected", () => {
const records = [record(60_000), record(300_000)]
expect(withMonitorGaps(records, monitor, 60_000)).toEqual([records[0], { created: null, stats: null }, records[1]])
})
test("uses the monitor interval when it is longer than the tier interval", () => {
const slowMonitor = { id: monitor.id, interval: 300 }
const records = [record(300_000), record(600_000), record(900_000)]
expect(withMonitorGaps(records, slowMonitor, 60_000)).toEqual(records)
expect(withMonitorGaps([records[0], record(1_200_000)], slowMonitor, 60_000)).toHaveLength(3)
})
test("skips records for other monitors and existing gap markers", () => {
const records = [
record(60_000),
record(90_000, "m2"),
{ created: null, stats: null },
record(120_000),
] as Parameters<typeof withMonitorGaps>[0]
expect(withMonitorGaps(records, monitor, 60_000)).toEqual([records[0], records[3]])
})
})