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

Closes #392
influxdata · Nov 26, 2015 · 13ccf42 · 13ccf42
1 parent d47740b
commit 13ccf42
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ functional.
 ### Features
 - [#379](https://github.com/influxdb/telegraf/pull/379): Riemann output, thanks @allenj!
 - [#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
 - [#371](https://github.com/influxdb/telegraf/issues/371): Kafka consumer plugin not functioning.

diff --git a/plugins/procstat/procstat.go b/plugins/procstat/procstat.go
@@ -32,11 +32,12 @@ func NewProcstat() *Procstat {
 var sampleConfig = `
   [[procstat.specifications]]
   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"
-  # executable name (used by pgrep)
+  # executable name (ie, pgrep <exe>)
   # exe = "nginx"
-  # pattern as argument for pgrep -f
+  # pattern as argument for pgrep (ie, pgrep -f <pattern>)
   # pattern = "nginx"
 `