Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Graphite output #494

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
56509a6
Change 0.3.0 -> 0.10.0
sparrc Jan 9, 2016
2ec1ffd
Fix Telegraf s3 upload and readme links
sparrc Jan 11, 2016
fb837ca
Add 0.10.0 blog post link to README
sparrc Jan 14, 2016
3c89847
internal: FlattenJSON, flatten arrays as well
psilva261 Jan 12, 2016
3cc1fec
Ping input doesn't return response time metric when timeout
titilambert Jan 11, 2016
7531e21
build.py: Make build script work on both Python2.x and Python3.x
Ormod Jan 12, 2016
923be10
Align exec documentation with v0.10 updates
Jan 14, 2016
a39a7a7
Add an interface:"all" tag to the net protocol counters
sparrc Jan 14, 2016
d6ef3b1
Note on where to look for plugin information
Jan 14, 2016
e8907ac
Update Godeps and fix changelog 2014->2016
sparrc Jan 15, 2016
7bfb429
Switched to /etc/debian_version for Debian/Ubuntu distribution recogn…
Jan 15, 2016
b44644b
Add response time to httpjson plugin
titilambert Jan 8, 2016
c0d98ec
Added initial support for gosensors module
md14454 Jan 14, 2016
378b746
Fixed an unused variable
md14454 Jan 14, 2016
9b96c62
Change build configuration to linux only
md14454 Jan 15, 2016
2eda8d6
Added infor to readme and changelog
md14454 Jan 15, 2016
963a942
Tweak changelog for sensors plugin, and add a non-linux build file
sparrc Jan 15, 2016
50334e6
Only compile the sensors plugin if the 'sensors' tag is set
sparrc Jan 15, 2016
f60c090
Add a quiet mode to telegraf
sparrc Jan 15, 2016
b24e71b
Removing old package script, trim Makefile
sparrc Jan 15, 2016
71f4e72
interval options should have string value
Jan 15, 2016
5e7dd6d
Merge pull request #533 from influxdata/fix-interval-option-v0.10
Jan 15, 2016
1421bce
Update README.md
Jan 15, 2016
40a5bad
Update procstat doc
sparrc Jan 15, 2016
c483e16
Add option to disable statsd name conversion
sparrc Jan 15, 2016
e12d9f9
Add Graphite output
titilambert Jan 8, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tweak changelog for sensors plugin, and add a non-linux build file
closes #519
closes #168
  • Loading branch information
sparrc committed Jan 15, 2016
commit 963a9429dd299070775599e696c3bb4982cf97a7
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