Merge pull request #845 from tsg/merge_773

Merge pull request 773 (adding username to topbeat)

topbeat/beat/sigar.go

@@ -32,14 +32,15 @@ type SwapStat struct {
 }
 
 type Process struct {
-	Pid     int    `json:"pid"`
-	Ppid    int    `json:"ppid"`
-	Name    string `json:"name"`
-	State   string `json:"state"`
-	CmdLine string `json:"cmdline"`
-	Mem     sigar.ProcMem
-	Cpu     sigar.ProcTime
-	ctime   time.Time
+	Pid      int    `json:"pid"`
+	Ppid     int    `json:"ppid"`
+	Name     string `json:"name"`
+	Username string `json:"username"`
+	State    string `json:"state"`
+	CmdLine  string `json:"cmdline"`
+	Mem      sigar.ProcMem
+	Cpu      sigar.ProcTime
+	ctime    time.Time
 }
 
 type FileSystemStat struct {
@@ -174,13 +175,14 @@ func GetProcess(pid int) (*Process, error) {
 	cmdLine := strings.Join(args.List, " ")
 
 	proc := Process{
-		Pid:     pid,
-		Ppid:    state.Ppid,
-		Name:    state.Name,
-		State:   getProcState(byte(state.State)),
-		CmdLine: cmdLine,
-		Mem:     mem,
-		Cpu:     cpu,
+		Pid:      pid,
+		Ppid:     state.Ppid,
+		Name:     state.Name,
+		State:    getProcState(byte(state.State)),
+		Username: state.Username,
+		CmdLine:  cmdLine,
+		Mem:      mem,
+		Cpu:      cpu,
 	}
 	proc.ctime = time.Now()
 

topbeat/beat/sigar_test.go

@@ -93,6 +93,7 @@ func TestGetProcess(t *testing.T) {
 		assert.True(t, (process.Pid > 0))
 		assert.True(t, (process.Ppid >= 0))
 		assert.True(t, (len(process.Name) > 0))
+		assert.True(t, (len(process.Username) > 0))
 		assert.NotEqual(t, "unknown", process.State)
 
 		// Memory Checks

topbeat/beat/topbeat.go

@@ -205,10 +205,11 @@ func (t *Topbeat) exportProcStats() error {
 			newProcs[process.Pid] = process
 
 			proc := common.MapStr{
-				"pid":   process.Pid,
-				"ppid":  process.Ppid,
-				"name":  process.Name,
-				"state": process.State,
+				"pid":      process.Pid,
+				"ppid":     process.Ppid,
+				"name":     process.Name,
+				"state":    process.State,
+				"username": process.Username,
 				"mem": common.MapStr{
 					"size":  process.Mem.Size,
 					"rss":   process.Mem.Resident,

topbeat/tests/system/test_procs.py

@@ -1,7 +1,8 @@
 from topbeat import BaseTest
 
+import getpass
 import re
-
+import os
 
 """
 Contains tests for per process statistics.
@@ -31,6 +32,7 @@ def test_procs(self):
         assert re.match("(?i).*topbeat.test(.exe)? -e -c", output["proc.cmdline"])
         assert isinstance(output["proc.state"], basestring)
         assert isinstance(output["proc.cpu.start_time"], basestring)
+        self.check_username(output["proc.username"])
 
         for key in [
             "proc.pid",
@@ -49,3 +51,14 @@ def test_procs(self):
             "proc.mem.rss_p",
         ]:
             assert type(output[key]) in [int, float]
+
+    def check_username(self, observed, expected = None):
+        if expected == None:
+            expected = getpass.getuser()
+
+        if os.name == 'nt':
+            parts = observed.split("\\", 2)
+            assert len(parts) == 2, "Expected proc.username to be of form DOMAIN\username, but was %s" % observed
+            observed = parts[1]
+
+        assert expected == observed, "proc.username = %s, but expected %s" % (observed, expected)