Common Module - Grafana Updates to Datasources and Telegraf

This commit is contained in:
Mike Reeves
2018-11-19 19:53:08 -05:00
parent 760e0ecca6
commit c0815363a9
2 changed files with 8 additions and 11 deletions

View File

@@ -11,10 +11,7 @@ datasources:
database: telegraf database: telegraf
url: https://{{ grains.master }}:8086 url: https://{{ grains.master }}:8086
jsonData: jsonData:
tlsAuth: true tlsAuth: false
tlsAuthWithCACert: true tlsAuthWithCACert: false
secureJsonData: tlsSkipVerify: true
tlsCACert: "/etc/pki/ca.crt"
tlsClientCert: "/etc/pki/grafana.crt"
tlsClientKey: "/etc/pki/grafana.key"
version: 1 version: 1

View File

@@ -516,11 +516,11 @@
# # Read metrics about docker containers # # Read metrics about docker containers
# [[inputs.docker]] [[inputs.docker]]
# ## Docker Endpoint # ## Docker Endpoint
# ## To use TCP, set endpoint = "tcp://[ip]:[port]" # ## To use TCP, set endpoint = "tcp://[ip]:[port]"
# ## To use environment variables (ie, docker-machine), set endpoint = "ENV" # ## To use environment variables (ie, docker-machine), set endpoint = "ENV"
# endpoint = "unix:///var/run/docker.sock" endpoint = "unix:///var/run/docker.sock"
# #
# ## Set to true to collect Swarm metrics(desired_replicas, running_replicas) # ## Set to true to collect Swarm metrics(desired_replicas, running_replicas)
# gather_services = false # gather_services = false
@@ -563,11 +563,11 @@
# # Read stats from one or more Elasticsearch servers or clusters # # Read stats from one or more Elasticsearch servers or clusters
# [[inputs.elasticsearch]] [[inputs.elasticsearch]]
# ## specify a list of one or more Elasticsearch servers # ## specify a list of one or more Elasticsearch servers
# # you can add username and password to your url to use basic authentication: # # you can add username and password to your url to use basic authentication:
# # servers = ["http://user:pass@localhost:9200"] # # servers = ["http://user:pass@localhost:9200"]
# servers = ["http://localhost:9200"] servers = ["http://{{ MASTER }}:9200"]
# #
# ## Timeout for HTTP requests to the elastic search server(s) # ## Timeout for HTTP requests to the elastic search server(s)
# http_timeout = "5s" # http_timeout = "5s"
@@ -916,7 +916,7 @@
# # Read metrics about network interface usage # # Read metrics about network interface usage
# [[inputs.net]] [[inputs.net]]
# ## By default, telegraf gathers stats from any up interface (excluding loopback) # ## By default, telegraf gathers stats from any up interface (excluding loopback)
# ## Setting interfaces will tell it to gather these explicit interfaces, # ## Setting interfaces will tell it to gather these explicit interfaces,
# ## regardless of status. # ## regardless of status.