Fix up config panic points for naoina/toml support

closes #736
This commit is contained in:
Cameron Sparr 2016-02-22 14:43:00 -07:00
parent 47ad73cc89
commit 2a6ff16819
3 changed files with 16 additions and 18 deletions

View File

@ -4,6 +4,7 @@
- [#727](https://github.com/influxdata/telegraf/pull/727): riak input, thanks @jcoene!
- [#694](https://github.com/influxdata/telegraf/pull/694): DNS Query input, thanks @mjasion!
- [#724](https://github.com/influxdata/telegraf/pull/724): username matching for procstat input, thanks @zorel!
- [#736](https://github.com/influxdata/telegraf/pull/736): Ignore dummy filesystems from disk plugin. Thanks @PierreF!
### Bugfixes
- [#701](https://github.com/influxdata/telegraf/pull/701): output write count shouldnt print in quiet mode.

View File

@ -185,25 +185,22 @@ var header = `# Telegraf Configuration
hostname = ""
###############################################################################
# OUTPUTS #
###############################################################################
#
# OUTPUTS:
#
`
var pluginHeader = `
###############################################################################
# INPUTS #
###############################################################################
#
# INPUTS:
#
`
var serviceInputHeader = `
###############################################################################
# SERVICE INPUTS #
###############################################################################
#
# SERVICE INPUTS:
#
`
// PrintSampleConfig prints the sample config

View File

@ -26,8 +26,8 @@ var diskSampleConfig = `
## Setting mountpoints will restrict the stats to the specified mountpoints.
# mount_points = ["/"]
# Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
# present on /run, /var/run, /dev/shm or /dev).
## Ignore some mountpoints by filesystem type. For example (dev)tmpfs (usually
## present on /run, /var/run, /dev/shm or /dev).
ignore_fs = ["tmpfs", "devtmpfs"]
`
@ -88,11 +88,11 @@ func (_ *DiskIOStats) Description() string {
}
var diskIoSampleConfig = `
# By default, telegraf will gather stats for all devices including
# disk partitions.
# Setting devices will restrict the stats to the specified devices.
## By default, telegraf will gather stats for all devices including
## disk partitions.
## Setting devices will restrict the stats to the specified devices.
# devices = ["sda", "sdb"]
# Uncomment the following line if you do not need disk serial numbers.
## Uncomment the following line if you do not need disk serial numbers.
# skip_serial_number = true
`