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

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 committed by Michele Fadda
parent 2dc35a2909
commit ee1a324590
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@
- [#727](https://github.com/influxdata/telegraf/pull/727): riak input, thanks @jcoene! - [#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! - [#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! - [#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 ### Bugfixes
- [#701](https://github.com/influxdata/telegraf/pull/701): output write count shouldnt print in quiet mode. - [#701](https://github.com/influxdata/telegraf/pull/701): output write count shouldnt print in quiet mode.

21
internal/config/config.go
View File

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

12
plugins/inputs/system/disk.go
View File

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