From 9fcdb47faaae2d79ba640897db78a3296fb57f27 Mon Sep 17 00:00:00 2001 From: Felix Date: Tue, 6 Dec 2016 20:32:51 +0800 Subject: [PATCH] add GroupKey() to aggrGroup, add it to alerts/groups and use the function for context initialization --- dispatch/dispatch.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dispatch/dispatch.go b/dispatch/dispatch.go index e504922a44..4816bc4db6 100644 --- a/dispatch/dispatch.go +++ b/dispatch/dispatch.go @@ -86,8 +86,9 @@ type APIAlert struct { // AlertGroup is a list of alert blocks grouped by the same label set. type AlertGroup struct { - Labels model.LabelSet `json:"labels"` - Blocks []*AlertBlock `json:"blocks"` + Labels model.LabelSet `json:"labels"` + GroupKey uint64 `json:"groupKey"` + Blocks []*AlertBlock `json:"blocks"` } // AlertOverview is a representation of all active alerts in the system. @@ -111,6 +112,7 @@ func (d *Dispatcher) Groups() AlertOverview { alertGroup, ok := seen[ag.fingerprint()] if !ok { alertGroup = &AlertGroup{Labels: ag.labels} + alertGroup.GroupKey = ag.GroupKey() seen[ag.fingerprint()] = alertGroup overview = append(overview, alertGroup) @@ -329,7 +331,7 @@ func (ag *aggrGroup) run(nf notifyFunc) { ctx = notify.WithNow(ctx, now) // Populate context with information needed along the pipeline. - ctx = notify.WithGroupKey(ctx, ag.labels.Fingerprint()^ag.routeFP) + ctx = notify.WithGroupKey(ctx, model.Fingerprint(ag.GroupKey())) ctx = notify.WithGroupLabels(ctx, ag.labels) ctx = notify.WithReceiverName(ctx, ag.opts.Receiver) ctx = notify.WithRepeatInterval(ctx, ag.opts.RepeatInterval) @@ -362,6 +364,10 @@ func (ag *aggrGroup) fingerprint() model.Fingerprint { return ag.labels.Fingerprint() } +func (ag *aggrGroup) GroupKey() uint64 { + return uint64(ag.labels.Fingerprint() ^ ag.routeFP) +} + // insert inserts the alert into the aggregation group. If the aggregation group // is empty afterwards, it returns true. func (ag *aggrGroup) insert(alert *types.Alert) {