CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(inputs.consul): Move config checking to Init method (#15907)

This commit is contained in:
Thomas Casteleyn 2024-09-23 18:21:11 +02:00 committed by GitHub
parent 97f3d1fd09
commit 5aa211e0a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/inputs/consul/consul.go
View File

@ -42,10 +42,6 @@ func (c *Consul) Init() error {
c.Log.Warnf("Use of deprecated configuration: 'metric_version = 1'; please update to 'metric_version = 2'") c.Log.Warnf("Use of deprecated configuration: 'metric_version = 1'; please update to 'metric_version = 2'")
} }
return nil
}
func (c *Consul) createAPIClient() (*api.Client, error) {
config := api.DefaultConfig() config := api.DefaultConfig()
if c.Address != "" { if c.Address != "" {
@ -77,14 +73,15 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
tlsCfg, err := c.ClientConfig.TLSConfig() tlsCfg, err := c.ClientConfig.TLSConfig()
if err != nil { if err != nil {
return nil, err return err
} }
config.Transport = &http.Transport{ config.Transport = &http.Transport{
TLSClientConfig: tlsCfg, TLSClientConfig: tlsCfg,
} }
return api.NewClient(config) c.client, err = api.NewClient(config)
return err
} }
func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.HealthCheck) { func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.HealthCheck) {
@ -129,16 +126,6 @@ func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.Healt
} }
func (c *Consul) Gather(acc telegraf.Accumulator) error { func (c *Consul) Gather(acc telegraf.Accumulator) error {
if c.client == nil {
newClient, err := c.createAPIClient()
if err != nil {
return err
}
c.client = newClient
}
checks, _, err := c.client.Health().State("any", nil) checks, _, err := c.client.Health().State("any", nil)
if err != nil { if err != nil {