From 66cfd29eb3ac32b2313aec8bad857f78417510cf Mon Sep 17 00:00:00 2001
From: Blake Rouse <blake.rouse@elastic.co>
Date: Wed, 18 Mar 2020 12:27:06 -0400
Subject: [PATCH] Use cloudfoundry.type.

---
 metricbeat/docs/fields.asciidoc                        | 10 ++++++++++
 x-pack/libbeat/common/cloudfoundry/events.go           |  2 +-
 x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml |  4 ++++
 x-pack/metricbeat/module/cloudfoundry/fields.go        |  2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 95b723445ee..6e320a8b09e 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -4633,6 +4633,16 @@ Cloud Foundry module
 
 
 
+*`cloudfoundry.type`*::
++
+--
+The type of event from Cloud Foundry.
+
+
+type: keyword
+
+--
+
 [float]
 === app
 
diff --git a/x-pack/libbeat/common/cloudfoundry/events.go b/x-pack/libbeat/common/cloudfoundry/events.go
index ae038aadead..b7c9f3db8ad 100644
--- a/x-pack/libbeat/common/cloudfoundry/events.go
+++ b/x-pack/libbeat/common/cloudfoundry/events.go
@@ -492,9 +492,9 @@ func envelopMap(evt Event) common.MapStr {
 func baseMap(evt Event) common.MapStr {
 	return common.MapStr{
 		"cloudfoundry": common.MapStr{
+			"type": evt.String,
 			evt.String(): common.MapStr{
 				"timestamp": evt.Timestamp(),
-				"type":      evt.String(),
 			},
 			"envelope": envelopMap(evt),
 		},
diff --git a/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml b/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
index 0190cac342e..426074bf9ad 100644
--- a/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
+++ b/x-pack/metricbeat/module/cloudfoundry/_meta/fields.yml
@@ -8,6 +8,10 @@
       type: group
       description: >
       fields:
+        - name: type
+          type: keyword
+          description: >
+            The type of event from Cloud Foundry.
         - name: app
           type: group
           description: >
diff --git a/x-pack/metricbeat/module/cloudfoundry/fields.go b/x-pack/metricbeat/module/cloudfoundry/fields.go
index 1d3e678ea94..5aa7e058895 100644
--- a/x-pack/metricbeat/module/cloudfoundry/fields.go
+++ b/x-pack/metricbeat/module/cloudfoundry/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetCloudfoundry returns asset data.
 // This is the base64 encoded gzipped contents of module/cloudfoundry.
 func AssetCloudfoundry() string {
-	return "eJzclbFy2zAQRHt+xY178wNYpIgzmXGXwqljCFhKGIEAAxwk8+8zoESbpCDFCWUVVqHiAL5d7uGIe9qiq0gaF1XtolW+K4hYs0FFd+PyXUGkEKTXLWtnK/pSEBE9pC30/bCHGqeiQUHkYSACKsJLC68bWBamIKo1jApV/+g9WdHgRDz9uGtR0dq72B4rGekpbUwUbftay8HOAg+/pw0Swmgp0jLxBtSAvZakA4kQnNSCoWiveVOOHp37GXvSalIebG3R7Z2fr10wNxh8/Eau7q2NrJYnUUhnWWgLvySQ51fK8wAMb+RjNoFq75rpgRiHc+5IvCs8G1hYiV/aKrxkgzTOrv8pxceEGjIcBMa9XiExA7Ers6ZkG8tWctZNbZyYr/ylqQ8/flIMYg1q4WVKZ428cIPG+a5cdYxwnSzoa2KlMGKAGgQuif+OjsXHWBA7oY1YGVz0oXTYfmAEgZ0/24Be+yYJnNh4m+toefFU94zJTPeVG0x0+r/uBzERh3E+vseZ7sGwuFLLkrDSdQ2P9PVYgffA4cYwIjCxbjB2RNjBMjkpo/dQeYPspjkuNdjzaCdMBNXO5xMaxPtti45VT/iEh6p/r3zHotX5e+C/hRPxHcLzbtGSG+hp0JoJ/wkAAP//aoqyCQ=="
+	return "eJzclTF32yAUhXf/ineyxz9AQ4emp+dk65DODYYrm2MEFB529O97kK1EsrDjVk6GatDwBPdevgfinrZoK5LGJVW7ZFVoF0Ss2aCiu2H5bkGkEGXQnrWzFX1ZEBE95CH0/TCGGqeSwYIowEBEVIQXj6AbWBZmQVRrGBWrbuo9WdFgYp4fbj0qWgeX/LFSsB6rDRXz9Ndir7ZFu3dBDepFzcPztEE3jVxN2MEy1cE149UuJ77C+4ntcBFXmArvjZYifybegBpw0JJ0JBGjk1owFO01b5aDqacchpm0GpXP03gnXB/w8VtmwuOoUxTSWRbaIswB8vyq8twLxjflI5t4sTXnt+JV8GxkYSV+aavwUgRpnF3/FcXHLNUz7A2GvV4ha0ZityyGkj4tveRimto4cfrlnaY+/PhJKYo1yCPITGeNsnGDxoV2uWoZ8TYs6GvWyjBShOoNLpn/To7Fx0QQO6GNWBlczKF03H4ggsgunG1A5/0pBCYx3s51sjz7VHcaozPdVT7hROf3bX+IWbE/zsd1nOkeDIsbtSwbK13XCMh/jxV4DxxuDCMiE+sGw0THS8xJmUKAKgdkN+Y4N2CnRzthEqh2oUyoN++GzdpWncJ/uKm6dZU7lqwu3wP/bJwVrzA+7RbNuYGeeq8T4z8BAAD//5OH0vI="
 }