From 48d2295fdaea431e59b2d6b42a59044de02d5722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= <carlos@elastic.co>
Date: Tue, 15 Jan 2019 11:23:39 +0100
Subject: [PATCH] Move back docker event fields to it's namespace

---
 metricbeat/docs/fields.asciidoc                 | 16 ++++------------
 metricbeat/module/docker/event/_meta/fields.yml | 12 ++++--------
 metricbeat/module/docker/event/event.go         | 12 ++++--------
 metricbeat/module/docker/fields.go              |  2 +-
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 0c0d53c9c1b3..392e18c6f4f2 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -2783,9 +2783,7 @@ Event status
 *`docker.event.id`*::
 +
 --
-type: alias
-
-alias to: event.id
+type: keyword
 
 Event id when available
 
@@ -2805,9 +2803,7 @@ Event source
 *`docker.event.type`*::
 +
 --
-type: alias
-
-alias to: event.kind
+type: keyword
 
 The type of object emitting the event
 
@@ -2817,9 +2813,7 @@ The type of object emitting the event
 *`docker.event.action`*::
 +
 --
-type: alias
-
-alias to: event.action
+type: keyword
 
 The type of event
 
@@ -2829,9 +2823,7 @@ The type of event
 *`docker.event.time`*::
 +
 --
-type: alias
-
-alias to: event.created
+type: date
 
 Timestamp of event
 
diff --git a/metricbeat/module/docker/event/_meta/fields.yml b/metricbeat/module/docker/event/_meta/fields.yml
index 77e6be369ced..2292c4d1630a 100644
--- a/metricbeat/module/docker/event/_meta/fields.yml
+++ b/metricbeat/module/docker/event/_meta/fields.yml
@@ -9,8 +9,7 @@
       description: >
         Event status
     - name: id
-      type: alias
-      path: event.id
+      type: keyword
       description: >
         Event id when available
     - name: from
@@ -18,18 +17,15 @@
       description: >
         Event source
     - name: type
-      type: alias
-      path: event.kind
+      type: keyword
       description: >
         The type of object emitting the event
     - name: action
-      type: alias
-      path: event.action
+      type: keyword
       description: >
         The type of event
     - name: time
-      type: alias
-      path: event.created
+      type: date
       description: >
         Timestamp of event
     - name: actor
diff --git a/metricbeat/module/docker/event/event.go b/metricbeat/module/docker/event/event.go
index 9fd16a29c363..822651a69dfa 100644
--- a/metricbeat/module/docker/event/event.go
+++ b/metricbeat/module/docker/event/event.go
@@ -122,15 +122,11 @@ func (m *MetricSet) reportEvent(reporter mb.PushReporterV2, event events.Message
 
 	reporter.Event(mb.Event{
 		Timestamp: time,
-		RootFields: common.MapStr{
-			"event": common.MapStr{
-				"kind":    event.Type,
-				"action":  event.Action,
-				"created": time,
-				"id":      event.ID,
-			},
-		},
 		MetricSetFields: common.MapStr{
+			"id":     event.ID,
+			"type":   event.Type,
+			"action": event.Action,
+			"time":   event.Time,
 			"status": event.Status,
 			"from":   event.From,
 			"actor": common.MapStr{
diff --git a/metricbeat/module/docker/fields.go b/metricbeat/module/docker/fields.go
index 65ea74af0b5d..93c63b51644e 100644
--- a/metricbeat/module/docker/fields.go
+++ b/metricbeat/module/docker/fields.go
@@ -31,5 +31,5 @@ func init() {
 
 // Asset returns asset data
 func Asset() string {
-	return "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"
+	return "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"
 }