RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add flush logging to aggregation groups

This commit is contained in:
Fabian Reinartz 2015-09-30 14:53:52 +02:00
parent 006939de12
commit 2b6d40c926
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dispatch.go
View File

@ -139,6 +139,8 @@ func (d *Dispatcher) processAlert(alert *types.Alert, opts *RouteOpts) {
ag = newAggrGroup(d.ctx, group, opts) ag = newAggrGroup(d.ctx, group, opts)
d.aggrGroups[fp] = ag d.aggrGroups[fp] = ag
ag.log = log.With("aggrGroup", ag)
go ag.run(func(ctx context.Context, alerts ...*types.Alert) bool { go ag.run(func(ctx context.Context, alerts ...*types.Alert) bool {
if err := d.notifier.Notify(ctx, alerts...); err != nil { if err := d.notifier.Notify(ctx, alerts...); err != nil {
log.Errorf("Notify for %d alerts failed: %s", len(alerts), err) log.Errorf("Notify for %d alerts failed: %s", len(alerts), err)
@ -157,6 +159,7 @@ func (d *Dispatcher) processAlert(alert *types.Alert, opts *RouteOpts) {
type aggrGroup struct { type aggrGroup struct {
labels model.LabelSet labels model.LabelSet
opts *RouteOpts opts *RouteOpts
log log.Logger
ctx context.Context ctx context.Context
cancel func() cancel func()
@ -181,7 +184,7 @@ func newAggrGroup(ctx context.Context, labels model.LabelSet, opts *RouteOpts) *
} }
func (ag *aggrGroup) String() string { func (ag *aggrGroup) String() string {
return fmt.Sprintf("%x", ag.fingerprint()) return fmt.Sprintf("%v", ag.fingerprint())
} }
func (ag *aggrGroup) run(nf notifyFunc) { func (ag *aggrGroup) run(nf notifyFunc) {
@ -268,6 +271,8 @@ func (ag *aggrGroup) flush(notify func(...*types.Alert) bool) {
ag.mtx.Unlock() ag.mtx.Unlock()
ag.log.Debugln("flushing", alertsSlice)
if notify(alertsSlice...) { if notify(alertsSlice...) {
ag.mtx.Lock() ag.mtx.Lock()
for fp, a := range alerts { for fp, a := range alerts {