diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 8e94d1c76d6..d69eb7bda0c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -141,6 +141,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix timezone parsing of system module ingest pipelines. {pull}13308[13308] - Change iis url path grok pattern from URIPATH to NOTSPACE. {issue}12710[12710] {pull}13225[13225] {issue}7951[7951] {pull}13378[13378] - Add timezone information to apache error fileset. {issue}12772[12772] {pull}13304[13304] +- Fix timezone parsing of nginx module ingest pipelines. {pull}13369[13369] - Fix incorrect field references in envoyproxy dashboard {issue}13420[13420] {pull}13421[13421] *Heartbeat* diff --git a/filebeat/module/nginx/access/ingest/default.json b/filebeat/module/nginx/access/ingest/default.json index 381571edad4..874954e84d4 100644 --- a/filebeat/module/nginx/access/ingest/default.json +++ b/filebeat/module/nginx/access/ingest/default.json @@ -89,25 +89,7 @@ "formats": [ "dd/MMM/yyyy:H:m:s Z" ], - "ignore_failure": true - } - }, - { - "date": { - "if": "ctx.event.timezone != null", - "field": "@timestamp", - "formats": [ - "ISO8601" - ], - "timezone": "{{ event.timezone }}", - "on_failure": [ - { - "append": { - "field": "error.message", - "value": "{{ _ingest.on_failure_message }}" - } - } - ] + "on_failure": [{"append": {"field": "error.message", "value": "{{ _ingest.on_failure_message }}"}}] } }, { diff --git a/filebeat/module/nginx/error/ingest/pipeline.json b/filebeat/module/nginx/error/ingest/pipeline.json index 72d93a223f9..4c89300a92b 100644 --- a/filebeat/module/nginx/error/ingest/pipeline.json +++ b/filebeat/module/nginx/error/ingest/pipeline.json @@ -23,8 +23,9 @@ }, { "date": { "if": "ctx.event.timezone != null", - "field": "@timestamp", - "formats": ["ISO8601"], + "field": "nginx.error.time", + "target_field": "@timestamp", + "formats": ["yyyy/MM/dd H:m:s"], "timezone": "{{ event.timezone }}", "on_failure": [{"append": {"field": "error.message", "value": "{{ _ingest.on_failure_message }}"}}] }