From e36639b15d597b56157c431bfc91464b0e9db52a Mon Sep 17 00:00:00 2001
From: Matthew Crenshaw <3420325+sgtsquiggs@users.noreply.github.com>
Date: Wed, 14 Aug 2019 13:17:38 -0400
Subject: [PATCH] Add memory_usage field to procstat input plugin (#6249)

---
 plugins/inputs/procstat/process.go       | 1 +
 plugins/inputs/procstat/procstat.go      | 5 +++++
 plugins/inputs/procstat/procstat_test.go | 4 ++++
 3 files changed, 10 insertions(+)

diff --git a/plugins/inputs/procstat/process.go b/plugins/inputs/procstat/process.go
index 7e8c4859d..7d3a9431d 100644
--- a/plugins/inputs/procstat/process.go
+++ b/plugins/inputs/procstat/process.go
@@ -21,6 +21,7 @@ type Process interface {
 	NumFDs() (int32, error)
 	NumThreads() (int32, error)
 	Percent(interval time.Duration) (float64, error)
+	MemoryPercent() (float32, error)
 	Times() (*cpu.TimesStat, error)
 	RlimitUsage(bool) ([]process.RlimitStat, error)
 	Username() (string, error)
diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go
index 5bbb11d45..995aa5bdd 100644
--- a/plugins/inputs/procstat/procstat.go
+++ b/plugins/inputs/procstat/procstat.go
@@ -245,6 +245,11 @@ func (p *Procstat) addMetric(proc Process, acc telegraf.Accumulator) {
 		fields[prefix+"memory_locked"] = mem.Locked
 	}
 
+	mem_perc, err := proc.MemoryPercent()
+	if err == nil {
+		fields[prefix+"memory_usage"] = mem_perc
+	}
+
 	rlims, err := proc.RlimitUsage(true)
 	if err == nil {
 		for _, rlim := range rlims {
diff --git a/plugins/inputs/procstat/procstat_test.go b/plugins/inputs/procstat/procstat_test.go
index bf03f7599..22c8abb89 100644
--- a/plugins/inputs/procstat/procstat_test.go
+++ b/plugins/inputs/procstat/procstat_test.go
@@ -148,6 +148,10 @@ func (p *testProc) Percent(interval time.Duration) (float64, error) {
 	return 0, nil
 }
 
+func (p *testProc) MemoryPercent() (float32, error) {
+	return 0, nil
+}
+
 func (p *testProc) Times() (*cpu.TimesStat, error) {
 	return &cpu.TimesStat{}, nil
 }