[metricbeat] Add windows memory data to docker/memory (#12172)

Adding windows memory data to docker/memory

metricbeat/docs/fields.asciidoc

@@ -4539,6 +4539,49 @@ Memory metrics.
 
 
 
+[float]
+== commit fields
+
+Committed bytes on Windows
+
+
+
+*`docker.memory.commit.total`*::
++
+--
+type: long
+
+format: bytes
+
+Total bytes
+
+
+--
+
+*`docker.memory.commit.peak`*::
++
+--
+type: long
+
+format: bytes
+
+Peak committed bytes on Windows
+
+
+--
+
+*`docker.memory.private_working_set.total`*::
++
+--
+type: long
+
+format: bytes
+
+private working sets on Windows
+
+
+--
+
 *`docker.memory.fail.count`*::
 +
 --

metricbeat/module/docker/memory/_meta/fields.yml

@@ -4,7 +4,26 @@
     Memory metrics.
   release: ga
   fields:
-
+    - name: commit
+      type: group
+      description: >
+        Committed bytes on Windows
+      fields:
+        - name: total
+          type: long
+          format: bytes
+          description: >
+            Total bytes
+        - name: peak
+          type: long
+          format: bytes
+          description: >
+            Peak committed bytes on Windows
+    - name: private_working_set.total
+      type: long
+      format: bytes
+      description: >
+        private working sets on Windows
     - name: fail.count
       type: scaled_float
       description: >
@@ -49,3 +68,4 @@
           format: bytes
           description: >
             Total memory usage.
+

metricbeat/module/docker/memory/data.go

@@ -29,20 +29,35 @@ func eventsMapping(r mb.ReporterV2, memoryDataList []MemoryData) {
 }
 
 func eventMapping(r mb.ReporterV2, memoryData *MemoryData) {
-	fields := common.MapStr{
-		"fail": common.MapStr{
-			"count": memoryData.Failcnt,
-		},
-		"limit": memoryData.Limit,
-		"rss": common.MapStr{
-			"total": memoryData.TotalRss,
-			"pct":   memoryData.TotalRssP,
-		},
-		"usage": common.MapStr{
-			"total": memoryData.Usage,
-			"pct":   memoryData.UsageP,
-			"max":   memoryData.MaxUsage,
-		},
+
+	//if we have windows memory data, just report windows stats
+	var fields common.MapStr
+	if memoryData.Commit+memoryData.CommitPeak+memoryData.PrivateWorkingSet > 0 {
+		fields = common.MapStr{
+			"commit": common.MapStr{
+				"total": memoryData.Commit,
+				"peak":  memoryData.CommitPeak,
+			},
+			"private_working_set": common.MapStr{
+				"total": memoryData.PrivateWorkingSet,
+			},
+		}
+	} else {
+		fields = common.MapStr{
+			"fail": common.MapStr{
+				"count": memoryData.Failcnt,
+			},
+			"limit": memoryData.Limit,
+			"rss": common.MapStr{
+				"total": memoryData.TotalRss,
+				"pct":   memoryData.TotalRssP,
+			},
+			"usage": common.MapStr{
+				"total": memoryData.Usage,
+				"pct":   memoryData.UsageP,
+				"max":   memoryData.MaxUsage,
+			},
+		}
 	}
 
 	r.Event(mb.Event{

metricbeat/module/docker/memory/helper.go

@@ -33,6 +33,10 @@ type MemoryData struct {
 	TotalRssP float64
 	Usage     uint64
 	UsageP    float64
+	//Windows-only memory stats
+	Commit            uint64
+	CommitPeak        uint64
+	PrivateWorkingSet uint64
 }
 
 // MemoryService is placeholder for the the memory stat parsers
@@ -66,5 +70,9 @@ func (s *MemoryService) getMemoryStats(myRawStat docker.Stat, dedot bool) Memory
 		TotalRssP: float64(totalRSS) / float64(myRawStat.Stats.MemoryStats.Limit),
 		Usage:     myRawStat.Stats.MemoryStats.Usage,
 		UsageP:    float64(myRawStat.Stats.MemoryStats.Usage) / float64(myRawStat.Stats.MemoryStats.Limit),
+		//Windows memory statistics
+		Commit:            myRawStat.Stats.MemoryStats.Commit,
+		CommitPeak:        myRawStat.Stats.MemoryStats.CommitPeak,
+		PrivateWorkingSet: myRawStat.Stats.MemoryStats.PrivateWorkingSet,
 	}
 }