dom/telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace outputs.Output with models.Output

Browse Source
This commit is contained in:
Cameron Sparr
2016-01-25 16:14:06 -07:00
parent 1e98823c61
commit a86d98fec0
37 changed files with 208 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/outputs/librato/librato.go
View File

@@ -7,8 +7,8 @@ import (
"log"
"net/http"
"github.com/influxdata/influxdb/client/v2"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/models"
"github.com/influxdata/telegraf/plugins/outputs"
)
@@ -69,7 +69,7 @@ func (l *Librato) Connect() error {
return nil
}
func (l *Librato) Write(points []*client.Point) error {
func (l *Librato) Write(points []models.Metric) error {
if len(points) == 0 {
return nil
}
@@ -122,7 +122,7 @@ func (l *Librato) Description() string {
return "Configuration for Librato API to send metrics to."
}
func (l *Librato) buildGauges(pt *client.Point) ([]*Gauge, error) {
func (l *Librato) buildGauges(pt models.Metric) ([]*Gauge, error) {
gauges := []*Gauge{}
for fieldName, value := range pt.Fields() {
gauge := &Gauge{
@@ -169,7 +169,7 @@ func (l *Librato) Close() error {
}
func init() {
outputs.Add("librato", func() outputs.Output {
outputs.Add("librato", func() models.Output {
return NewLibrato(librato_api)
})
}

14
plugins/outputs/librato/librato_test.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/influxdata/telegraf/testutil"
"github.com/influxdata/influxdb/client/v2"
"github.com/influxdata/telegraf/models"
"github.com/stretchr/testify/require"
)
@@ -39,7 +39,7 @@ func TestUriOverride(t *testing.T) {
l.ApiToken = "123456"
err := l.Connect()
require.NoError(t, err)
err = l.Write(testutil.MockBatchPoints().Points())
err = l.Write(testutil.MockBatchPoints())
require.NoError(t, err)
}
@@ -61,7 +61,7 @@ func TestBadStatusCode(t *testing.T) {
l.ApiToken = "123456"
err := l.Connect()
require.NoError(t, err)
err = l.Write(testutil.MockBatchPoints().Points())
err = l.Write(testutil.MockBatchPoints())
if err == nil {
t.Errorf("error expected but none returned")
} else {
@@ -71,7 +71,7 @@ func TestBadStatusCode(t *testing.T) {
func TestBuildGauge(t *testing.T) {
var gaugeTests = []struct {
ptIn *client.Point
ptIn models.Metric
outGauge *Gauge
err error
}{
@@ -161,20 +161,20 @@ func TestBuildGauge(t *testing.T) {
}
func TestBuildGaugeWithSource(t *testing.T) {
pt1, _ := client.NewPoint(
pt1, _ := models.NewMetric(
"test1",
map[string]string{"hostname": "192.168.0.1"},
map[string]interface{}{"value": 0.0},
time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
)
pt2, _ := client.NewPoint(
pt2, _ := models.NewMetric(
"test2",
map[string]string{"hostnam": "192.168.0.1"},
map[string]interface{}{"value": 1.0},
time.Date(2010, time.December, 10, 23, 0, 0, 0, time.UTC),
)
var gaugeTests = []struct {
ptIn *client.Point
ptIn models.Metric
outGauge *Gauge
err error
}{