From 13ccf420d71376d5a180a763fd5f18a508fa8f86 Mon Sep 17 00:00:00 2001
From: Tero Marttila <terom@fixme.fi>
Date: Wed, 25 Nov 2015 23:30:54 +0200
Subject: [PATCH] cmd/telegraf: -configdirectory only includes files ending in
 .conf

Closes #392
---
 CHANGELOG.md                 | 1 +
 plugins/procstat/procstat.go | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1af2b608..da13902db 100644
--- 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
index 5a53c1af9..e9191bbc2 100644
--- 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"
 `