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

cmd/telegraf: -configdirectory only includes files ending in .conf 

Closes #392
This commit is contained in:
Tero Marttila 2015-11-25 23:30:54 +02:00 committed by Cameron Sparr
parent d47740bd8d
commit 13ccf420d7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -12,6 +12,7 @@ functional.
### Features ### Features
- [#379](https://github.com/influxdb/telegraf/pull/379): Riemann output, thanks @allenj! - [#379](https://github.com/influxdb/telegraf/pull/379): Riemann output, thanks @allenj!
- [#375](https://github.com/influxdb/telegraf/pull/375): kafka_consumer service plugin. - [#375](https://github.com/influxdb/telegraf/pull/375): kafka_consumer service plugin.
- [#392](https://github.com/influxdb/telegraf/pull/392): Procstat plugin can now accept pgrep -f pattern, thanks @ecarreras!
### Bugfixes ### Bugfixes
- [#371](https://github.com/influxdb/telegraf/issues/371): Kafka consumer plugin not functioning. - [#371](https://github.com/influxdb/telegraf/issues/371): Kafka consumer plugin not functioning.

7
plugins/procstat/procstat.go
View File

@ -32,11 +32,12 @@ func NewProcstat() *Procstat {
var sampleConfig = ` var sampleConfig = `
[[procstat.specifications]] [[procstat.specifications]]
prefix = "" # optional string to prefix measurements prefix = "" # optional string to prefix measurements
# Use one of pid_file or exe to find process # Must specify one of: pid_file, exe, or pattern
# PID file to monitor process
pid_file = "/var/run/nginx.pid" pid_file = "/var/run/nginx.pid"
# executable name (used by pgrep) # executable name (ie, pgrep <exe>)
# exe = "nginx" # exe = "nginx"
# pattern as argument for pgrep -f # pattern as argument for pgrep (ie, pgrep -f <pattern>)
# pattern = "nginx" # pattern = "nginx"
` `