diff --git a/accumulator.go b/accumulator.go index 83f61ae99..c9ad54825 100644 --- a/accumulator.go +++ b/accumulator.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/influxdata/telegraf/internal/models" + imodels "github.com/influxdata/telegraf/internal/models" "github.com/influxdata/influxdb/client/v2" ) @@ -29,7 +29,7 @@ type Accumulator interface { } func NewAccumulator( - inputConfig *models.InputConfig, + inputConfig *imodels.InputConfig, points chan *client.Point, ) Accumulator { acc := accumulator{} @@ -47,7 +47,7 @@ type accumulator struct { debug bool - inputConfig *models.InputConfig + inputConfig *imodels.InputConfig prefix string } diff --git a/agent.go b/agent.go index d0f82145e..7097d5336 100644 --- a/agent.go +++ b/agent.go @@ -11,7 +11,7 @@ import ( "time" "github.com/influxdata/telegraf/internal/config" - "github.com/influxdata/telegraf/internal/models" + imodels "github.com/influxdata/telegraf/internal/models" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/outputs" @@ -102,7 +102,7 @@ func (a *Agent) gatherParallel(pointChan chan *client.Point) error { wg.Add(1) counter++ - go func(input *models.RunningInput) { + go func(input *imodels.RunningInput) { defer wg.Done() acc := NewAccumulator(input.Config, pointChan) @@ -145,7 +145,7 @@ func (a *Agent) gatherParallel(pointChan chan *client.Point) error { // reporting interval. func (a *Agent) gatherSeparate( shutdown chan struct{}, - input *models.RunningInput, + input *imodels.RunningInput, pointChan chan *client.Point, ) error { ticker := time.NewTicker(input.Config.Interval) @@ -234,7 +234,7 @@ func (a *Agent) flush() { wg.Add(len(a.Config.Outputs)) for _, o := range a.Config.Outputs { - go func(output *models.RunningOutput) { + go func(output *imodels.RunningOutput) { defer wg.Done() err := output.Write() if err != nil { @@ -341,7 +341,7 @@ func (a *Agent) Run(shutdown chan struct{}) error { // configured. Default intervals are handled below with gatherParallel if input.Config.Interval != 0 { wg.Add(1) - go func(input *models.RunningInput) { + go func(input *imodels.RunningInput) { defer wg.Done() if err := a.gatherSeparate(shutdown, input, pointChan); err != nil { log.Printf(err.Error()) diff --git a/internal/config/config.go b/internal/config/config.go index 5f97f8350..c2f0bb0be 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -11,7 +11,7 @@ import ( "time" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/internal/models" + imodels "github.com/influxdata/telegraf/internal/models" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/outputs" @@ -28,8 +28,8 @@ type Config struct { OutputFilters []string Agent *AgentConfig - Inputs []*models.RunningInput - Outputs []*models.RunningOutput + Inputs []*imodels.RunningInput + Outputs []*imodels.RunningOutput } func NewConfig() *Config { @@ -43,8 +43,8 @@ func NewConfig() *Config { }, Tags: make(map[string]string), - Inputs: make([]*models.RunningInput, 0), - Outputs: make([]*models.RunningOutput, 0), + Inputs: make([]*imodels.RunningInput, 0), + Outputs: make([]*imodels.RunningOutput, 0), InputFilters: make([]string, 0), OutputFilters: make([]string, 0), } @@ -402,7 +402,7 @@ func (c *Config) addOutput(name string, table *ast.Table) error { return err } - ro := models.NewRunningOutput(name, output, outputConfig) + ro := imodels.NewRunningOutput(name, output, outputConfig) if c.Agent.MetricBufferLimit > 0 { ro.PointBufferLimit = c.Agent.MetricBufferLimit } @@ -435,7 +435,7 @@ func (c *Config) addInput(name string, table *ast.Table) error { return err } - rp := &models.RunningInput{ + rp := &imodels.RunningInput{ Name: name, Input: input, Config: pluginConfig, @@ -445,10 +445,10 @@ func (c *Config) addInput(name string, table *ast.Table) error { } // buildFilter builds a Filter (tagpass/tagdrop/pass/drop) to -// be inserted into the models.OutputConfig/models.InputConfig to be used for prefix +// be inserted into the imodels.OutputConfig/imodels.InputConfig to be used for prefix // filtering on tags and measurements -func buildFilter(tbl *ast.Table) models.Filter { - f := models.Filter{} +func buildFilter(tbl *ast.Table) imodels.Filter { + f := imodels.Filter{} if node, ok := tbl.Fields["pass"]; ok { if kv, ok := node.(*ast.KeyValue); ok { @@ -480,7 +480,7 @@ func buildFilter(tbl *ast.Table) models.Filter { if subtbl, ok := node.(*ast.Table); ok { for name, val := range subtbl.Fields { if kv, ok := val.(*ast.KeyValue); ok { - tagfilter := &models.TagFilter{Name: name} + tagfilter := &imodels.TagFilter{Name: name} if ary, ok := kv.Value.(*ast.Array); ok { for _, elem := range ary.Value { if str, ok := elem.(*ast.String); ok { @@ -499,7 +499,7 @@ func buildFilter(tbl *ast.Table) models.Filter { if subtbl, ok := node.(*ast.Table); ok { for name, val := range subtbl.Fields { if kv, ok := val.(*ast.KeyValue); ok { - tagfilter := &models.TagFilter{Name: name} + tagfilter := &imodels.TagFilter{Name: name} if ary, ok := kv.Value.(*ast.Array); ok { for _, elem := range ary.Value { if str, ok := elem.(*ast.String); ok { @@ -523,9 +523,9 @@ func buildFilter(tbl *ast.Table) models.Filter { // buildInput parses input specific items from the ast.Table, // builds the filter and returns a -// models.InputConfig to be inserted into models.RunningInput -func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) { - cp := &models.InputConfig{Name: name} +// imodels.InputConfig to be inserted into imodels.RunningInput +func buildInput(name string, tbl *ast.Table) (*imodels.InputConfig, error) { + cp := &imodels.InputConfig{Name: name} if node, ok := tbl.Fields["interval"]; ok { if kv, ok := node.(*ast.KeyValue); ok { if str, ok := kv.Value.(*ast.String); ok { @@ -582,10 +582,10 @@ func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) { } // buildOutput parses output specific items from the ast.Table, builds the filter and returns an -// models.OutputConfig to be inserted into models.RunningInput +// imodels.OutputConfig to be inserted into imodels.RunningInput // Note: error exists in the return for future calls that might require error -func buildOutput(name string, tbl *ast.Table) (*models.OutputConfig, error) { - oc := &models.OutputConfig{ +func buildOutput(name string, tbl *ast.Table) (*imodels.OutputConfig, error) { + oc := &imodels.OutputConfig{ Name: name, Filter: buildFilter(tbl), } diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 92f45ad0a..fbf3aec00 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/influxdata/telegraf/internal/models" + imodels "github.com/influxdata/telegraf/internal/models" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs/exec" "github.com/influxdata/telegraf/plugins/inputs/memcached" @@ -19,19 +19,19 @@ func TestConfig_LoadSingleInput(t *testing.T) { memcached := inputs.Inputs["memcached"]().(*memcached.Memcached) memcached.Servers = []string{"localhost"} - mConfig := &models.InputConfig{ + mConfig := &imodels.InputConfig{ Name: "memcached", - Filter: models.Filter{ + Filter: imodels.Filter{ Drop: []string{"other", "stuff"}, Pass: []string{"some", "strings"}, - TagDrop: []models.TagFilter{ - models.TagFilter{ + TagDrop: []imodels.TagFilter{ + imodels.TagFilter{ Name: "badtag", Filter: []string{"othertag"}, }, }, - TagPass: []models.TagFilter{ - models.TagFilter{ + TagPass: []imodels.TagFilter{ + imodels.TagFilter{ Name: "goodtag", Filter: []string{"mytag"}, }, @@ -62,19 +62,19 @@ func TestConfig_LoadDirectory(t *testing.T) { memcached := inputs.Inputs["memcached"]().(*memcached.Memcached) memcached.Servers = []string{"localhost"} - mConfig := &models.InputConfig{ + mConfig := &imodels.InputConfig{ Name: "memcached", - Filter: models.Filter{ + Filter: imodels.Filter{ Drop: []string{"other", "stuff"}, Pass: []string{"some", "strings"}, - TagDrop: []models.TagFilter{ - models.TagFilter{ + TagDrop: []imodels.TagFilter{ + imodels.TagFilter{ Name: "badtag", Filter: []string{"othertag"}, }, }, - TagPass: []models.TagFilter{ - models.TagFilter{ + TagPass: []imodels.TagFilter{ + imodels.TagFilter{ Name: "goodtag", Filter: []string{"mytag"}, }, @@ -92,7 +92,7 @@ func TestConfig_LoadDirectory(t *testing.T) { ex := inputs.Inputs["exec"]().(*exec.Exec) ex.Command = "/usr/bin/myothercollector --foo=bar" - eConfig := &models.InputConfig{ + eConfig := &imodels.InputConfig{ Name: "exec", MeasurementSuffix: "_myothercollector", } @@ -111,7 +111,7 @@ func TestConfig_LoadDirectory(t *testing.T) { pstat := inputs.Inputs["procstat"]().(*procstat.Procstat) pstat.PidFile = "/var/run/grafana-server.pid" - pConfig := &models.InputConfig{Name: "procstat"} + pConfig := &imodels.InputConfig{Name: "procstat"} pConfig.Tags = make(map[string]string) assert.Equal(t, pstat, c.Inputs[3].Input,