add changelog entries, clean up varable names/docs

elastic · Apr 9, 2019 · 6cad5e7 · 6cad5e7
1 parent f9ce7e8
commit 6cad5e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -76,6 +76,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 *Metricbeat*
 
 - Add _bucket to histogram metrics in Prometheus Collector {pull}11578[11578]
+- Prevent the docker/memory metricset from processing invalid events before container start {pull}11676[11676]
 
 *Packetbeat*
 

diff --git a/metricbeat/module/docker/memory/helper.go b/metricbeat/module/docker/memory/helper.go
@@ -22,7 +22,7 @@ import (
 	"github.com/elastic/beats/metricbeat/module/docker"
 )
 
-//MemoryData contains parsed container memory info
+// MemoryData contains parsed container memory info
 type MemoryData struct {
 	Time      common.Time
 	Container *docker.Container
@@ -35,19 +35,19 @@ type MemoryData struct {
 	UsageP    float64
 }
 
-//MemoryService is placeholder for the the memory stat parsers
+// MemoryService is placeholder for the the memory stat parsers
 type MemoryService struct{}
 
-func (s *MemoryService) getMemoryStatsList(rawStats []docker.Stat, dedot bool) []MemoryData {
+func (s *MemoryService) getMemoryStatsList(containers []docker.Stat, dedot bool) []MemoryData {
 	formattedStats := []MemoryData{}
-	for _, myRawStats := range rawStats {
+	for _, containerStats := range containers {
 		//There appears to be a race where a container will report with a stat object before it actually starts
 		//during this time, there doesn't appear to be any meaningful data,
 		// and Limit will never be 0 unless the container is not running & there's no cgroup data
-		if myRawStats.Stats.MemoryStats.Limit == 0 {
+		if containerStats.Stats.MemoryStats.Limit == 0 {
 			continue
 		}
-		formattedStats = append(formattedStats, s.getMemoryStats(myRawStats, dedot))
+		formattedStats = append(formattedStats, s.getMemoryStats(containerStats, dedot))
 	}
 
 	return formattedStats

diff --git a/metricbeat/module/docker/memory/memory.go b/metricbeat/module/docker/memory/memory.go
@@ -32,6 +32,7 @@ func init() {
 	)
 }
 
+// MetricSet type defines all fields of the MetricSet
 type MetricSet struct {
 	mb.BaseMetricSet
 	memoryService *MemoryService