Indent the toml config for readability

CHANGELOG.md

@@ -6,6 +6,7 @@
 - [#137](https://github.com/influxdb/telegraf/issues/137): Memcached: fix when a value contains a space
 - [#138](https://github.com/influxdb/telegraf/issues/138): MySQL server address tag.
 - [#142](https://github.com/influxdb/telegraf/pull/142): Add Description and SampleConfig funcs to output interface
+- Indent the toml config file for readability
 
 ### Bugfixes
 - [#128](https://github.com/influxdb/telegraf/issues/128): system_load measurement missing.

config.go

@@ -387,11 +387,11 @@ func PrintSampleConfig() {
 		creator := outputs.Outputs[oname]
 		output := creator()
 
-		fmt.Printf("\n# %s\n[outputs.%s]\n", output.Description(), oname)
+		fmt.Printf("\n# %s\n[outputs.%s]", output.Description(), oname)
 
 		config := output.SampleConfig()
 		if config == "" {
-			fmt.Printf(" 	# no configuration\n\n")
+			fmt.Printf("\n	# no configuration\n")
 		} else {
 			fmt.Printf(config)
 		}
@@ -411,17 +411,13 @@ func PrintSampleConfig() {
 		creator := plugins.Plugins[pname]
 		plugin := creator()
 
-		fmt.Printf("# %s\n[%s]\n", plugin.Description(), pname)
+		fmt.Printf("\n# %s\n[%s]", plugin.Description(), pname)
 
 		config := plugin.SampleConfig()
 		if config == "" {
-			fmt.Printf("	# no configuration\n\n")
+			fmt.Printf("\n	# no configuration\n")
 		} else {
-			lines := strings.Split(config, "\n")
-			for _, line := range lines {
-				fmt.Printf("%s\n", line)
-			}
-			fmt.Printf("\n")
+			fmt.Printf(config)
 		}
 	}
 }

plugins/disque/disque.go

@@ -26,7 +26,8 @@ var sampleConfig = `
 	# 10.0.0.1:10000, etc.
 	#
 	# If no servers are specified, then localhost is used as the host.
-servers = ["localhost"]`
+	servers = ["localhost"]
+`
 
 func (r *Disque) SampleConfig() string {
 	return sampleConfig

plugins/kafka_consumer/kafka_consumer.go

@@ -30,7 +30,8 @@ consumerGroupName = "telegraf_metrics_consumers"
 	zookeeperPeers = ["localhost:2181"]
 
 	# Batch size of points sent to InfluxDB
-batchSize = 1000`
+	batchSize = 1000
+`
 
 func (k *Kafka) SampleConfig() string {
 	return sampleConfig

plugins/lustre2/lustre2.go

@@ -29,7 +29,8 @@ var sampleConfig = `
 	# If not specified, the default will work on Lustre 2.5.x
 	#
 	# ost_procfiles = ["/proc/fs/lustre/obdfilter/*/stats", "/proc/fs/lustre/osd-ldiskfs/*/stats"]
-# mds_procfiles = ["/proc/fs/lustre/mdt/*/md_stats"]`
+	# mds_procfiles = ["/proc/fs/lustre/mdt/*/md_stats"]
+`
 
 /* The wanted fields would be a []string if not for the
 lines that start with read_bytes/write_bytes and contain

plugins/memcached/memcached.go

@@ -21,7 +21,8 @@ var sampleConfig = `
 	# with optional port. ie localhost, 10.0.0.1:11211, etc.
 	#
 	# If no servers are specified, then localhost is used as the host.
-servers = ["localhost"]`
+	servers = ["localhost"]
+`
 
 var defaultTimeout = 5 * time.Second
 

plugins/mongodb/mongodb.go

@@ -30,7 +30,8 @@ var sampleConfig = `
 	# mongodb://10.10.3.33:18832, 10.0.0.1:10000, etc.
 	#
 	# If no servers are specified, then 127.0.0.1 is used as the host and 27107 as the port.
-servers = ["127.0.0.1:27017"]`
+	servers = ["127.0.0.1:27017"]
+`
 
 func (m *MongoDB) SampleConfig() string {
 	return sampleConfig

plugins/mysql/mysql.go

@@ -21,7 +21,8 @@ var sampleConfig = `
 	#    root:passwd@tcp(127.0.0.1:3036)/
 	#
 	# If no servers are specified, then localhost is used as the host.
-servers = ["localhost"]`
+	servers = ["localhost"]
+`
 
 func (m *Mysql) SampleConfig() string {
 	return sampleConfig

plugins/nginx/nginx.go

@@ -20,7 +20,8 @@ type Nginx struct {
 
 var sampleConfig = `
 	# An array of Nginx stub_status URI to gather stats.
-urls = ["http://localhost/status"]`
+	urls = ["http://localhost/status"]
+`
 
 func (n *Nginx) SampleConfig() string {
 	return sampleConfig

plugins/prometheus/prometheus.go

@@ -18,7 +18,8 @@ type Prometheus struct {
 
 var sampleConfig = `
 	# An array of urls to scrape metrics from.
-urls = ["http://localhost:9100/metrics"]`
+	urls = ["http://localhost:9100/metrics"]
+`
 
 func (r *Prometheus) SampleConfig() string {
 	return sampleConfig

plugins/redis/redis.go

@@ -26,7 +26,8 @@ var sampleConfig = `
 	# 10.0.0.1:10000, etc.
 	#
 	# If no servers are specified, then localhost is used as the host.
-servers = ["localhost"]`
+	servers = ["localhost"]
+`
 
 func (r *Redis) SampleConfig() string {
 	return sampleConfig

plugins/rethinkdb/rethinkdb.go

@@ -20,7 +20,8 @@ var sampleConfig = `
 	# rethinkdb://10.10.3.33:18832, 10.0.0.1:10000, etc.
 	#
 	# If no servers are specified, then 127.0.0.1 is used as the host and 28015 as the port.
-servers = ["127.0.0.1:28015"]`
+	servers = ["127.0.0.1:28015"]
+`
 
 func (r *RethinkDB) SampleConfig() string {
 	return sampleConfig

plugins/system/cpu.go

@@ -29,7 +29,8 @@ var sampleConfig = `
 	# Whether to report per-cpu stats or not
 	percpu = true
 	# Whether to report total system cpu stats or not
-totalcpu = true`
+	totalcpu = true
+`
 
 func (_ *CPUStats) SampleConfig() string {
 	return sampleConfig