Remove process.GetProcStatsEvents as not needed anymore (elastic#3066)

metricbeat/module/system/process/helper.go

@@ -34,11 +34,10 @@ type Process struct {
 }
 
 type ProcStats struct {
-	ProcStats bool
-	Procs     []string
-	regexps   []*regexp.Regexp
-	ProcsMap  ProcsMap
-	CpuTicks  bool
+	Procs    []string
+	regexps  []*regexp.Regexp
+	ProcsMap ProcsMap
+	CpuTicks bool
 }
 
 // newProcess creates a new Process object based on the state information.
@@ -124,7 +123,6 @@ func getProcFDUsage(pid int) (*sigar.ProcFDUsage, error) {
 func GetProcMemPercentage(proc *Process, totalPhyMem uint64) float64 {
 
 	// in unit tests, total_phymem is set to a value greater than zero
-
 	if totalPhyMem == 0 {
 		memStat, err := memory.GetMemory()
 		if err != nil {
@@ -310,26 +308,6 @@ func (procStats *ProcStats) GetProcStats() ([]common.MapStr, error) {
 	return processes, nil
 }
 
-func (procStats *ProcStats) GetProcStatsEvents() ([]common.MapStr, error) {
-	processes, err := procStats.GetProcStats()
-	if err != nil {
-		return nil, err
-	}
-
-	events := make([]common.MapStr, len(processes))
-	for _, proc := range processes {
-		event := common.MapStr{
-			"@timestamp": common.Time(time.Now()),
-			"type":       "process",
-			"proc":       proc,
-		}
-
-		events = append(events, event)
-	}
-
-	return events, nil
-}
-
 // unixTimeMsToTime converts a unix time given in milliseconds since Unix epoch
 // to a common.Time value.
 func unixTimeMsToTime(unixTimeMs uint64) common.Time {

metricbeat/module/system/process/process.go

@@ -48,8 +48,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	m := &MetricSet{
 		BaseMetricSet: base,
 		stats: &ProcStats{
-			ProcStats: true,
-			Procs:     config.Procs,
+			Procs: config.Procs,
 		},
 	}
 	err := m.stats.InitProcStats()