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

Jump to bottom

Add support for iis 7.5 log with different format of destination/source address #11256

Merged
merged 3 commits into from
Mar 16, 2019
Merged

Add support for iis 7.5 log with different format of destination/source address #11256

merged 3 commits into from
Mar 16, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

Currently we only support destination/source address look like:
[10.100.220.70](http://10.100.220.70)
This PR is to add support for format like:
10.100.220.70

closes: #11255

@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner March 14, 2019 20:32
@kaiyan-sheng kaiyan-sheng self-assigned this Mar 14, 2019
@kaiyan-sheng kaiyan-sheng added Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team v7.0.0 v6.7.0 labels Mar 14, 2019
ruflin
ruflin reviewed Mar 15, 2019
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

We have 2 new patterns but only 1 log line to test? I might miss something but I would expect at least 2 new log lines for testing.

@kaiyan-sheng
Copy link
Contributor Author

We have 2 new patterns but only 1 log line to test? I might miss something but I would expect at least 2 new log lines for testing.

We only have 1 new pattern here 😄 It shows 2 new patterns on github diff is because I have to add a , to the end of the previous pattern.

ruflin
ruflin approved these changes Mar 15, 2019
View reviewed changes
Copy link
Member

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Oh, got it :-) Could you rebase this on master with this also the Elasticsearch tests should go green (skipped). The failing windows tests I have never seen before, worth opening a flaky test issue for it.

@kaiyan-sheng
Copy link
Contributor Author

jenkins, test this please

@kaiyan-sheng kaiyan-sheng merged commit e5ffcd6 into elastic:master Mar 16, 2019
@kaiyan-sheng kaiyan-sheng deleted the iis_7.5_grok branch March 16, 2019 02:19
@kaiyan-sheng kaiyan-sheng removed needs_backport PR is waiting to be backported to other branches. v6.7.0 v7.0.0 labels Mar 17, 2019
ruflin pushed a commit that referenced this pull request Mar 18, 2019
@kaiyan-sheng @ruflin
Cherry-pick to 6.7: Change URLPATH grok pattern (#11252) and support …
a861459 
…diff format of addresses (#11256) (#11272)

* Change URLPATH grok pattern to support []
(cherry picked from commit 1f68e2b)

* Add support for iis 7.5 log with different format of destination/source address
(cherry picked from commit e5ffcd6)
ruflin pushed a commit that referenced this pull request Mar 18, 2019
@kaiyan-sheng @ruflin
Cherry-pick to 7.0: Change URLPATH grok pattern (#11252) and support …
712f1db 
…diff format of addresses (#11256) (#11270)

* Change URLPATH grok pattern to support []
(cherry picked from commit 1f68e2b)

* Add support for iis 7.5 log with different format of destination/source address
(cherry picked from commit e5ffcd6)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruflin ruflin ruflin approved these changes

@jsoriano jsoriano jsoriano approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
Filebeat Filebeat Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

File Beat IIS Module doesn't support iis 7.5 log
4 participants
@kaiyan-sheng @jsoriano @ruflin @alvarolobato