adding commit data to usage, changed type to bytes

elastic · May 13, 2019 · bd22180 · bd22180
1 parent 80af3f1
commit bd22180
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 35 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -4539,32 +4539,12 @@ Memory metrics.
 
 
 
-*`docker.memory.commit`*::
-+
---
-type: long
-
-Committed bytes
-
-
---
-
-*`docker.memory.commit_peak`*::
-+
---
-type: long
-
-Peak committed bytes
-
-
---
-
 *`docker.memory.private_working_set`*::
 +
 --
 type: long
 
-private working set
+private working sets
 
 
 --
@@ -4629,6 +4609,26 @@ Usage memory stats.
 
 
 
+*`docker.memory.usage.commit`*::
++
+--
+type: bytes
+
+Committed bytes on Windows
+
+
+--
+
+*`docker.memory.usage.commit_peak`*::
++
+--
+type: long
+
+Peak committed bytes on Windows
+
+
+--
+
 *`docker.memory.usage.max`*::
 +
 --

diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go
diff --git a/metricbeat/module/docker/memory/_meta/fields.yml b/metricbeat/module/docker/memory/_meta/fields.yml
@@ -4,20 +4,10 @@
     Memory metrics.
   release: ga
   fields:
-
-    - name: commit
-      type: long
-      description: >
-        Committed bytes
-    - name: commit_peak
-      type: long
-      description: >
-        Peak committed bytes
     - name: private_working_set
       type: long
       description: >
-        private working set
-
+        private working sets
     - name: fail.count
       type: scaled_float
       description: >
@@ -47,6 +37,14 @@
       description: >
         Usage memory stats.
       fields:
+        - name: commit
+          type: bytes
+          description: >
+            Committed bytes on Windows
+        - name: commit_peak
+          type: long
+          description: >
+            Peak committed bytes on Windows
         - name: max
           type: long
           format: bytes

diff --git a/metricbeat/module/docker/memory/data.go b/metricbeat/module/docker/memory/data.go
@@ -34,8 +34,10 @@ func eventMapping(r mb.ReporterV2, memoryData *MemoryData) {
 	var fields common.MapStr
 	if memoryData.Commit+memoryData.CommitPeak+memoryData.PrivateWorkingSet > 0 {
 		fields = common.MapStr{
-			"commit":              memoryData.Commit,
-			"commit_peak":         memoryData.CommitPeak,
+			"usage": common.MapStr{
+				"commit":      memoryData.Commit,
+				"commit_peak": memoryData.CommitPeak,
+			},
 			"private_working_set": memoryData.PrivateWorkingSet,
 		}
 	} else {