TZ default on for this module. Update docs & tests

elastic · May 16, 2019 · cb8e632 · cb8e632
1 parent 734359a
commit cb8e632
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/filebeat/docs/include/var-convert-timezone.asciidoc b/filebeat/docs/include/var-convert-timezone.asciidoc
@@ -5,4 +5,6 @@ parsing time to convert the timestamp to UTC. The local timezone is also added
 in each event in a dedicated field (`beat.timezone`). The conversion is only
 possible in Elasticsearch >= 6.1. If the Elasticsearch version is less than 6.1,
 the `beat.timezone` field is added, but the conversion to UTC is not made.  The
-default is `false`.
+default is
+ifdef::default_convert_timezone[`true`]
+ifndef::default_convert_timezone[`false`]
diff --git a/filebeat/docs/modules/rabbitmq.asciidoc b/filebeat/docs/modules/rabbitmq.asciidoc
@@ -52,11 +52,14 @@ include::../include/config-option-intro.asciidoc[]
 
 include::../include/var-paths.asciidoc[]
 
+:default_convert_timezone: true
+
 include::../include/var-convert-timezone.asciidoc[]
 
 :has-dashboards!:
 
 :fileset_ex!:
+:default_convert_timezone!:
 
 :modulename!:
 

diff --git a/x-pack/filebeat/module/rabbitmq/_meta/docs.asciidoc b/x-pack/filebeat/module/rabbitmq/_meta/docs.asciidoc
@@ -47,10 +47,13 @@ include::../include/config-option-intro.asciidoc[]
 
 include::../include/var-paths.asciidoc[]
 
+:default_convert_timezone: true
+
 include::../include/var-convert-timezone.asciidoc[]
 
 :has-dashboards!:
 
 :fileset_ex!:
+:default_convert_timezone!:
 
 :modulename!:
diff --git a/x-pack/filebeat/module/rabbitmq/log/manifest.yml b/x-pack/filebeat/module/rabbitmq/log/manifest.yml
@@ -9,7 +9,7 @@ var:
     os.windows:
       #- '%APPDATA%\RabbitMQ\log\[email protected]*'
   - name: convert_timezone
-    default: false
+    default: true
     # if ES < 6.1.0, this flag switches to false automatically when evaluating the
     # pipeline
     min_elasticsearch_version:

diff --git a/x-pack/filebeat/module/rabbitmq/log/test/test.log-expected.json b/x-pack/filebeat/module/rabbitmq/log/test/test.log-expected.json
@@ -4,6 +4,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -17,6 +18,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.flags": [
@@ -33,6 +35,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.flags": [
@@ -49,6 +52,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -62,6 +66,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.flags": [
@@ -78,6 +83,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -91,6 +97,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "warning",
@@ -104,6 +111,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -117,6 +125,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -130,6 +139,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -143,6 +153,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -156,6 +167,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -169,6 +181,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -182,6 +195,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -195,6 +209,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -208,6 +223,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -221,6 +237,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -234,6 +251,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -247,6 +265,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.flags": [
@@ -263,6 +282,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.flags": [
@@ -279,6 +299,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -292,6 +313,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -305,6 +327,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.flags": [
@@ -321,6 +344,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",
@@ -334,6 +358,7 @@
         "ecs.version": "1.0.0",
         "event.dataset": "rabbitmq.log",
         "event.module": "rabbitmq",
+        "event.timezone": "+00:00",
         "fileset.name": "log",
         "input.type": "log",
         "log.level": "info",