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.

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

[7.6] Fix Elasticsearch GC logs ingestion from Docker logs (#17164) #17207

Merged
merged 3 commits into from
Mar 25, 2020
Merged

[7.6] Fix Elasticsearch GC logs ingestion from Docker logs (#17164) #17207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e72c98
Fix Elasticsearch GC logs ingestion from Docker logs (#17164)
ycombinator Mar 24, 2020
9f78da1
Cleaning up CHANGELOG
ycombinator Mar 25, 2020
5c25a3c
Removing event.{kind,category,type} fields (only available starting 7.7)
ycombinator Mar 25, 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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix s3 input with cloudtrail fileset reading json file. {issue}16374[16374] {pull}16441[16441]
- Add queue_url definition in manifest file for aws module. {pull}16640{16640}
- Fixed a mapping exception when ingesting CEF logs that used the spriv or dpriv extensions. {issue}17216[17216] {pull}17220[17220]
- Fix `elasticsearch.gc` fileset to not collect _all_ logs when Elasticsearch is running in Docker. {issue}13164[13164] {issue}16583[16583] {pull}17164[17164]

*Heartbeat*

Expand Down
4 changes: 2 additions & 2 deletions filebeat/module/elasticsearch/gc/config/gc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ paths:
- {{$path}}
{{ end }}
exclude_files: [".gz$"]
exclude_lines: ["^(OpenJDK|Java HotSpot).* Server VM ", "^CommandLine flags: ", "^Memory: "] # exclude JVM8 banner
exclude_lines: ["^(OpenJDK|Java HotSpot).* Server VM ", "^CommandLine flags: ", "^Memory: ", "^{"] # exclude JVM8 banner and JSON
multiline:
pattern: '^\[?[0-9]{4}-[0-9]{2}-[0-9]{2}'
pattern: '^(\[?[0-9]{4}-[0-9]{2}-[0-9]{2}|{)'
negate: true
match: after
Loading