fix: account for HTTP/S traffic and separate network curves
This commit is contained in:
@@ -17,18 +17,18 @@ func TestMonitoringRecoversAfterMissingSamples(t *testing.T) {
|
||||
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"} {
|
||||
for _, key := range []string{"http4", "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"} {
|
||||
for _, key := range []string{"http4", "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")
|
||||
delete(history.Samples[499], "http4")
|
||||
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 {
|
||||
@@ -74,3 +74,37 @@ func TestMonitoringRecoversAfterMissingSamples(t *testing.T) {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonitoringDoesNotRelabelHTTPSOnlyHistory(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(), Samples: []map[string]float64{
|
||||
{"time": float64(now.Add(-time.Minute).UnixMilli()), "https4": 20, "rsync4": 3},
|
||||
{"time": float64(now.Add(-20 * time.Second).UnixMilli()), "http4": 3, "rsync4": 3},
|
||||
{"time": float64(now.Add(-10 * time.Second).UnixMilli()), "http4": 3, "rsync4": 3},
|
||||
}}
|
||||
raw, _ := json.Marshal(history)
|
||||
if err := os.WriteFile(path, raw, 0644); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
response := c.call("GET", "/api/v1/monitoring?hours=1", nil, false)
|
||||
status(t, response, 200)
|
||||
var result struct{ Panels []metricPanel }
|
||||
if err := json.Unmarshal(response.Body.Bytes(), &result); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
series := result.Panels[0].Series[0]
|
||||
if !result.Panels[0].Available || series.ID != "http4" || series.LabelKey != "monitor.series.http" || series.Values[0] != nil || series.Stats.Mean != 3 || series.Stats.Max != 3 {
|
||||
t.Fatal("HTTPS-only history was incorrectly presented as complete HTTP/S traffic")
|
||||
}
|
||||
for _, panel := range result.Panels[:2] {
|
||||
if panel.Stacked {
|
||||
t.Fatalf("%s must plot each protocol's actual rate independently", panel.ID)
|
||||
}
|
||||
}
|
||||
if result.Panels[0].Maximum != 5 {
|
||||
t.Fatal("network axis must use the largest individual rate, not their sum")
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user