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: #10030 and #9869 to 6.5: Handle IPv6 zone id in IIS filebeat ingest pipeline #10057

Merged
merged 5 commits into from
Jan 21, 2019

Conversation

jsoriano
Copy link
Member

@jsoriano jsoriano commented Jan 14, 2019

Cherry-pick of #10030 and #9869 to 6.5.

jsoriano and others added 2 commits January 14, 2019 17:58
…ingest pipeline (elastic#9933)

IIS logs can include zone ids when using IPv6, this is correctly parsed
but geoip processor doesn't accept these addresses. Create a temporary
field without the zone id to be used by geoip processor.

(cherry picked from commit d59ae8c)
(cherry picked from commit 5f1f6ca)
… ingest pipeline for access logs too (elastic#10030)

(cherry picked from commit e05f967)
@jsoriano jsoriano requested a review from webmat January 14, 2019 17:02
@jsoriano jsoriano changed the title Cherry-pick: #9836 and #9869 to 6.5: Handle IPv6 zone id in IIS filebeat ingest pipeline Cherry-pick: #10030 and #9869 to 6.5: Handle IPv6 zone id in IIS filebeat ingest pipeline Jan 14, 2019
@ruflin
Copy link
Member

ruflin commented Jan 14, 2019

Can you regenerate the golden files? Seem CI is not happy with this backport variant.

@jsoriano
Copy link
Member Author

Expected json is fine for the modified module, failing ones seem to be #9855, I'll backport this too to 6.5 so it goes back to green.

Copy link
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code changes LGTM.

Should be good after rebasing over #10072

@webmat
Copy link
Contributor

webmat commented Jan 21, 2019

@jsoriano You're not forgetting about this, right? ;-)

@jsoriano
Copy link
Member Author

@webmat thanks for the ping ;)

Copy link
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jsoriano jsoriano merged commit 4427f57 into elastic:6.5 Jan 21, 2019
@jsoriano jsoriano deleted the backport_9836_6.5 branch January 21, 2019 20:50
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…id in IIS filebeat ingest pipeline (elastic#10057)

IIS logs can include zone ids when using IPv6, this is correctly parsed
but geoip processor doesn't accept these addresses. Create a temporary
field without the zone id to be used by geoip processor.

(cherry picked from commit dad84e9)
(cherry picked from commit 5f1f6ca)
(cherry picked from commit e05f967)

Co-authored-by: Mathieu Martin <webmat@gmail.com>
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