diff --git a/README.md b/README.md index 9fa599e14..7df4a26a9 100644 --- a/README.md +++ b/README.md @@ -133,11 +133,14 @@ path = [ "/opt", "/home" ] ## Supported Plugins -Telegraf currently has support for collecting metrics from: +**You can view usage instructions for each plugin by running** +`telegraf -usage ` + +Telegraf currently has support for collecting metrics from * disque * elasticsearch -* exec (generic executable JSON-gathering plugin) +* exec (generic JSON-emitting executable plugin) * haproxy * httpjson (generic JSON-emitting http service plugin) * kafka_consumer diff --git a/plugins/mysql/mysql.go b/plugins/mysql/mysql.go index a55006a4d..9714b25e9 100644 --- a/plugins/mysql/mysql.go +++ b/plugins/mysql/mysql.go @@ -16,7 +16,9 @@ type Mysql struct { var sampleConfig = ` # specify servers via a url matching: # [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]] -# e.g. root:root@http://10.0.0.18/?tls=false +# e.g. +# root:root@http://10.0.0.18/?tls=false +# root:passwd@tcp(127.0.0.1:3036)/ # # If no servers are specified, then localhost is used as the host. servers = ["localhost"]` diff --git a/plugins/postgresql/postgresql.go b/plugins/postgresql/postgresql.go index 85479577d..9312c4aa4 100644 --- a/plugins/postgresql/postgresql.go +++ b/plugins/postgresql/postgresql.go @@ -25,11 +25,11 @@ var sampleConfig = ` # postgres://[pqgotest[:password]]@localhost?sslmode=[disable|verify-ca|verify-full] # or a simple string: # host=localhost user=pqotest password=... sslmode=... -# +# # All connection parameters are optional. By default, the host is localhost # and the user is the currently running user. For localhost, we default # to sslmode=disable as well. -# +# address = "sslmode=disable"