Fix hound

Signed-off-by: chrismark <chrismarkou92@gmail.com>
elastic · Sep 18, 2019 · a106b3f · a106b3f
1 parent 9213aea
commit a106b3f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -4974,7 +4974,7 @@ format: percent
 
 --
 
-*`docker.cpu.total.normal.pct`*::
+*`docker.cpu.total.norm.pct`*::
 +
 --
 Total CPU usage normalized by the number of CPU cores.

diff --git a/metricbeat/module/docker/cpu/_meta/fields.yml b/metricbeat/module/docker/cpu/_meta/fields.yml
@@ -51,7 +51,7 @@
       format: percent
       description: >
         Total CPU usage.
-    - name: total.normal.pct
+    - name: total.norm.pct
       type: scaled_float
       format: percent
       description: >

diff --git a/metricbeat/module/docker/cpu/cpu_test.go b/metricbeat/module/docker/cpu/cpu_test.go
@@ -80,7 +80,7 @@ func TestCPUService_PerCpuUsage(t *testing.T) {
 			s.(common.MapStr).Delete("ticks")
 		}
 		if !equalEvent(tt.expected, out) {
-			t.Errorf("PerCpuUsage(%v) => %v, want %v", tt.given.CPUStats.CPUUsage.PercpuUsage, out, tt.expected)
+			t.Errorf("PerCPUUsage(%v) => %v, want %v", tt.given.CPUStats.CPUUsage.PercpuUsage, out, tt.expected)
 		}
 	}
 }

diff --git a/metricbeat/module/docker/cpu/data.go b/metricbeat/module/docker/cpu/data.go
@@ -30,7 +30,7 @@ func eventsMapping(r mb.ReporterV2, cpuStatsList []CPUStats) {
 
 func eventMapping(r mb.ReporterV2, stats *CPUStats) {
 	fields := common.MapStr{
-		"core": stats.PerCpuUsage,
+		"core": stats.PerCPUUsage,
 		"total": common.MapStr{
 			"pct": stats.TotalUsage,
 			"norm": common.MapStr{

diff --git a/metricbeat/module/docker/cpu/helper.go b/metricbeat/module/docker/cpu/helper.go
@@ -28,7 +28,7 @@ import (
 type CPUStats struct {
 	Time                                  common.Time
 	Container                             *docker.Container
-	PerCpuUsage                           common.MapStr
+	PerCPUUsage                           common.MapStr
 	TotalUsage                            float64
 	TotalUsageNormalized                  float64
 	UsageInKernelmode                     uint64
@@ -81,7 +81,7 @@ func (c *CPUService) getCPUStats(myRawStat *docker.Stat, dedot bool) CPUStats {
 	}
 
 	if c.Cores {
-		stats.PerCpuUsage = usage.PerCPU()
+		stats.PerCPUUsage = usage.PerCPU()
 	}
 
 	return stats

diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -4974,7 +4974,7 @@ format: percent @@
     --
-    *`docker.cpu.total.normal.pct`*::
+    *`docker.cpu.total.norm.pct`*::
     +
     --
     Total CPU usage normalized by the number of CPU cores.
@@ Expand Down @@