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

Use datacenter option spelling in consul input (#5320)

This commit is contained in:
Marcelo Almeida 2019-01-23 22:10:38 +00:00 committed by Daniel Nelson
parent 39eff3d62b
commit f739ce2a35
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/telegraf.conf
View File

@ -1703,8 +1703,8 @@
# # username = "" # # username = ""
# # password = "" # # password = ""
# #
# ## Data centre to query the health checks from # ## Data center to query the health checks from
# # datacentre = "" # # datacenter = ""
# #
# ## Optional TLS Config # ## Optional TLS Config
# # tls_ca = "/etc/telegraf/ca.pem" # # tls_ca = "/etc/telegraf/ca.pem"

4
plugins/inputs/consul/README.md
View File

@ -24,8 +24,8 @@ report those stats already using StatsD protocol if needed.
# username = "" # username = ""
# password = "" # password = ""
## Data centre to query the health checks from ## Data center to query the health checks from
# datacentre = "" # datacenter = ""
## Optional TLS Config ## Optional TLS Config
# tls_ca = "/etc/telegraf/ca.pem" # tls_ca = "/etc/telegraf/ca.pem"

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

@ -17,6 +17,7 @@ type Consul struct {
Username string Username string
Password string Password string
Datacentre string Datacentre string
Datacenter string
tls.ClientConfig tls.ClientConfig
TagDelimiter string TagDelimiter string
@ -38,8 +39,8 @@ var sampleConfig = `
# username = "" # username = ""
# password = "" # password = ""
## Data centre to query the health checks from ## Data center to query the health checks from
# datacentre = "" # datacenter = ""
## Optional TLS Config ## Optional TLS Config
# tls_ca = "/etc/telegraf/ca.pem" # tls_ca = "/etc/telegraf/ca.pem"
@ -77,6 +78,10 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
config.Datacenter = c.Datacentre config.Datacenter = c.Datacentre
} }
if c.Datacenter != "" {
config.Datacenter = c.Datacenter
}
if c.Token != "" { if c.Token != "" {
config.Token = c.Token config.Token = c.Token
} }