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

Use alias name in output metric buffer stats

Browse Source
This commit is contained in:
Daniel Nelson
2019-08-21 18:02:51 -07:00
parent 3cdc6c32dd
commit 94f68c06d7
8 changed files with 73 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/outputs/influxdb/http.go
View File

@@ -100,7 +100,7 @@ type HTTPConfig struct {
InfluxUintSupport bool `toml:"influx_uint_support"`
Serializer *influx.Serializer
log telegraf.Logger
Log telegraf.Logger
}
type httpClient struct {
@@ -176,7 +176,7 @@ func NewHTTPClient(config HTTPConfig) (*httpClient, error) {
},
createdDatabases: make(map[string]bool),
config: config,
log: config.log,
log: config.Log,
}
return client, nil
}
@@ -186,10 +186,6 @@ func (c *httpClient) URL() string {
return c.config.URL.String()
}
func (c *httpClient) SetLogger(log telegraf.Logger) {
c.log = log
}
// Database returns the default database that this client connects too.
func (c *httpClient) Database() string {
return c.config.Database

17
plugins/outputs/influxdb/http_test.go
View File

@@ -262,6 +262,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, r.FormValue("db"), "telegraf")
@@ -278,6 +279,7 @@ func TestHTTP_Write(t *testing.T) {
Database: "telegraf",
Username: "guy",
Password: "smiley",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
username, password, ok := r.BasicAuth()
@@ -293,6 +295,7 @@ func TestHTTP_Write(t *testing.T) {
URL: u,
Database: "telegraf",
UserAgent: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, r.Header.Get("User-Agent"), "telegraf")
@@ -304,6 +307,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, r.Header.Get("User-Agent"), "Telegraf/1.2.3")
@@ -314,6 +318,7 @@ func TestHTTP_Write(t *testing.T) {
name: "default database",
config: influxdb.HTTPConfig{
URL: u,
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, "telegraf", r.FormValue("db"))
@@ -328,6 +333,7 @@ func TestHTTP_Write(t *testing.T) {
"A": "B",
"C": "D",
},
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, r.Header.Get("A"), "B")
@@ -341,6 +347,7 @@ func TestHTTP_Write(t *testing.T) {
URL: u,
Database: "telegraf",
RetentionPolicy: "foo",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, "foo", r.FormValue("rp"))
@@ -353,6 +360,7 @@ func TestHTTP_Write(t *testing.T) {
URL: u,
Database: "telegraf",
Consistency: "all",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, "all", r.FormValue("consistency"))
@@ -364,6 +372,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadRequest)
@@ -378,6 +387,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadRequest)
@@ -392,6 +402,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadRequest)
@@ -406,6 +417,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusBadGateway)
@@ -423,6 +435,7 @@ func TestHTTP_Write(t *testing.T) {
config: influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusServiceUnavailable)
@@ -472,7 +485,6 @@ func TestHTTP_Write(t *testing.T) {
client, err := influxdb.NewHTTPClient(tt.config)
require.NoError(t, err)
client.SetLogger(testutil.Logger{})
err = client.Write(ctx, metrics)
if tt.errFunc != nil {
tt.errFunc(t, err)
@@ -525,6 +537,7 @@ func TestHTTP_WritePathPrefix(t *testing.T) {
config := influxdb.HTTPConfig{
URL: u,
Database: "telegraf",
Log: testutil.Logger{},
}
client, err := influxdb.NewHTTPClient(config)
@@ -579,6 +592,7 @@ func TestHTTP_WriteContentEncodingGzip(t *testing.T) {
URL: u,
Database: "telegraf",
ContentEncoding: "gzip",
Log: testutil.Logger{},
}
client, err := influxdb.NewHTTPClient(config)
@@ -618,6 +632,7 @@ func TestHTTP_UnixSocket(t *testing.T) {
config: influxdb.HTTPConfig{
URL: &url.URL{Scheme: "unix", Path: sock},
Database: "xyzzy",
Log: testutil.Logger{},
},
queryHandlerFunc: func(t *testing.T, w http.ResponseWriter, r *http.Request) {
require.Equal(t, `CREATE DATABASE "xyzzy"`, r.FormValue("q"))

7
plugins/outputs/influxdb/influxdb.go
View File

@@ -27,7 +27,6 @@ type Client interface {
Database() string
URL() string
Close()
SetLogger(telegraf.Logger)
}
// InfluxDB struct is the primary data structure for the plugin
@@ -172,8 +171,6 @@ func (i *InfluxDB) Connect() error {
return err
}
c.SetLogger(i.Log)
i.clients = append(i.clients, c)
case "http", "https", "unix":
c, err := i.httpClient(ctx, parts, proxy)
@@ -181,8 +178,6 @@ func (i *InfluxDB) Connect() error {
return err
}
c.SetLogger(i.Log)
i.clients = append(i.clients, c)
default:
return fmt.Errorf("unsupported scheme [%q]: %q", u, parts.Scheme)
@@ -243,6 +238,7 @@ func (i *InfluxDB) udpClient(url *url.URL) (Client, error) {
URL: url,
MaxPayloadSize: int(i.UDPPayload.Size),
Serializer: i.serializer,
Log: i.Log,
}
c, err := i.CreateUDPClientF(config)
@@ -276,6 +272,7 @@ func (i *InfluxDB) httpClient(ctx context.Context, url *url.URL, proxy *url.URL)
RetentionPolicy: i.RetentionPolicy,
Consistency: i.WriteConsistency,
Serializer: i.serializer,
Log: i.Log,
}
c, err := i.CreateHTTPClientF(config)

8
plugins/outputs/influxdb/udp.go
View File

@@ -60,6 +60,7 @@ func NewUDPClient(config UDPConfig) (*udpClient, error) {
url: config.URL,
serializer: serializer,
dialer: dialer,
log: config.Log,
}
return client, nil
}
@@ -69,18 +70,13 @@ type udpClient struct {
dialer Dialer
serializer *influx.Serializer
url *url.URL
log telegraf.Logger
log telegraf.Logger
}
func (c *udpClient) URL() string {
return c.url.String()
}
func (c *udpClient) SetLogger(log telegraf.Logger) {
c.log = log
}
func (c *udpClient) Database() string {
return ""
}

8
plugins/outputs/influxdb/udp_test.go
View File

@@ -79,7 +79,6 @@ func TestUDP_URL(t *testing.T) {
}
client, err := influxdb.NewUDPClient(config)
client.SetLogger(testutil.Logger{})
require.NoError(t, err)
require.Equal(t, u.String(), client.URL())
@@ -103,7 +102,6 @@ func TestUDP_Simple(t *testing.T) {
},
}
client, err := influxdb.NewUDPClient(config)
client.SetLogger(testutil.Logger{})
require.NoError(t, err)
ctx := context.Background()
@@ -130,7 +128,6 @@ func TestUDP_DialError(t *testing.T) {
},
}
client, err := influxdb.NewUDPClient(config)
client.SetLogger(testutil.Logger{})
require.NoError(t, err)
ctx := context.Background()
@@ -160,7 +157,6 @@ func TestUDP_WriteError(t *testing.T) {
},
}
client, err := influxdb.NewUDPClient(config)
client.SetLogger(testutil.Logger{})
require.NoError(t, err)
ctx := context.Background()
@@ -187,6 +183,7 @@ func TestUDP_ErrorLogging(t *testing.T) {
return conn, nil
},
},
Log: testutil.Logger{},
},
metrics: []telegraf.Metric{getMetric()},
logContains: `could not serialize metric: "cpu": need more space`,
@@ -201,6 +198,7 @@ func TestUDP_ErrorLogging(t *testing.T) {
return conn, nil
},
},
Log: testutil.Logger{},
},
metrics: []telegraf.Metric{
func() telegraf.Metric {
@@ -224,7 +222,6 @@ func TestUDP_ErrorLogging(t *testing.T) {
log.SetOutput(&b)
client, err := influxdb.NewUDPClient(tt.config)
client.SetLogger(testutil.Logger{})
require.NoError(t, err)
ctx := context.Background()
@@ -268,7 +265,6 @@ func TestUDP_WriteWithRealConn(t *testing.T) {
URL: u,
}
client, err := influxdb.NewUDPClient(config)
client.SetLogger(testutil.Logger{})
require.NoError(t, err)
ctx := context.Background()