From fe527ca6d9a1c47d1f63a0e54e3733686e14e032 Mon Sep 17 00:00:00 2001
From: Michael Travis <michael.travis@skybettingandgaming.com>
Date: Fri, 2 Dec 2016 14:21:36 +0000
Subject: [PATCH] Added modification_time field

---
 plugins/inputs/filestat/README.md        |  3 +-
 plugins/inputs/filestat/filestat.go      |  1 +
 plugins/inputs/filestat/filestat_test.go | 49 ++++++++++++++----------
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/plugins/inputs/filestat/README.md b/plugins/inputs/filestat/README.md
index bfa51011c..bb8879d19 100644
--- a/plugins/inputs/filestat/README.md
+++ b/plugins/inputs/filestat/README.md
@@ -20,6 +20,7 @@ The filestat plugin gathers metrics about file existence, size, and other stats.
 - filestat
     - exists (int, 0 | 1)
     - size_bytes (int, bytes)
+    - modification_time (int, unixtime)
     - md5 (optional, string)
 
 ### Tags:
@@ -33,5 +34,5 @@ The filestat plugin gathers metrics about file existence, size, and other stats.
 $ telegraf -config /etc/telegraf/telegraf.conf -input-filter filestat -test
 * Plugin: filestat, Collection 1
 > filestat,file=/tmp/foo/bar,host=tyrion exists=0i 1461203374493128216
-> filestat,file=/Users/sparrc/ws/telegraf.conf,host=tyrion exists=1i,size=47894i 1461203374493199335
+> filestat,file=/Users/sparrc/ws/telegraf.conf,host=tyrion exists=1i,size=47894i,modification_time=1470234221i 1461203374493199335,
 ```
diff --git a/plugins/inputs/filestat/filestat.go b/plugins/inputs/filestat/filestat.go
index 938c12e34..e0db294a7 100644
--- a/plugins/inputs/filestat/filestat.go
+++ b/plugins/inputs/filestat/filestat.go
@@ -80,6 +80,7 @@ func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 			fields := map[string]interface{}{
 				"exists":     int64(1),
 				"size_bytes": fileInfo.Size(),
+				"modification_time": fileInfo.ModTime().Unix(),
 			}
 
 			if f.Md5 {
diff --git a/plugins/inputs/filestat/filestat_test.go b/plugins/inputs/filestat/filestat_test.go
index a404869d9..1a9aa73dd 100644
--- a/plugins/inputs/filestat/filestat_test.go
+++ b/plugins/inputs/filestat/filestat_test.go
@@ -25,8 +25,9 @@ func TestGatherNoMd5(t *testing.T) {
 		"file": dir + "log1.log",
 	}
 	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
 
@@ -34,8 +35,9 @@ func TestGatherNoMd5(t *testing.T) {
 		"file": dir + "log2.log",
 	}
 	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
 
@@ -65,9 +67,10 @@ func TestGatherExplicitFiles(t *testing.T) {
 		"file": dir + "log1.log",
 	}
 	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
-		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
+		"size_bytes":					int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
+		"md5_sum":    				"d41d8cd98f00b204e9800998ecf8427e",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
 
@@ -75,8 +78,9 @@ func TestGatherExplicitFiles(t *testing.T) {
 		"file": dir + "log2.log",
 	}
 	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
@@ -105,8 +109,9 @@ func TestGatherGlob(t *testing.T) {
 		"file": dir + "log1.log",
 	}
 	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
@@ -115,8 +120,9 @@ func TestGatherGlob(t *testing.T) {
 		"file": dir + "log2.log",
 	}
 	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
@@ -137,8 +143,9 @@ func TestGatherSuperAsterisk(t *testing.T) {
 		"file": dir + "log1.log",
 	}
 	fields1 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields1, tags1)
@@ -147,8 +154,9 @@ func TestGatherSuperAsterisk(t *testing.T) {
 		"file": dir + "log2.log",
 	}
 	fields2 := map[string]interface{}{
-		"size_bytes": int64(0),
-		"exists":     int64(1),
+		"size_bytes": 				int64(0),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
 		"md5_sum":    "d41d8cd98f00b204e9800998ecf8427e",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields2, tags2)
@@ -157,9 +165,10 @@ func TestGatherSuperAsterisk(t *testing.T) {
 		"file": dir + "test.conf",
 	}
 	fields3 := map[string]interface{}{
-		"size_bytes": int64(104),
-		"exists":     int64(1),
-		"md5_sum":    "5a7e9b77fa25e7bb411dbd17cf403c1f",
+		"size_bytes": 				int64(104),
+		"exists":     				int64(1),
+		"modification_time": 	int64(1)
+		"md5_sum":    				"5a7e9b77fa25e7bb411dbd17cf403c1f",
 	}
 	acc.AssertContainsTaggedFields(t, "filestat", fields3, tags3)
 }