Skip to content

Commit

Permalink
Don't skip metrics during startup in aggregate phase (#4230)
Browse files Browse the repository at this point in the history
  • Loading branch information
piotr1212 authored and danielnelson committed Jun 5, 2018
1 parent 92a8f79 commit dfe7b5e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 18 deletions.
37 changes: 19 additions & 18 deletions agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -362,24 +362,6 @@ func (a *Agent) Run(shutdown chan struct{}) error {
metricC := make(chan telegraf.Metric, 100)
aggC := make(chan telegraf.Metric, 100)

// Start all ServicePlugins
for _, input := range a.Config.Inputs {
input.SetDefaultTags(a.Config.Tags)
switch p := input.Input.(type) {
case telegraf.ServiceInput:
acc := NewAccumulator(input, metricC)
// Service input plugins should set their own precision of their
// metrics.
acc.SetPrecision(time.Nanosecond, 0)
if err := p.Start(acc); err != nil {
log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
input.Name(), err.Error())
return err
}
defer p.Stop()
}
}

// Round collection to nearest interval by sleeping
if a.Config.Agent.RoundInterval {
i := int64(a.Config.Agent.Interval.Duration)
Expand Down Expand Up @@ -419,6 +401,25 @@ func (a *Agent) Run(shutdown chan struct{}) error {
}(input, interval)
}

// Start all ServicePlugins inputs after all other
// plugins are loaded so that no metrics get dropped
for _, input := range a.Config.Inputs {
input.SetDefaultTags(a.Config.Tags)
switch p := input.Input.(type) {
case telegraf.ServiceInput:
acc := NewAccumulator(input, metricC)
// Service input plugins should set their own precision of their
// metrics.
acc.SetPrecision(time.Nanosecond, 0)
if err := p.Start(acc); err != nil {
log.Printf("E! Service for input %s failed to start, exiting\n%s\n",
input.Name(), err.Error())
return err
}
defer p.Stop()
}
}

wg.Wait()
a.Close()
return nil
Expand Down
2 changes: 2 additions & 0 deletions internal/models/running_aggregator.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package models

import (
"log"
"time"

"github.com/influxdata/telegraf"
Expand Down Expand Up @@ -153,6 +154,7 @@ func (r *RunningAggregator) Run(
m.Time().After(r.periodEnd.Add(truncation).Add(r.Config.Delay)) {
// the metric is outside the current aggregation period, so
// skip it.
log.Printf("D! aggregator: metric \"%s\" is not in the current timewindow, skipping", m.Name())
continue
}
r.add(m)
Expand Down

0 comments on commit dfe7b5e

Please sign in to comment.