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

fix(kubernetes): Only initialize RoundTripper once (#1951) 

fixes #1933
This commit is contained in:
Jonathan Chauncey 2016-10-26 08:47:35 -04:00 committed by Cameron Sparr
parent c66363cba5
commit b1a97e35b9
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/inputs/kubernetes/kubernetes.go
View File

@ -4,7 +4,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net"
"net/http" "net/http"
"net/url" "net/url"
"sync" "sync"
@ -31,6 +30,8 @@ type Kubernetes struct {
SSLKey string `toml:"ssl_key"` SSLKey string `toml:"ssl_key"`
// Use SSL but skip chain & host verification // Use SSL but skip chain & host verification
InsecureSkipVerify bool InsecureSkipVerify bool
RoundTripper http.RoundTripper
} }
var sampleConfig = ` var sampleConfig = `
@ -101,15 +102,12 @@ func (k *Kubernetes) gatherSummary(baseURL string, acc telegraf.Accumulator) err
return err return err
} }
var rt http.RoundTripper = &http.Transport{ if k.RoundTripper == nil {
Dial: (&net.Dialer{ k.RoundTripper = &http.Transport{
Timeout: 5 * time.Second, TLSHandshakeTimeout: 5 * time.Second,
KeepAlive: 30 * time.Second, TLSClientConfig: tlsCfg,
}).Dial, ResponseHeaderTimeout: time.Duration(3 * time.Second),
TLSHandshakeTimeout: 5 * time.Second, }
TLSClientConfig: tlsCfg,
ResponseHeaderTimeout: time.Duration(3 * time.Second),
DisableKeepAlives: false,
} }
if k.BearerToken != "" { if k.BearerToken != "" {
@ -120,7 +118,7 @@ func (k *Kubernetes) gatherSummary(baseURL string, acc telegraf.Accumulator) err
req.Header.Set("Authorization", "Bearer "+string(token)) req.Header.Set("Authorization", "Bearer "+string(token))
} }
resp, err = rt.RoundTrip(req) resp, err = k.RoundTripper.RoundTrip(req)
if err != nil { if err != nil {
return fmt.Errorf("error making HTTP request to %s: %s", url, err) return fmt.Errorf("error making HTTP request to %s: %s", url, err)
} }