Skip to content
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.

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

[Filebeat] Fix checkpoint #21344

Merged
merged 24 commits into from
Sep 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a187097
fix checkpoint @timestamp already exists
Bernhard-Fluehmann Jul 14, 2020
ef21af8
Fix checkpoint @timestamp already existing, test logs
Bernhard-Fluehmann Jul 15, 2020
8a688ae
testfile
Bernhard-Fluehmann Jul 15, 2020
1bd4b93
Updated CHANGELOG
Bernhard-Fluehmann Aug 12, 2020
0ba6303
fix ASCIIDOC
Bernhard-Fluehmann Aug 12, 2020
dde9d3f
Merge branch 'master' into fix-checkpoint
Bernhard-Fluehmann Aug 12, 2020
493f88a
remove timestamp renaming since it produced strange error messages ab…
Bernhard-Fluehmann Aug 12, 2020
4f1023d
reenable tiemestamp rename
Bernhard-Fluehmann Aug 13, 2020
a210f7e
move comment in asciidoc to bugfixes
Bernhard-Fluehmann Aug 25, 2020
cd92c9c
move comment in asciidoc to bugfixes
Bernhard-Fluehmann Aug 25, 2020
549629e
Merge branch 'master' into fix-checkpoint
Bernhard-Fluehmann Aug 25, 2020
8d310f8
Merge remote-tracking branch 'upstream/master' into HEAD
Bernhard-Fluehmann Aug 27, 2020
a03787f
fix asciidoc
Bernhard-Fluehmann Aug 27, 2020
6f56470
fix asciidoc
Bernhard-Fluehmann Sep 8, 2020
fd388fd
Merge remote-tracking branch 'upstream/master' into fix-checkpoint
Bernhard-Fluehmann Sep 8, 2020
9951a11
fix tes log
Bernhard-Fluehmann Sep 8, 2020
1ab3467
remove empty lines
Bernhard-Fluehmann Sep 8, 2020
4b9ce13
Merge remote-tracking branch 'upstream/master' into fix-checkpoint
marc-gr Sep 15, 2020
067680f
Fix pipeline and re generate test files
marc-gr Sep 15, 2020
f35c665
Merge remote-tracking branch 'upstream/master' into fix-checkpoint
marc-gr Sep 21, 2020
5354750
Merge remote-tracking branch 'upstream/master' into fix-checkpoint
marc-gr Sep 28, 2020
ca969fa
Reorder changelog entry
marc-gr Sep 28, 2020
b16f761
Merge remote-tracking branch 'upstream/master' into fix-checkpoint
marc-gr Sep 28, 2020
aa77a9e
Merge branch 'master' of github.com:elastic/beats into fix-checkpoint
marc-gr Sep 29, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix an error updating file size being logged when EOF is reached. {pull}21048[21048]
- Fix error when processing AWS Cloudtrail Digest logs. {pull}21086[21086] {issue}20943[20943]
- Provide backwards compatibility for the `append` processor when Elasticsearch is less than 7.10.0. {pull}21159[21159]
- Fix checkpoint module when logs contain time field. {pull}20567[20567]

*Heartbeat*

Expand Down
21 changes: 13 additions & 8 deletions x-pack/filebeat/module/checkpoint/firewall/ingest/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@ processors:
- message
- host
ignore_missing: true
- set:
field: '@timestamp'
value: '{{syslog5424_ts}}'
if: ctx.checkpoint?.time == null
- rename:
field: "@timestamp"
target_field: "event.created"
ignore_missing: true
- date:
field: "syslog5424_ts"
formats: ["ISO8601", "UNIX"]
if: "ctx.checkpoint?.time == null"
- set:
field: event.module
value: checkpoint
Expand Down Expand Up @@ -578,10 +582,10 @@ processors:
field: checkpoint.industry_reference
target_field: vulnerability.id
ignore_missing: true
- rename:
field: checkpoint.time
target_field: '@timestamp'
ignore_missing: true
- date:
field: "checkpoint.time"
formats: ["ISO8601", "UNIX"]
if: "ctx.checkpoint?.time != null"
- rename:
field: checkpoint.message
target_field: message
Expand Down Expand Up @@ -795,6 +799,7 @@ processors:
- checkpoint.xlatesrc
- checkpoint.xlatedst
- checkpoint.uid
- checkpoint.time
- syslog5424_ts
ignore_missing: true
on_failure:
Expand Down
Loading