* package internal
#+BEGIN_SRC sh :results raw
fst=../vendor/github.com/influxdata/telegraf/internal
snd=.
(diff --unified --ignore-all-space --recursive \
"$fst"/../agent \
"$snd"/agent;
diff --unified --ignore-all-space --recursive \
"$fst" \
"$snd") |
awk '{ if ($1 == "---" || $1 == "+++") { $_ = $1 FS $2; }; print }'
#+END_SRC
#+BEGIN_SRC diff
#+RESULTS:
diff --unified --ignore-all-space --recursive ../vendor/github.com/influxdata/telegraf/internal/../agent/accumulator.go ./agent/accumulator.go
--- ../vendor/github.com/influxdata/telegraf/internal/../agent/accumulator.go
+++ ./agent/accumulator.go
@@ -8,7 +8,8 @@
"time"
"github.com/influxdata/telegraf"
- "github.com/influxdata/telegraf/internal/models"
+
+ "github.com/ostrost/ostent/internal/models"
)
func NewAccumulator(
Only in ../vendor/github.com/influxdata/telegraf/internal/../agent: accumulator_test.go
diff --unified --ignore-all-space --recursive ../vendor/github.com/influxdata/telegraf/internal/../agent/agent.go ./agent/agent.go
--- ../vendor/github.com/influxdata/telegraf/internal/../agent/agent.go
+++ ./agent/agent.go
@@ -9,9 +9,10 @@
"time"
"github.com/influxdata/telegraf"
- "github.com/influxdata/telegraf/internal"
- "github.com/influxdata/telegraf/internal/config"
- "github.com/influxdata/telegraf/internal/models"
+
+ "github.com/ostrost/ostent/internal"
+ "github.com/ostrost/ostent/internal/config"
+ "github.com/ostrost/ostent/internal/models"
)
// Agent runs telegraf and collects data based on the given config
@@ -268,7 +269,6 @@
a.flush()
return nil
case <-ticker.C:
- internal.RandomSleep(a.Config.Agent.FlushJitter.Duration, shutdown)
a.flush()
case m := <-metricC:
for i, o := range a.Config.Outputs {
Only in ../vendor/github.com/influxdata/telegraf/internal/../agent: agent_test.go
Only in .: README.org
Only in .: agent
Only in ../vendor/github.com/influxdata/telegraf/internal/buffer: buffer_test.go
Only in ../vendor/github.com/influxdata/telegraf/internal/config: aws
diff --unified --ignore-all-space --recursive ../vendor/github.com/influxdata/telegraf/internal/config/config.go ./config/config.go
--- ../vendor/github.com/influxdata/telegraf/internal/config/config.go
+++ ./config/config.go
@@ -15,18 +15,22 @@
"time"
"github.com/influxdata/telegraf"
- "github.com/influxdata/telegraf/internal"
- "github.com/influxdata/telegraf/internal/models"
"github.com/influxdata/telegraf/plugins/inputs"
"github.com/influxdata/telegraf/plugins/outputs"
"github.com/influxdata/telegraf/plugins/parsers"
"github.com/influxdata/telegraf/plugins/serializers"
- "github.com/influxdata/config"
"github.com/influxdata/toml"
"github.com/influxdata/toml/ast"
+
+ "github.com/ostrost/ostent/internal"
+ "github.com/ostrost/ostent/internal/models"
)
+var config = struct {
+ UnmarshalTable func(*ast.Table, interface{}) error
+}{UnmarshalTable: toml.UnmarshalTable}
+
var (
// Default input plugins
inputDefaults = []string{"cpu", "mem", "swap", "system", "kernel",
@@ -71,6 +75,11 @@
}
type AgentConfig struct {
+ // Bind is server bind address
+ Bind string
+ // BindPort is server bind port
+ BindPort int
+
// Interval at which to gather information
Interval internal.Duration
@@ -461,6 +470,12 @@
return fmt.Errorf("Error parsing %s, %s", path, err)
}
+ return c.LoadTable(path, tbl)
+}
+
+func (c *Config) LoadTable(path string, tbl *ast.Table) error {
+ var err error
+
// Parse tags tables first:
for _, tableName := range []string{"tags", "global_tags"} {
if val, ok := tbl.Fields[tableName]; ok {
@@ -558,6 +573,10 @@
if err != nil {
return nil, err
}
+ return ParseContents(contents)
+}
+
+func ParseContents(contents []byte) (*ast.Table, error) {
// ugh windows why
contents = trimBOM(contents)
@@ -590,6 +609,9 @@
if err != nil {
return err
}
+ if serializer == nil {
+ return fmt.Errorf("Serializer is nil")
+ }
t.SetSerializer(serializer)
}
Only in ../vendor/github.com/influxdata/telegraf/internal/config: config_test.go
Only in ../vendor/github.com/influxdata/telegraf/internal/config: testdata
Only in ../vendor/github.com/influxdata/telegraf/internal: errchan
Only in ../vendor/github.com/influxdata/telegraf/internal: globpath
diff --unified --ignore-all-space --recursive ../vendor/github.com/influxdata/telegraf/internal/internal.go ./internal.go
--- ../vendor/github.com/influxdata/telegraf/internal/internal.go
+++ ./internal.go
@@ -32,6 +32,11 @@
Duration time.Duration
}
+// MarshalTOML is for toml.Marshaler interface.
+func (d Duration) MarshalTOML() ([]byte, error) {
+ return []byte(fmt.Sprintf("%q", d.Duration)), nil
+}
+
// UnmarshalTOML parses the duration from the TOML config file
func (d *Duration) UnmarshalTOML(b []byte) error {
var err error
Only in ../vendor/github.com/influxdata/telegraf/internal: internal_test.go
Only in ../vendor/github.com/influxdata/telegraf/internal: limiter
Only in ../vendor/github.com/influxdata/telegraf/internal/models: filter_test.go
diff --unified --ignore-all-space --recursive ../vendor/github.com/influxdata/telegraf/internal/models/running_output.go ./models/running_output.go
--- ../vendor/github.com/influxdata/telegraf/internal/models/running_output.go
+++ ./models/running_output.go
@@ -5,7 +5,8 @@
"time"
"github.com/influxdata/telegraf"
- "github.com/influxdata/telegraf/internal/buffer"
+
+ "github.com/ostrost/ostent/internal/buffer"
)
const (
Only in ../vendor/github.com/influxdata/telegraf/internal/models: running_output_test.go
Only in .: plugins
#+END_SRC