Add event.dataset to events from cloudfoundry filebeat input (#17029) (…

…#17096) * Use cloudfoundry.type. * Add possible values from cloudfoundry.type and fix String() call. (cherry picked from commit a86bf32)
elastic · Mar 19, 2020 · cf18846 · cf18846
1 parent e818bf8
commit cf18846
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git 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. Possible values include 'container', 'counter' and 'value'.
+
+
+type: keyword
+
+--
+
 [float]
 === app
 

diff --git 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
@@ -8,6 +8,11 @@
       type: group
       description: >
       fields:
+        - name: type
+          type: keyword
+          description: >
+            The type of event from Cloud Foundry.
+            Possible values include 'container', 'counter' and 'value'.
         - name: app
           type: group
           description: >

diff --git a/x-pack/metricbeat/module/cloudfoundry/fields.go b/x-pack/metricbeat/module/cloudfoundry/fields.go