Skip to content

[8.0](backport #29773) ibmmq: Fix timestamp parsing #29788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 11, 2022
Merged

[8.0](backport #29773) ibmmq: Fix timestamp parsing #29788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee61cac
ibmmq: Fix timestamp parsing (#29773)
adriansr Jan 11, 2022
4623cf9
Missing changelog entry
adriansr Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix handling of IPv6 addresses in netflow flow events. {issue}19210[19210] {pull}29383[29383]
- Fix `sophos` KV splitting and syslog header handling {issue}24237[24237] {pull}29331[29331]
- Undo deletion of endpoint config from cloudtrail fileset in {pull}29415[29415]. {pull}29450[29450]
- ibmmq: Fixed `@timestamp` not being populated with correct values. {pull}29773[29773]

*Heartbeat*

Expand Down
1 change: 0 additions & 1 deletion filebeat/tests/system/test_modules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
"f5.bigipafm",
"fortinet.clientendpoint",
"haproxy.log",
"ibmmq.errorlog",
"icinga.startup",
"imperva.securesphere",
"infoblox.nios",
Expand Down
6 changes: 4 additions & 2 deletions x-pack/filebeat/module/ibmmq/errorlog/ingest/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ processors:
patterns:
- 'Process\(%{DATA:process.pid}\) User\(%{WORD:user.name}\) Program\(%{DATA:process.title}\)
Host\(%{DATA:host.hostname}\) Installation\(%{WORD:ibmmq.errorlog.installation}\)
VRMF\(%{DATA:service.version}\)( QMgr\(%{DATA:ibmmq.errorlog.qmgr}\))?( Time\(%{TIMESTAMP_ISO8601:@timestamp}\))?(
VRMF\(%{DATA:service.version}\)( QMgr\(%{DATA:ibmmq.errorlog.qmgr}\))?( Time\(%{TIMESTAMP_ISO8601:log_timestamp}\))?(
RemoteHost\(%{DATA:destination.address}\))?( ArithInsert1\(%{DATA:ibmmq.errorlog.arithinsert1}\))?(
ArithInsert2\(%{DATA:ibmmq.errorlog.arithinsert2}\))?( CommentInsert1\(%{DATA:ibmmq.errorlog.commentinsert1}\))?(
CommentInsert2\(%{DATA:ibmmq.errorlog.commentinsert2}\))?( CommentInsert3\(%{DATA:ibmmq.errorlog.commentinsert3}\))?
Expand All @@ -41,8 +41,10 @@ processors:
field: log_timestamp
target_field: '@timestamp'
formats:
- MM/dd/yyyy hh:mm:ss aa
- ISO8601
- MM/dd/yyyy hh:mm:ss a
- dd/MM/yyyy HH:mm:ss
- dd.MM.yyyy HH:mm:ss
ignore_failure: true
- append:
field: ibmmq.errorlog.commentinsert
Expand Down
30 changes: 15 additions & 15 deletions x-pack/filebeat/module/ibmmq/errorlog/test/AMQERR01.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"user.name": "felix"
},
{
"@timestamp": "2018-10-11T10:46:25.000Z",
"@timestamp": "2018-10-11T08:46:25.924Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -99,7 +99,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-11T10:46:26.000Z",
"@timestamp": "2018-10-11T08:46:26.343Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -132,7 +132,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-11T10:46:26.000Z",
"@timestamp": "2018-10-11T08:46:26.346Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -264,7 +264,7 @@
"user.name": "felix"
},
{
"@timestamp": "2018-10-28T15:12:07.000Z",
"@timestamp": "2018-10-28T14:12:07.685Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -297,7 +297,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-28T15:12:07.000Z",
"@timestamp": "2018-10-28T14:12:07.789Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -330,7 +330,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-28T15:12:08.000Z",
"@timestamp": "2018-10-28T14:12:08.663Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -363,7 +363,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-28T15:12:08.000Z",
"@timestamp": "2018-10-28T14:12:08.665Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -396,7 +396,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:48:52.000Z",
"@timestamp": "2018-10-29T15:48:52.594Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -429,7 +429,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:48:52.000Z",
"@timestamp": "2018-10-29T15:48:52.663Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -462,7 +462,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:48:53.000Z",
"@timestamp": "2018-10-29T15:48:53.368Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -495,7 +495,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:48:53.000Z",
"@timestamp": "2018-10-29T15:48:53.369Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -528,7 +528,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:49:35.000Z",
"@timestamp": "2018-10-29T15:49:35.477Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -561,7 +561,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:49:35.000Z",
"@timestamp": "2018-10-29T15:49:35.553Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -594,7 +594,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:49:36.000Z",
"@timestamp": "2018-10-29T15:49:36.447Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -627,7 +627,7 @@
"user.name": "MUSR_MQADMIN"
},
{
"@timestamp": "2018-10-29T16:49:36.000Z",
"@timestamp": "2018-10-29T15:49:36.448Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down
46 changes: 23 additions & 23 deletions x-pack/filebeat/module/ibmmq/errorlog/test/AMQERR01_QM1.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:00.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -33,7 +33,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:00.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -66,7 +66,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:00.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -99,7 +99,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -132,7 +132,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -165,7 +165,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -198,7 +198,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.012Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -231,7 +231,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -264,7 +264,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -297,7 +297,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -330,7 +330,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -363,7 +363,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -396,7 +396,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -429,7 +429,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -462,7 +462,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:01.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -495,7 +495,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:02.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -528,7 +528,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -561,7 +561,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.013Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -594,7 +594,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.014Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -627,7 +627,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.014Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -660,7 +660,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.014Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -693,7 +693,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.014Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down Expand Up @@ -726,7 +726,7 @@
"user.name": "felix"
},
{
"@timestamp": "2022-01-10T10:25:59.014Z",
"@timestamp": "2018-07-13T07:06:03.000Z",
"event.dataset": "ibmmq.errorlog",
"event.kind": "event",
"event.module": "ibmmq",
Expand Down
Loading