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

Fix Elasticsearch GC logs ingestion from Docker logs #17164

Merged
merged 7 commits into from
Mar 24, 2020
Merged

Fix Elasticsearch GC logs ingestion from Docker logs #17164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e779ce
[Filebeat][elasticsearch] fix JSON lines picked up in gc.logs
kesslerm Aug 2, 2019
265b2fd
Adding test files
ycombinator Mar 20, 2020
4b709d7
Adding CHANGELOG entry
ycombinator Mar 20, 2020
63e8fe3
Moving test files to correct fileset
ycombinator Mar 20, 2020
72d9496
Introduce GC log entry in test fixture + golden file
ycombinator Mar 20, 2020
ca4fb45
Make sure multiline pattern excludes lines starting with {
ycombinator Mar 24, 2020
93e1e0b
Fixing golden file
ycombinator Mar 24, 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 @@ -96,6 +96,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix Elasticsearch `_id` field set by S3 and Google Pub/Sub inputs. {pull}17026[17026]
- Fixed various Cisco FTD parsing issues. {issue}16863[16863] {pull}16889[16889]
- Fix default index pattern in IBM MQ filebeat dashboard. {pull}17146[17146]
- 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