From d3bb1e70100919b720e4478ee6b9b59201c2e71c Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Thu, 28 Jul 2016 12:31:11 +0100
Subject: [PATCH] Rename internal_models package to models
---
agent/accumulator.go | 4 +--
agent/accumulator_test.go | 36 +++++++++++------------
agent/agent.go | 10 +++----
internal/config/config.go | 34 +++++++++++-----------
internal/config/config_test.go | 40 +++++++++++++-------------
internal/models/filter.go | 2 +-
internal/models/filter_test.go | 2 +-
internal/models/running_input.go | 2 +-
internal/models/running_output.go | 2 +-
internal/models/running_output_test.go | 2 +-
10 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/agent/accumulator.go b/agent/accumulator.go
index d80affe6..f6863b74 100644
--- a/agent/accumulator.go
+++ b/agent/accumulator.go
@@ -12,7 +12,7 @@ import (
)
func NewAccumulator(
- inputConfig *internal_models.InputConfig,
+ inputConfig *models.InputConfig,
metrics chan telegraf.Metric,
) *accumulator {
acc := accumulator{}
@@ -31,7 +31,7 @@ type accumulator struct {
// print every point added to the accumulator
trace bool
- inputConfig *internal_models.InputConfig
+ inputConfig *models.InputConfig
precision time.Duration
diff --git a/agent/accumulator_test.go b/agent/accumulator_test.go
index 8618d327..4dd69985 100644
--- a/agent/accumulator_test.go
+++ b/agent/accumulator_test.go
@@ -21,7 +21,7 @@ func TestAdd(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.Add("acctest", float64(101), map[string]string{})
a.Add("acctest", float64(101), map[string]string{"acc": "test"})
@@ -47,7 +47,7 @@ func TestAddNoPrecisionWithInterval(t *testing.T) {
now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.SetPrecision(0, time.Second)
a.Add("acctest", float64(101), map[string]string{})
@@ -74,7 +74,7 @@ func TestAddNoIntervalWithPrecision(t *testing.T) {
now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.SetPrecision(time.Second, time.Millisecond)
a.Add("acctest", float64(101), map[string]string{})
@@ -101,7 +101,7 @@ func TestAddDisablePrecision(t *testing.T) {
now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.SetPrecision(time.Second, time.Millisecond)
a.DisablePrecision()
@@ -129,7 +129,7 @@ func TestDifferentPrecisions(t *testing.T) {
now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.SetPrecision(0, time.Second)
a.Add("acctest", float64(101), map[string]string{"acc": "test"}, now)
@@ -170,7 +170,7 @@ func TestAddDefaultTags(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.Add("acctest", float64(101), map[string]string{})
a.Add("acctest", float64(101), map[string]string{"acc": "test"})
@@ -196,7 +196,7 @@ func TestAddFields(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
fields := map[string]interface{}{
"usage": float64(99),
@@ -229,7 +229,7 @@ func TestAddInfFields(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
fields := map[string]interface{}{
"usage": inf,
@@ -257,7 +257,7 @@ func TestAddNaNFields(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
fields := map[string]interface{}{
"usage": nan,
@@ -281,7 +281,7 @@ func TestAddUint64Fields(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
fields := map[string]interface{}{
"usage": uint64(99),
@@ -310,7 +310,7 @@ func TestAddUint64Overflow(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
fields := map[string]interface{}{
"usage": uint64(9223372036854775808),
@@ -340,7 +340,7 @@ func TestAddInts(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.Add("acctest", int(101), map[string]string{})
a.Add("acctest", int32(101), map[string]string{"acc": "test"})
@@ -367,7 +367,7 @@ func TestAddFloats(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.Add("acctest", float32(101), map[string]string{"acc": "test"})
a.Add("acctest", float64(101), map[string]string{"acc": "test"}, now)
@@ -389,7 +389,7 @@ func TestAddStrings(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.Add("acctest", "test", map[string]string{"acc": "test"})
a.Add("acctest", "foo", map[string]string{"acc": "test"}, now)
@@ -411,7 +411,7 @@ func TestAddBools(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.Add("acctest", true, map[string]string{"acc": "test"})
a.Add("acctest", false, map[string]string{"acc": "test"}, now)
@@ -433,11 +433,11 @@ func TestAccFilterTags(t *testing.T) {
now := time.Now()
a.metrics = make(chan telegraf.Metric, 10)
defer close(a.metrics)
- filter := internal_models.Filter{
+ filter := models.Filter{
TagExclude: []string{"acc"},
}
assert.NoError(t, filter.CompileFilter())
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.inputConfig.Filter = filter
a.Add("acctest", float64(101), map[string]string{})
@@ -465,7 +465,7 @@ func TestAccAddError(t *testing.T) {
defer log.SetOutput(os.Stderr)
a := accumulator{}
- a.inputConfig = &internal_models.InputConfig{}
+ a.inputConfig = &models.InputConfig{}
a.inputConfig.Name = "mock_plugin"
a.AddError(fmt.Errorf("foo"))
diff --git a/agent/agent.go b/agent/agent.go
index 5ee73512..d86037e7 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -88,7 +88,7 @@ func (a *Agent) Close() error {
return err
}
-func panicRecover(input *internal_models.RunningInput) {
+func panicRecover(input *models.RunningInput) {
if err := recover(); err != nil {
trace := make([]byte, 2048)
runtime.Stack(trace, true)
@@ -104,7 +104,7 @@ func panicRecover(input *internal_models.RunningInput) {
// reporting interval.
func (a *Agent) gatherer(
shutdown chan struct{},
- input *internal_models.RunningInput,
+ input *models.RunningInput,
interval time.Duration,
metricC chan telegraf.Metric,
) error {
@@ -152,7 +152,7 @@ func (a *Agent) gatherer(
// over.
func gatherWithTimeout(
shutdown chan struct{},
- input *internal_models.RunningInput,
+ input *models.RunningInput,
acc *accumulator,
timeout time.Duration,
) {
@@ -240,7 +240,7 @@ func (a *Agent) flush() {
wg.Add(len(a.Config.Outputs))
for _, o := range a.Config.Outputs {
- go func(output *internal_models.RunningOutput) {
+ go func(output *models.RunningOutput) {
defer wg.Done()
err := output.Write()
if err != nil {
@@ -351,7 +351,7 @@ func (a *Agent) Run(shutdown chan struct{}) error {
if input.Config.Interval != 0 {
interval = input.Config.Interval
}
- go func(in *internal_models.RunningInput, interv time.Duration) {
+ go func(in *models.RunningInput, interv time.Duration) {
defer wg.Done()
if err := a.gatherer(shutdown, in, interv, metricC); err != nil {
log.Printf(err.Error())
diff --git a/internal/config/config.go b/internal/config/config.go
index 6823181e..0de91277 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -47,8 +47,8 @@ type Config struct {
OutputFilters []string
Agent *AgentConfig
- Inputs []*internal_models.RunningInput
- Outputs []*internal_models.RunningOutput
+ Inputs []*models.RunningInput
+ Outputs []*models.RunningOutput
}
func NewConfig() *Config {
@@ -61,8 +61,8 @@ func NewConfig() *Config {
},
Tags: make(map[string]string),
- Inputs: make([]*internal_models.RunningInput, 0),
- Outputs: make([]*internal_models.RunningOutput, 0),
+ Inputs: make([]*models.RunningInput, 0),
+ Outputs: make([]*models.RunningOutput, 0),
InputFilters: make([]string, 0),
OutputFilters: make([]string, 0),
}
@@ -598,7 +598,7 @@ func (c *Config) addOutput(name string, table *ast.Table) error {
return err
}
- ro := internal_models.NewRunningOutput(name, output, outputConfig,
+ ro := models.NewRunningOutput(name, output, outputConfig,
c.Agent.MetricBatchSize, c.Agent.MetricBufferLimit)
c.Outputs = append(c.Outputs, ro)
return nil
@@ -639,7 +639,7 @@ func (c *Config) addInput(name string, table *ast.Table) error {
return err
}
- rp := &internal_models.RunningInput{
+ rp := &models.RunningInput{
Name: name,
Input: input,
Config: pluginConfig,
@@ -650,10 +650,10 @@ func (c *Config) addInput(name string, table *ast.Table) error {
// buildFilter builds a Filter
// (tagpass/tagdrop/namepass/namedrop/fieldpass/fielddrop) to
-// be inserted into the internal_models.OutputConfig/internal_models.InputConfig
+// be inserted into the models.OutputConfig/models.InputConfig
// to be used for glob filtering on tags and measurements
-func buildFilter(tbl *ast.Table) (internal_models.Filter, error) {
- f := internal_models.Filter{}
+func buildFilter(tbl *ast.Table) (models.Filter, error) {
+ f := models.Filter{}
if node, ok := tbl.Fields["namepass"]; ok {
if kv, ok := node.(*ast.KeyValue); ok {
@@ -717,7 +717,7 @@ func buildFilter(tbl *ast.Table) (internal_models.Filter, error) {
if subtbl, ok := node.(*ast.Table); ok {
for name, val := range subtbl.Fields {
if kv, ok := val.(*ast.KeyValue); ok {
- tagfilter := &internal_models.TagFilter{Name: name}
+ tagfilter := &models.TagFilter{Name: name}
if ary, ok := kv.Value.(*ast.Array); ok {
for _, elem := range ary.Value {
if str, ok := elem.(*ast.String); ok {
@@ -736,7 +736,7 @@ func buildFilter(tbl *ast.Table) (internal_models.Filter, error) {
if subtbl, ok := node.(*ast.Table); ok {
for name, val := range subtbl.Fields {
if kv, ok := val.(*ast.KeyValue); ok {
- tagfilter := &internal_models.TagFilter{Name: name}
+ tagfilter := &models.TagFilter{Name: name}
if ary, ok := kv.Value.(*ast.Array); ok {
for _, elem := range ary.Value {
if str, ok := elem.(*ast.String); ok {
@@ -793,9 +793,9 @@ func buildFilter(tbl *ast.Table) (internal_models.Filter, error) {
// buildInput parses input specific items from the ast.Table,
// builds the filter and returns a
-// internal_models.InputConfig to be inserted into internal_models.RunningInput
-func buildInput(name string, tbl *ast.Table) (*internal_models.InputConfig, error) {
- cp := &internal_models.InputConfig{Name: name}
+// models.InputConfig to be inserted into models.RunningInput
+func buildInput(name string, tbl *ast.Table) (*models.InputConfig, error) {
+ cp := &models.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 {
@@ -969,14 +969,14 @@ func buildSerializer(name string, tbl *ast.Table) (serializers.Serializer, error
// buildOutput parses output specific items from the ast.Table,
// builds the filter and returns an
-// internal_models.OutputConfig to be inserted into internal_models.RunningInput
+// models.OutputConfig to be inserted into models.RunningInput
// Note: error exists in the return for future calls that might require error
-func buildOutput(name string, tbl *ast.Table) (*internal_models.OutputConfig, error) {
+func buildOutput(name string, tbl *ast.Table) (*models.OutputConfig, error) {
filter, err := buildFilter(tbl)
if err != nil {
return nil, err
}
- oc := &internal_models.OutputConfig{
+ oc := &models.OutputConfig{
Name: name,
Filter: filter,
}
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 1659cd6e..cb8c9192 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -26,19 +26,19 @@ func TestConfig_LoadSingleInputWithEnvVars(t *testing.T) {
memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
memcached.Servers = []string{"192.168.1.1"}
- filter := internal_models.Filter{
+ filter := models.Filter{
NameDrop: []string{"metricname2"},
NamePass: []string{"metricname1"},
FieldDrop: []string{"other", "stuff"},
FieldPass: []string{"some", "strings"},
- TagDrop: []internal_models.TagFilter{
- internal_models.TagFilter{
+ TagDrop: []models.TagFilter{
+ models.TagFilter{
Name: "badtag",
Filter: []string{"othertag"},
},
},
- TagPass: []internal_models.TagFilter{
- internal_models.TagFilter{
+ TagPass: []models.TagFilter{
+ models.TagFilter{
Name: "goodtag",
Filter: []string{"mytag"},
},
@@ -46,7 +46,7 @@ func TestConfig_LoadSingleInputWithEnvVars(t *testing.T) {
IsActive: true,
}
assert.NoError(t, filter.CompileFilter())
- mConfig := &internal_models.InputConfig{
+ mConfig := &models.InputConfig{
Name: "memcached",
Filter: filter,
Interval: 10 * time.Second,
@@ -66,19 +66,19 @@ func TestConfig_LoadSingleInput(t *testing.T) {
memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
memcached.Servers = []string{"localhost"}
- filter := internal_models.Filter{
+ filter := models.Filter{
NameDrop: []string{"metricname2"},
NamePass: []string{"metricname1"},
FieldDrop: []string{"other", "stuff"},
FieldPass: []string{"some", "strings"},
- TagDrop: []internal_models.TagFilter{
- internal_models.TagFilter{
+ TagDrop: []models.TagFilter{
+ models.TagFilter{
Name: "badtag",
Filter: []string{"othertag"},
},
},
- TagPass: []internal_models.TagFilter{
- internal_models.TagFilter{
+ TagPass: []models.TagFilter{
+ models.TagFilter{
Name: "goodtag",
Filter: []string{"mytag"},
},
@@ -86,7 +86,7 @@ func TestConfig_LoadSingleInput(t *testing.T) {
IsActive: true,
}
assert.NoError(t, filter.CompileFilter())
- mConfig := &internal_models.InputConfig{
+ mConfig := &models.InputConfig{
Name: "memcached",
Filter: filter,
Interval: 5 * time.Second,
@@ -113,19 +113,19 @@ func TestConfig_LoadDirectory(t *testing.T) {
memcached := inputs.Inputs["memcached"]().(*memcached.Memcached)
memcached.Servers = []string{"localhost"}
- filter := internal_models.Filter{
+ filter := models.Filter{
NameDrop: []string{"metricname2"},
NamePass: []string{"metricname1"},
FieldDrop: []string{"other", "stuff"},
FieldPass: []string{"some", "strings"},
- TagDrop: []internal_models.TagFilter{
- internal_models.TagFilter{
+ TagDrop: []models.TagFilter{
+ models.TagFilter{
Name: "badtag",
Filter: []string{"othertag"},
},
},
- TagPass: []internal_models.TagFilter{
- internal_models.TagFilter{
+ TagPass: []models.TagFilter{
+ models.TagFilter{
Name: "goodtag",
Filter: []string{"mytag"},
},
@@ -133,7 +133,7 @@ func TestConfig_LoadDirectory(t *testing.T) {
IsActive: true,
}
assert.NoError(t, filter.CompileFilter())
- mConfig := &internal_models.InputConfig{
+ mConfig := &models.InputConfig{
Name: "memcached",
Filter: filter,
Interval: 5 * time.Second,
@@ -150,7 +150,7 @@ func TestConfig_LoadDirectory(t *testing.T) {
assert.NoError(t, err)
ex.SetParser(p)
ex.Command = "/usr/bin/myothercollector --foo=bar"
- eConfig := &internal_models.InputConfig{
+ eConfig := &models.InputConfig{
Name: "exec",
MeasurementSuffix: "_myothercollector",
}
@@ -169,7 +169,7 @@ func TestConfig_LoadDirectory(t *testing.T) {
pstat := inputs.Inputs["procstat"]().(*procstat.Procstat)
pstat.PidFile = "/var/run/grafana-server.pid"
- pConfig := &internal_models.InputConfig{Name: "procstat"}
+ pConfig := &models.InputConfig{Name: "procstat"}
pConfig.Tags = make(map[string]string)
assert.Equal(t, pstat, c.Inputs[3].Input,
diff --git a/internal/models/filter.go b/internal/models/filter.go
index ac24ec66..9ad4c004 100644
--- a/internal/models/filter.go
+++ b/internal/models/filter.go
@@ -1,4 +1,4 @@
-package internal_models
+package models
import (
"fmt"
diff --git a/internal/models/filter_test.go b/internal/models/filter_test.go
index 454f10c4..497d0853 100644
--- a/internal/models/filter_test.go
+++ b/internal/models/filter_test.go
@@ -1,4 +1,4 @@
-package internal_models
+package models
import (
"testing"
diff --git a/internal/models/running_input.go b/internal/models/running_input.go
index cffaf336..445c5ee9 100644
--- a/internal/models/running_input.go
+++ b/internal/models/running_input.go
@@ -1,4 +1,4 @@
-package internal_models
+package models
import (
"time"
diff --git a/internal/models/running_output.go b/internal/models/running_output.go
index 42025912..82a6885d 100644
--- a/internal/models/running_output.go
+++ b/internal/models/running_output.go
@@ -1,4 +1,4 @@
-package internal_models
+package models
import (
"log"
diff --git a/internal/models/running_output_test.go b/internal/models/running_output_test.go
index d9238c5a..a552629e 100644
--- a/internal/models/running_output_test.go
+++ b/internal/models/running_output_test.go
@@ -1,4 +1,4 @@
-package internal_models
+package models
import (
"fmt"
--
GitLab