diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5a7a96a37415..dc3f1b92a332 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -36,6 +36,8 @@ https://github.com/elastic/beats/compare/v6.6.2...6.6[Check the HEAD diff] *Filebeat* +- Fix a bug with the convert_timezone option using the incorrect timezone field. {issue}11055[11055] {pull}11164[11164] + *Heartbeat* *Journalbeat* diff --git a/filebeat/module/elasticsearch/audit/ingest/pipeline.json b/filebeat/module/elasticsearch/audit/ingest/pipeline.json index 6e1d5be7e215..02678cc4eaf2 100644 --- a/filebeat/module/elasticsearch/audit/ingest/pipeline.json +++ b/filebeat/module/elasticsearch/audit/ingest/pipeline.json @@ -64,7 +64,7 @@ "formats": [ "ISO8601" ], - {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} + {< if .convert_timezone >}"timezone": "{{ beat.timezone }}",{< end >} "ignore_failure": true } }, diff --git a/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json b/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json index 8f126f11e2f0..c1e09e668f22 100755 --- a/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json +++ b/filebeat/module/elasticsearch/deprecation/ingest/pipeline.json @@ -33,7 +33,7 @@ "formats": [ "ISO8601" ], - {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} + {< if .convert_timezone >}"timezone": "{{ beat.timezone }}",{< end >} "ignore_failure": true } }, diff --git a/filebeat/module/elasticsearch/server/ingest/pipeline.json b/filebeat/module/elasticsearch/server/ingest/pipeline.json index 8cdd79353419..77a165388c08 100755 --- a/filebeat/module/elasticsearch/server/ingest/pipeline.json +++ b/filebeat/module/elasticsearch/server/ingest/pipeline.json @@ -34,7 +34,7 @@ "formats": [ "ISO8601" ], - {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} + {< if .convert_timezone >}"timezone": "{{ beat.timezone }}",{< end >} "ignore_failure": true } }, diff --git a/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json b/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json index 1d2f4d788704..52817649ee78 100644 --- a/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json +++ b/filebeat/module/elasticsearch/slowlog/ingest/pipeline.json @@ -26,7 +26,7 @@ "formats": [ "ISO8601" ], - {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} + {< if .convert_timezone >}"timezone": "{{ beat.timezone }}",{< end >} "ignore_failure": true } }, diff --git a/filebeat/module/logstash/log/ingest/pipeline-plain.json b/filebeat/module/logstash/log/ingest/pipeline-plain.json index 74c4bed15d16..f7a7caf31d1f 100644 --- a/filebeat/module/logstash/log/ingest/pipeline-plain.json +++ b/filebeat/module/logstash/log/ingest/pipeline-plain.json @@ -40,7 +40,7 @@ "formats": [ "ISO8601" ], - {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} + {< if .convert_timezone >}"timezone": "{{ beat.timezone }}",{< end >} "ignore_failure": true } }, diff --git a/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json b/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json index ba7c1f5903c4..af330e5c3118 100644 --- a/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json +++ b/filebeat/module/logstash/slowlog/ingest/pipeline-plain.json @@ -55,7 +55,7 @@ "formats": [ "ISO8601" ], - {< if .convert_timezone >}"timezone": "{{ event.timezone }}",{< end >} + {< if .convert_timezone >}"timezone": "{{ beat.timezone }}",{< end >} "ignore_failure": true } },