From 9c3af1e6ac1c6e619cef0b56fa53798c4f9369d5 Mon Sep 17 00:00:00 2001
From: Matthew Crenshaw <3420325+sgtsquiggs@users.noreply.github.com>
Date: Thu, 25 Apr 2019 20:21:02 -0400
Subject: [PATCH] Add pagefault data to procstat input plugin (#5769)

---
 plugins/inputs/procstat/README.md        | 4 ++++
 plugins/inputs/procstat/process.go       | 1 +
 plugins/inputs/procstat/procstat.go      | 8 ++++++++
 plugins/inputs/procstat/procstat_test.go | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/plugins/inputs/procstat/README.md b/plugins/inputs/procstat/README.md
index dfe95291a..277ec2c56 100644
--- a/plugins/inputs/procstat/README.md
+++ b/plugins/inputs/procstat/README.md
@@ -85,6 +85,8 @@ implemented as a WMI query.  The pattern allows fuzzy matching using only
     - cgroup (when defined)
     - win_service (when defined)
   - fields:
+    - child_major_faults (int)
+    - child_minor_faults (int)
     - cpu_time (int)
     - cpu_time_guest (float)
     - cpu_time_guest_nice (float)
@@ -99,12 +101,14 @@ implemented as a WMI query.  The pattern allows fuzzy matching using only
     - cpu_time_user (float)
     - cpu_usage (float)
     - involuntary_context_switches (int)
+    - major_faults (int)
     - memory_data (int)
     - memory_locked (int)
     - memory_rss (int)
     - memory_stack (int)
     - memory_swap (int)
     - memory_vms (int)
+    - minor_faults (int)
     - nice_priority (int)
     - num_fds (int, *telegraf* may need to be ran as **root**)
     - num_threads (int)
diff --git a/plugins/inputs/procstat/process.go b/plugins/inputs/procstat/process.go
index 94a57c192..7e8c4859d 100644
--- a/plugins/inputs/procstat/process.go
+++ b/plugins/inputs/procstat/process.go
@@ -12,6 +12,7 @@ type Process interface {
 	PID() PID
 	Tags() map[string]string
 
+	PageFaults() (*process.PageFaultsStat, error)
 	IOCounters() (*process.IOCountersStat, error)
 	MemoryInfo() (*process.MemoryInfoStat, error)
 	Name() (string, error)
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 55552bb4a..2eab899c9 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -200,6 +200,14 @@ func (p *Procstat) addMetric(proc Process, acc telegraf.Accumulator) {
 		fields[prefix+"involuntary_context_switches"] = ctx.Involuntary
 	}
 
+	faults, err := proc.PageFaults()
+	if err == nil {
+		fields[prefix+"minor_faults"] = faults.MinorFaults
+		fields[prefix+"major_faults"] = faults.MajorFaults
+		fields[prefix+"child_minor_faults"] = faults.ChildMinorFaults
+		fields[prefix+"child_major_faults"] = faults.ChildMajorFaults
+	}
+
 	io, err := proc.IOCounters()
 	if err == nil {
 		fields[prefix+"read_count"] = io.ReadCount
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index 191c056ea..bf03f7599 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -116,6 +116,10 @@ func (p *testProc) Tags() map[string]string {
 	return p.tags
 }
 
+func (p *testProc) PageFaults() (*process.PageFaultsStat, error) {
+	return &process.PageFaultsStat{}, nil
+}
+
 func (p *testProc) IOCounters() (*process.IOCountersStat, error) {
 	return &process.IOCountersStat{}, nil
 }