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

Use internal.Duration for jolokia timeouts (#4136)

This commit is contained in:
Daniel Nelson 2018-05-11 17:47:38 -07:00 committed by GitHub
parent 2add516eee
commit 5b599337a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/inputs/jolokia2/jolokia_agent.go
View File

@ -3,9 +3,9 @@ package jolokia2
import ( import (
"fmt" "fmt"
"sync" "sync"
"time"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/internal/tls" "github.com/influxdata/telegraf/internal/tls"
) )
@ -17,7 +17,7 @@ type JolokiaAgent struct {
URLs []string `toml:"urls"` URLs []string `toml:"urls"`
Username string Username string
Password string Password string
ResponseTimeout time.Duration `toml:"response_timeout"` ResponseTimeout internal.Duration `toml:"response_timeout"`
tls.ClientConfig tls.ClientConfig
@ -101,7 +101,7 @@ func (ja *JolokiaAgent) createClient(url string) (*Client, error) {
return NewClient(url, &ClientConfig{ return NewClient(url, &ClientConfig{
Username: ja.Username, Username: ja.Username,
Password: ja.Password, Password: ja.Password,
ResponseTimeout: ja.ResponseTimeout, ResponseTimeout: ja.ResponseTimeout.Duration,
ClientConfig: ja.ClientConfig, ClientConfig: ja.ClientConfig,
}) })
} }

7
plugins/inputs/jolokia2/jolokia_proxy.go
View File

@ -1,9 +1,8 @@
package jolokia2 package jolokia2
import ( import (
"time"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/internal/tls" "github.com/influxdata/telegraf/internal/tls"
) )
@ -19,7 +18,7 @@ type JolokiaProxy struct {
Username string Username string
Password string Password string
ResponseTimeout time.Duration `toml:"response_timeout"` ResponseTimeout internal.Duration `toml:"response_timeout"`
tls.ClientConfig tls.ClientConfig
Metrics []MetricConfig `toml:"metric"` Metrics []MetricConfig `toml:"metric"`
@ -117,7 +116,7 @@ func (jp *JolokiaProxy) createClient() (*Client, error) {
return NewClient(jp.URL, &ClientConfig{ return NewClient(jp.URL, &ClientConfig{
Username: jp.Username, Username: jp.Username,
Password: jp.Password, Password: jp.Password,
ResponseTimeout: jp.ResponseTimeout, ResponseTimeout: jp.ResponseTimeout.Duration,
ClientConfig: jp.ClientConfig, ClientConfig: jp.ClientConfig,
ProxyConfig: proxyConfig, ProxyConfig: proxyConfig,
}) })