Skip to content

Commit

Permalink
Tweak changelog for sensors plugin, and add a non-linux build file
Browse files Browse the repository at this point in the history
closes #519
closes #168
  • Loading branch information
sparrc committed Jan 15, 2016
1 parent 2eda8d6 commit 963a942
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
- [#509](https://github.com/influxdb/telegraf/pull/509): Flatten JSON arrays with indices. Thanks @psilva261!
- [#512](https://github.com/influxdata/telegraf/pull/512): Python 3 build script, add lsof dep to package. Thanks @Ormod!
- [#475](https://github.com/influxdata/telegraf/pull/475): Add response time to httpjson plugin. Thanks @titilambert!
- [#519](https://github.com/influxdata/telegraf/pull/519): Added a sensors input based on lm-sensors. Thanks @md14454!

### Bugfixes
- [#506](https://github.com/influxdb/telegraf/pull/506): Ping input doesn't return response time metric when timeout. Thanks @titilambert!
Expand Down Expand Up @@ -44,7 +45,6 @@ configurations overwritten by the upgrade. There is a backup stored at
- Added ability to specify per-plugin measurement suffix and prefix.
(`name_prefix` and `name_suffix`)
- Added ability to override base plugin measurement name. (`name_override`)
- Added a sensors input based on lm-sensors

### Bugfixes

Expand Down
16 changes: 8 additions & 8 deletions plugins/inputs/sensors/sensors.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ func (_ *Sensors) Description() string {
}

var sensorsSampleConfig = `
# By default, telegraf gathers stats from all sensors
# detected by the lm-sensors module.
#
# Only collect stats from the selected sensors. Sensors
# are listed as <chip name>:<feature name>. This
# information can be found by running the sensors command.
# e.g. sensors -u
# By default, telegraf gathers stats from all sensors detected by the
# lm-sensors module.
#
# Only collect stats from the selected sensors. Sensors are listed as
# <chip name>:<feature name>. This information can be found by running the
# sensors command, e.g. sensors -u
#
# A * as the feature name will return all features of the chip
#
# sensors = ["coretemp-isa-0000:Core 0", "coretemp-isa-0001:*", ... ]
# sensors = ["coretemp-isa-0000:Core 0", "coretemp-isa-0001:*"]
`

func (_ *Sensors) SampleConfig() string {
Expand Down
3 changes: 3 additions & 0 deletions plugins/inputs/sensors/sensors_notlinux.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// +build !linux

package sensors

0 comments on commit 963a942

Please sign in to comment.