Backport 1.2.1 - Topbeat

CHANGELOG.asciidoc

@@ -92,6 +92,8 @@ https://github.com/elastic/beats/compare/v1.1.2...v1.2.0[View commits]
 *Topbeat*
 
 - Add the command line used to start processes {issue}533[533]
+- Add username to processes {pull}845[845]
+- Fix issue with cpu.system_p being greater than 1 on Windows {pull}1128[1128]
 
 *Filebeat*
 

topbeat/beat/sigar.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/elastic/gosigar"
+	sigar "github.com/elastic/gosigar"
 )
 
 type SystemLoad struct {
@@ -269,11 +269,12 @@ func GetProcess(pid int, cmdline string) (*Process, error) {
 	}
 
 	proc := Process{
-		Pid:     pid,
-		Ppid:    state.Ppid,
-		Name:    state.Name,
-		State:   getProcState(byte(state.State)),
-		CmdLine: cmdline,
+		Pid:      pid,
+		Ppid:     state.Ppid,
+		Name:     state.Name,
+		State:    getProcState(byte(state.State)),
+		Username: state.Username,
+		CmdLine:  cmdline,
 		Mem: &ProcMemStat{
 			Size:  mem.Size,
 			Rss:   mem.Resident,

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

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/elastic/gosigar"
+	sigar "github.com/elastic/gosigar"
 
 	"github.com/elastic/beats/libbeat/beat"
 	"github.com/elastic/beats/libbeat/cfgfile"
@@ -213,12 +213,13 @@ func (t *Topbeat) exportProcStats() error {
 			newProcs[process.Pid] = process
 
 			proc := common.MapStr{
-				"pid":   process.Pid,
-				"ppid":  process.Ppid,
-				"name":  process.Name,
-				"state": process.State,
-				"mem":   process.Mem,
-				"cpu":   process.Cpu,
+				"pid":      process.Pid,
+				"ppid":     process.Ppid,
+				"name":     process.Name,
+				"state":    process.State,
+				"username": process.Username,
+				"mem":      process.Mem,
+				"cpu":      process.Cpu,
 			}
 
 			if process.CmdLine != "" {
@@ -383,9 +384,9 @@ func (t *Topbeat) addCpuPercentage(t2 *CpuTimes) {
 		calculate := func(field2 uint64, field1 uint64) float64 {
 
 			perc := 0.0
-			delta := field2 - field1
+			delta := int64(field2 - field1)
 			perc = float64(delta) / float64(all_delta)
-			return Round(perc, .5, 2)
+			return Round(perc, .5, 4)
 		}
 
 		t2.UserPercent = calculate(t2.User, t1.User)
@@ -405,9 +406,9 @@ func (t *Topbeat) addCpuPercentageList(t2 []CpuTimes) {
 		calculate := func(field2 uint64, field1 uint64, all_delta uint64) float64 {
 
 			perc := 0.0
-			delta := field2 - field1
+			delta := int64(field2 - field1)
 			perc = float64(delta) / float64(all_delta)
-			return Round(perc, .5, 2)
+			return Round(perc, .5, 4)
 		}
 
 		for i := 0; i < len(t1); i++ {
@@ -451,7 +452,7 @@ func (t *Topbeat) addProcCpuPercentage(proc *Process) {
 
 		t.procsMap[proc.Pid] = proc
 
-		proc.Cpu.UserPercent = Round(perc, .5, 2)
+		proc.Cpu.UserPercent = Round(perc, .5, 4)
 
 	}
 }

topbeat/beat/topbeat_test.go

@@ -93,8 +93,8 @@ func TestCpuPercentage(t *testing.T) {
 
 	beat.addCpuPercentage(&cpu2)
 
-	assert.Equal(t, cpu2.UserPercent, 0.95)
-	assert.Equal(t, cpu2.SystemPercent, 0.04)
+	assert.Equal(t, cpu2.UserPercent, 0.9502)
+	assert.Equal(t, cpu2.SystemPercent, 0.0448)
 }
 
 func TestProcMemPercentage(t *testing.T) {
@@ -146,5 +146,5 @@ func TestProcCpuPercentage(t *testing.T) {
 	beat.procsMap[p1.Pid] = &p1
 
 	beat.addProcCpuPercentage(&p2)
-	assert.Equal(t, p2.Cpu.UserPercent, 3.46)
+	assert.Equal(t, p2.Cpu.UserPercent, 3.459)
 }

topbeat/tests/system/test_procs.py

@@ -1,4 +1,6 @@
 import re
+import os
+import getpass
 from topbeat import TestCase
 
 
@@ -30,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",
@@ -48,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)