From 251b0bf27a33c0dcd9f9c830a5b5076715bb2a14 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Fri, 3 Jun 2016 12:22:08 +0100
Subject: [PATCH] Use glob match for finding /proc/<pid>/stat files

closes #1323
---
 CHANGELOG.md                       |  3 ++-
 plugins/inputs/system/processes.go | 35 +++++++++++-------------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7148e0683..39a356bb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ in conjunction with wildcard dimension values as it will control the amount of
 time before a new metric is included by the plugin.
 
 ### Features
-- [#1262](https://github.com/influxdata/telegraf/pull/1261): Add graylog input pluging. 
+- [#1262](https://github.com/influxdata/telegraf/pull/1261): Add graylog input pluging.
 - [#1294](https://github.com/influxdata/telegraf/pull/1294): consul input plugin. Thanks @harnash
 - [#1164](https://github.com/influxdata/telegraf/pull/1164): conntrack input plugin. Thanks @robinpercy!
 - [#1165](https://github.com/influxdata/telegraf/pull/1165): vmstat input plugin. Thanks @jshim-xm!
@@ -48,6 +48,7 @@ time before a new metric is included by the plugin.
 - [#1283](https://github.com/influxdata/telegraf/pull/1283): Still send processes metrics if a process exited during metric collection.
 - [#1297](https://github.com/influxdata/telegraf/issues/1297): disk plugin panic when usage grab fails.
 - [#1316](https://github.com/influxdata/telegraf/pull/1316): Removed leaked "database" tag on redis metrics. Thanks @PierreF!
+- [#1323](https://github.com/influxdata/telegraf/issues/1323): Processes plugin: fix potential error with /proc/net/stat directory.
 
 ## v0.13.1 [2016-05-24]
 
diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go
index c2cd8525b..c16f7a480 100644
--- a/plugins/inputs/system/processes.go
+++ b/plugins/inputs/system/processes.go
@@ -9,7 +9,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
-	"path"
+	"path/filepath"
 	"runtime"
 	"strconv"
 
@@ -19,7 +19,7 @@ import (
 
 type Processes struct {
 	execPS       func() ([]byte, error)
-	readProcFile func(statFile string) ([]byte, error)
+	readProcFile func(filename string) ([]byte, error)
 
 	forcePS   bool
 	forceProc bool
@@ -128,22 +128,16 @@ func (p *Processes) gatherFromPS(fields map[string]interface{}) error {
 
 // get process states from /proc/(pid)/stat files
 func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
-	files, err := ioutil.ReadDir("/proc")
+	filenames, err := filepath.Glob("/proc/[0-9]*/stat")
 	if err != nil {
 		return err
 	}
 
-	for _, file := range files {
-		if !file.IsDir() {
-			continue
-		}
+	for _, filename := range filenames {
+		_, err := os.Stat(filename)
 
-		statFile := path.Join("/proc", file.Name(), "stat")
-		data, err := p.readProcFile(statFile)
+		data, err := p.readProcFile(filename)
 		if err != nil {
-			if !file.IsDir() {
-				continue
-			}
 			return err
 		}
 		if data == nil {
@@ -159,7 +153,7 @@ func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
 
 		stats := bytes.Fields(data)
 		if len(stats) < 3 {
-			return fmt.Errorf("Something is terribly wrong with %s", statFile)
+			return fmt.Errorf("Something is terribly wrong with %s", filename)
 		}
 		switch stats[0][0] {
 		case 'R':
@@ -176,7 +170,7 @@ func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
 			fields["paging"] = fields["paging"].(int64) + int64(1)
 		default:
 			log.Printf("processes: Unknown state [ %s ] in file %s",
-				string(stats[0][0]), statFile)
+				string(stats[0][0]), filename)
 		}
 		fields["total"] = fields["total"].(int64) + int64(1)
 
@@ -190,15 +184,12 @@ func (p *Processes) gatherFromProc(fields map[string]interface{}) error {
 	return nil
 }
 
-func readProcFile(statFile string) ([]byte, error) {
-	if _, err := os.Stat(statFile); os.IsNotExist(err) {
-		return nil, nil
-	} else if err != nil {
-		return nil, err
-	}
-
-	data, err := ioutil.ReadFile(statFile)
+func readProcFile(filename string) ([]byte, error) {
+	data, err := ioutil.ReadFile(filename)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, nil
+		}
 		return nil, err
 	}