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

Cherry-pick #9603 to 6.x: Fixes parsing of GC entries in elasticsearch server log #9810

Merged
merged 3 commits into from
Jan 8, 2019

Conversation

ycombinator
Copy link
Contributor

Cherry-pick of PR #9603 to 6.x branch. Original message:

Resolves #9513.

This PR:

  • removes the incorrectly-parsed gc_overhead field. Turns out what we were parsing was actually an insignificant sequential number, not GC overhead,
  • parses out a new gc.collection_duration field, e.g. 1.2s, which is the time spent performing GC, and
  • parses out a new gc.observation_duration field, e.g. 1.8s, which is the overall time over which GC collection was performed

It also splits up the long grok expression in the ingest pipeline into smaller patterns and references those patterns, hopefully for easier readability.

@ycombinator
Copy link
Contributor Author

If you look at the diff of this PR and compare it with the diff of the original PR to master, you will notice that this PR's diff has a lot more lines changed. That's misleading because most of these changes are formatting changes which change the whitespace. So best to view this PR's diff while ignoring whitespace, like so: https://github.com/elastic/beats/pull/9810/files?w=1

@ruflin
Copy link
Contributor

ruflin commented Dec 28, 2018

Should this PR have a changelog? Is this a breaking change?

@tsouza
Copy link

tsouza commented Dec 28, 2018 via email

@ycombinator
Copy link
Contributor Author

Technically this is a breaking change, but as @tsouza pointed out the old field was meaningless. Tangential note: this module is in beta, so hopefully its okay to make the breaking change in a minor version?

Regardless, I think this deserves an entry in the CHANGELOG. I missed it in the original PR to master (#9603) but will add an entry here.

@ycombinator
Copy link
Contributor Author

@ruflin I added two CHANGELOG entries, or rather the same entry under two sections: breaking changes and bug fixes. Do you think this is okay?

@ruflin
Copy link
Contributor

ruflin commented Dec 28, 2018

@ycombinator I'm also good if we agree that it was a bug :-) Can you add this also the .next Changelog in case you are already touching the PR?

ycombinator added a commit that referenced this pull request Dec 28, 2018
I missed adding CHANGELOG entries in #9603 so this PR follows up with said entries. No need to backport as the CHANGELOG entries were added in the original backport PR: #9810.
@ycombinator
Copy link
Contributor Author

@ruflin I've updated this PR per your feedback and CI is green now. Mind taking another look at it, when you get a chance? Thanks.

@ycombinator ycombinator merged commit ec704cd into elastic:6.x Jan 8, 2019
@ycombinator ycombinator deleted the backport_9603_6.x branch January 8, 2019 13:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants