Rename beat.timezone to event.timezone in add_locale processor (#9458)

elastic · Dec 13, 2018 · 4f0a65f · 4f0a65f
1 parent 7dfcade
commit 4f0a65f
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 21 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -15,6 +15,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha1...master[Check the HEAD d
 
 - Update add_cloud_metadata fields to adjust to ECS. {pull}9265[9265]
 - Automaticall cap signed integers to 63bits. {pull}8991[8991]
+- Rename beat.timezone to event.timezone. {pull}9458[9458]
 
 *Auditbeat*
 

diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc
@@ -2446,8 +2446,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go
diff --git a/dev-tools/ecs-migration.yml b/dev-tools/ecs-migration.yml
@@ -47,6 +47,11 @@
   alias6: true
   alias: true
 
+- from: beat.timezone
+  to: event.timezone
+  alias6: true
+  alias: true
+
 # Filebeat modules
 
 ## Suricata module

diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
@@ -561,8 +561,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -37,8 +37,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/journalbeat/docs/fields.asciidoc b/journalbeat/docs/fields.asciidoc
@@ -31,8 +31,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/journalbeat/include/fields.go b/journalbeat/include/fields.go
diff --git a/libbeat/_meta/fields.common.yml b/libbeat/_meta/fields.common.yml
@@ -5,9 +5,9 @@
     Contains common beat fields available in all event types.
   fields:
     - name: beat.timezone
-      description: >
-        The timezone as returned by the operating system on which the Beat is
-        running.
+      type: alias
+      migration: true
+      path: event.timezone
 
     - name: "@timestamp"
       type: date

diff --git a/libbeat/processors/add_locale/add_locale.go b/libbeat/processors/add_locale/add_locale.go
@@ -86,7 +86,7 @@ func newAddLocale(c *common.Config) (processors.Processor, error) {
 func (l addLocale) Run(event *beat.Event) (*beat.Event, error) {
 	zone, offset := time.Now().Zone()
 	format := l.Format(zone, offset)
-	event.PutValue("beat.timezone", format)
+	event.PutValue("event.timezone", format)
 	return event, nil
 }
 

diff --git a/libbeat/processors/add_locale/add_locale_test.go b/libbeat/processors/add_locale/add_locale_test.go
@@ -44,7 +44,7 @@ func TestExportTimezone(t *testing.T) {
 	actual := getActualValue(t, testConfig, input)
 
 	expected := common.MapStr{
-		"beat": map[string]string{
+		"event": map[string]string{
 			"timezone": zone,
 		},
 	}

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -819,8 +819,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/metricbeat/include/fields/fields.go b/metricbeat/include/fields/fields.go
diff --git a/packetbeat/docs/fields.asciidoc b/packetbeat/docs/fields.asciidoc
@@ -450,8 +450,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/packetbeat/include/fields.go b/packetbeat/include/fields.go
diff --git a/winlogbeat/docs/fields.asciidoc b/winlogbeat/docs/fields.asciidoc
@@ -32,8 +32,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/winlogbeat/include/fields.go b/winlogbeat/include/fields.go
diff --git a/x-pack/functionbeat/docs/fields.asciidoc b/x-pack/functionbeat/docs/fields.asciidoc
@@ -31,8 +31,9 @@ Contains common beat fields available in all event types.
 *`beat.timezone`*::
 +
 --
-The timezone as returned by the operating system on which the Beat is running.
+type: alias
 
+alias to: event.timezone
 
 --
 

diff --git a/x-pack/functionbeat/include/fields.go b/x-pack/functionbeat/include/fields.go