From 963a9429dd299070775599e696c3bb4982cf97a7 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Fri, 15 Jan 2016 11:22:33 -0700 Subject: [PATCH] Tweak changelog for sensors plugin, and add a non-linux build file closes #519 closes #168 --- CHANGELOG.md | 2 +- plugins/inputs/sensors/sensors.go | 16 ++++++++-------- plugins/inputs/sensors/sensors_notlinux.go | 3 +++ 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 plugins/inputs/sensors/sensors_notlinux.go diff --git a/CHANGELOG.md b/CHANGELOG.md index 77626e3a8..fa7f9607a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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! @@ -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 diff --git a/plugins/inputs/sensors/sensors.go b/plugins/inputs/sensors/sensors.go index 88e362154..926003b83 100644 --- a/plugins/inputs/sensors/sensors.go +++ b/plugins/inputs/sensors/sensors.go @@ -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 :. 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 + # :. 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 { diff --git a/plugins/inputs/sensors/sensors_notlinux.go b/plugins/inputs/sensors/sensors_notlinux.go new file mode 100644 index 000000000..62a621159 --- /dev/null +++ b/plugins/inputs/sensors/sensors_notlinux.go @@ -0,0 +1,3 @@ +// +build !linux + +package sensors