ipng/nginx-logtail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pin fine/coarse mergeDump to the 1min/5min boundary, fixes sparkline

Browse Source
This commit is contained in:
Pim van Pelt
2026-03-25 18:14:20 +01:00
parent d0fb34160f
commit 6c3a28c9ce
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/aggregator/backfill.go
View File

@@ -58,8 +58,8 @@ func Backfill(ctx context.Context, collectorAddrs []string, cache *Cache) {
for range collectorAddrs { for range collectorAddrs {
r := <-ch r := <-ch
mergeDump(r.fine, fineByTS) mergeDump(r.fine, fineByTS, time.Minute)
mergeDump(r.coarse, coarseByTS) mergeDump(r.coarse, coarseByTS, 5*time.Minute)
} }
mergeStart := time.Now() mergeStart := time.Now()
@@ -114,9 +114,10 @@ func dumpCollector(ctx context.Context, addr string) (fine, coarse []st.Snapshot
// mergeDump adds all snapshots from one collector's dump into the per-timestamp // mergeDump adds all snapshots from one collector's dump into the per-timestamp
// accumulator map. Multiple collectors' entries for the same timestamp are summed. // accumulator map. Multiple collectors' entries for the same timestamp are summed.
func mergeDump(snaps []st.Snapshot, byTS map[int64]map[string]int64) { // granularity should match the ring bucket size (time.Minute for fine, 5*time.Minute for coarse).
func mergeDump(snaps []st.Snapshot, byTS map[int64]map[string]int64, granularity time.Duration) {
for _, snap := range snaps { for _, snap := range snaps {
ts := snap.Timestamp.Unix() ts := snap.Timestamp.Truncate(granularity).Unix()
m := byTS[ts] m := byTS[ts]
if m == nil { if m == nil {
m = make(map[string]int64, len(snap.Entries)) m = make(map[string]int64, len(snap.Entries))