diff --git a/backend/monitoring.go b/backend/monitoring.go index 690798f..674af7f 100644 --- a/backend/monitoring.go +++ b/backend/monitoring.go @@ -16,15 +16,15 @@ type metricsHistory struct { Samples []map[string]float64 `json:"samples"` } type metricStats struct { - Mean float64 `json:"mean"` - Latest float64 `json:"latest"` - Max float64 `json:"max"` + Mean float64 `json:"mean"` + Latest *float64 `json:"latest"` + Max float64 `json:"max"` } type metricSeries struct { ID string `json:"id"` LabelKey string `json:"labelKey"` Color string `json:"color"` - Values []float64 `json:"values"` + Values []*float64 `json:"values"` Stats metricStats `json:"stats"` } type metricPanel struct { @@ -91,33 +91,53 @@ func (a *App) monitoring(w http.ResponseWriter, r *http.Request) { timestamps = append(timestamps, int64(samples[index]["time"])) } makeSeries := func(id, label, color string) metricSeries { - series := metricSeries{ID: id, LabelKey: "monitor.series." + label, Color: "var(--" + color + ")", Values: []float64{}} + series := metricSeries{ID: id, LabelKey: "monitor.series." + label, Color: "var(--" + color + ")", Values: []*float64{}} count := 0 for _, sample := range samples { if value, ok := sample[id]; ok { series.Stats.Mean += value series.Stats.Max = math.Max(value, series.Stats.Max) - series.Stats.Latest = value count++ } } if count > 0 { series.Stats.Mean /= float64(count) } + if len(samples) > 0 { + if latest, ok := samples[len(samples)-1][id]; ok { + series.Stats.Latest = &latest + } + } + previousIndex := -1 for _, index := range indices { - series.Values = append(series.Values, samples[index][id]) + var point *float64 + complete := true + // Preserve gaps even when downsampling skips the original missing point. + for i := previousIndex + 1; i <= index; i++ { + if _, ok := samples[i][id]; !ok { + complete = false + break + } + } + if complete { + value := samples[index][id] + point = &value + } + series.Values = append(series.Values, point) + previousIndex = index } return series } panel := func(id, unit string, maximum float64, stacked bool, series ...metricSeries) metricPanel { - available := len(samples) > 1 + completePoints := 0 peak := float64(0) for _, sample := range samples { sum := float64(0) + complete := true for _, s := range series { value, ok := sample[s.ID] if !ok { - available = false + complete = false } if stacked { sum += value @@ -126,6 +146,9 @@ func (a *App) monitoring(w http.ResponseWriter, r *http.Request) { } } peak = math.Max(peak, sum) + if complete { + completePoints++ + } } if maximum == 0 { maximum = niceMaximum(peak) @@ -133,7 +156,7 @@ func (a *App) monitoring(w http.ResponseWriter, r *http.Request) { if maximum <= 0 { maximum = 1 } - return metricPanel{id, "monitor.charts." + id, unit, maximum, stacked, available, series} + return metricPanel{id, "monitor.charts." + id, unit, maximum, stacked, completePoints > 1, series} } panels := []metricPanel{ panel("ipv4", "gigabits", 0, true, makeSeries("https4", "https", "blue"), makeSeries("rsync4", "rsync", "violet")), diff --git a/backend/monitoring_test.go b/backend/monitoring_test.go new file mode 100644 index 0000000..22a8d44 --- /dev/null +++ b/backend/monitoring_test.go @@ -0,0 +1,76 @@ +package main + +import ( + "encoding/json" + "fmt" + "os" + "path/filepath" + "testing" + "time" +) + +func TestMonitoringRecoversAfterMissingSamples(t *testing.T) { + c := fixture(t) + path := filepath.Join(t.TempDir(), "history.json") + c.app.cfg.Metrics = path + now := time.Now() + history := metricsHistory{UpdatedAt: now.UnixMilli(), MemoryTotal: 32} + for i := 0; i < 500; i++ { + sample := map[string]float64{"time": float64(now.Add(time.Duration(i-500) * time.Second).UnixMilli())} + for _, key := range []string{"https4", "rsync4", "readOps", "writeOps", "readBytes", "writeBytes"} { + sample[key] = 4 + } + history.Samples = append(history.Samples, sample) + } + // A collector startup or counter reset must not disable an entire history window. + for _, key := range []string{"https4", "rsync4", "readOps", "writeOps", "readBytes", "writeBytes"} { + delete(history.Samples[0], key) + delete(history.Samples[1], key) // Also exercise a gap skipped by downsampling. + delete(history.Samples[100], key) + } + delete(history.Samples[499], "https4") + history.Samples[499]["rsync4"] = 0 // A measured zero is different from missing data. + raw, _ := json.Marshal(history) + if err := os.WriteFile(path, raw, 0644); err != nil { + t.Fatal(err) + } + for _, hours := range []int{1, 6, 24} { + t.Run(fmt.Sprint(hours), func(t *testing.T) { + response := c.call("GET", fmt.Sprintf("/api/v1/monitoring?hours=%d", hours), nil, false) + status(t, response, 200) + var result struct { + Panels []metricPanel `json:"panels"` + Timestamps []int64 `json:"timestamps"` + } + if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil { + t.Fatal(err) + } + for _, panel := range result.Panels { + wanted := panel.ID == "ipv4" || panel.ID == "iops" || panel.ID == "throughput" + if panel.Available != wanted { + t.Fatalf("panel %s available=%t, want %t", panel.ID, panel.Available, wanted) + } + for _, series := range panel.Series { + if len(series.Values) != len(result.Timestamps) { + t.Fatal("series no longer aligns with shared timestamps") + } + if wanted { + if series.Values[0] != nil || series.Values[1] != nil { + t.Fatal("startup gap lost during downsampling") + } + if series.Stats.Max != 4 || series.Stats.Mean <= 3.9 { + t.Fatal("missing samples polluted statistics") + } + } + } + } + v4 := result.Panels[0].Series + if v4[0].Stats.Latest != nil || v4[0].Values[len(v4[0].Values)-1] != nil { + t.Fatal("missing latest measurement presented as zero or a stale value") + } + if latest := v4[1].Stats.Latest; latest == nil || *latest != 0 { + t.Fatal("valid zero measurement was dropped") + } + }) + } +} diff --git a/scripts/check-monitoring.ts b/scripts/check-monitoring.ts index e9ae1a0..d49c64c 100644 --- a/scripts/check-monitoring.ts +++ b/scripts/check-monitoring.ts @@ -1,5 +1,5 @@ import assert from 'node:assert/strict' -import { createMonitoringSnapshot, demoDisks, type MonitoringRange } from '../src/monitoring.ts' +import { createMonitoringSnapshot, demoDisks, metricPaths, metricStatistics, type MetricSeries, type MonitoringRange } from '../src/monitoring.ts' const end = Date.parse('2026-11-01T16:00:00+08:00') for (const hours of [1, 6, 24] as MonitoringRange[]) { @@ -12,7 +12,7 @@ for (const hours of [1, 6, 24] as MonitoringRange[]) { for (const panel of snapshot.panels) { for (const series of panel.series) { assert.equal(series.values.length, snapshot.timestamps.length) - assert.ok(series.values.every(value => Number.isFinite(value) && value >= 0 && value <= panel.maximum)) + assert.ok(series.values.every(value => value !== null && Number.isFinite(value) && value >= 0 && value <= panel.maximum)) } for (let index = 0; index < snapshot.timestamps.length; index++) { if (index) assert.ok(snapshot.timestamps[index]! > snapshot.timestamps[index - 1]!) @@ -23,4 +23,15 @@ for (const hours of [1, 6, 24] as MonitoringRange[]) { } } for (const disk of demoDisks) assert.ok(disk.used >= 0 && disk.used <= disk.total) -console.log('Monitoring check passed: deterministic windows, timestamps, valid samples, stack limits, CPU/memory totals and disk capacities.') +const series = (id: string, values: MetricSeries['values']): MetricSeries => ({ id, values, labelKey: id, color: 'blue' }) +const lower = series('lower', [0, 2, null, 3, 4]) +const upper = series('upper', [1, 1, 1, 1, 1]) +const coordinate = (index: number, value: number) => `${index},${value}` +const paths = metricPaths([lower, upper], 5, true, coordinate) +assert.equal(paths[0]!.line, 'M0,0 L1,2 M3,3 L4,4', 'Missing data must break a line, preserving measured zero') +assert.equal(paths[0]!.area, 'M0,0 L1,2 L1,0 L0,0 Z M3,3 L4,4 L4,0 L3,0 Z', 'Fills must not bridge gaps') +assert.deepEqual(paths[1]!.plottedValues, [1, 3, null, 4, 5], 'Unknown stacked baselines must remain gaps') +assert.deepEqual(metricPaths([upper], 5, true, coordinate)[0]!.plottedValues, upper.values, 'Hiding a lower series must rebuild the stack') +assert.deepEqual(metricStatistics([null, 0, 4, null]), { mean: 2, latest: null, max: 4 }, 'Missing samples must not become zero or stale latest values') +assert.deepEqual(metricStatistics([null, null]), { mean: 0, latest: null, max: 0 }) +console.log('Monitoring check passed: deterministic windows, statistics, missing samples, line/fill gaps, stack limits and disk capacities.') diff --git a/src/components/MonitoringChart.vue b/src/components/MonitoringChart.vue index 633bff4..a2e64a1 100644 --- a/src/components/MonitoringChart.vue +++ b/src/components/MonitoringChart.vue @@ -1,7 +1,7 @@