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

Cherry-pick #9869 to 6.x: Handle IPv6 zone id in IIS filebeat ingest pipeline #9932

Merged
merged 3 commits into from
Jan 9, 2019
Merged

Cherry-pick #9869 to 6.x: Handle IPv6 zone id in IIS filebeat ingest pipeline #9932

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
3c7c650
Handle IPv6 zone id in IIS filebeat ingest pipeline (#9869)
jsoriano Jan 7, 2019
41d9e30
Regenerate expected json
jsoriano Jan 8, 2019
6c4a7d4
Fix changelog conflict
jsoriano Jan 8, 2019
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 @@ -67,6 +67,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
- Fix saved objects in filebeat haproxy dashboard. {pull}9417[9417]
- Fixed a memory leak when harvesters are closed. {pull}7820[7820]
- Add `convert_timezone` option to Elasticsearch module to convert dates to UTC. {issue}9756[9756] {pull}9761[9761]
- Support IPv6 addresses with zone id in IIS ingest pipeline. {issue}9836[9836] {pull}9869[9869]

*Heartbeat*

Expand Down
16 changes: 15 additions & 1 deletion filebeat/module/iis/error/ingest/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,24 @@
"field": "iis.error.time"
}
}, {
"geoip": {
"grok": {
"field": "iis.error.remote_ip",
"patterns": [
"%{NOZONEIP:iis.error.remote_ip_geoip}"
],
"pattern_definitions": {
"NOZONEIP": "[^%]*"
}
}
}, {
"geoip": {
"field": "iis.error.remote_ip_geoip",
"target_field": "iis.error.geoip"
}
}, {
"remove": {
"field": "iis.error.remote_ip_geoip"
}
}],
"on_failure" : [{
"set" : {
Expand Down
5 changes: 5 additions & 0 deletions filebeat/module/iis/error/test/ipv6_zone_id.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Software: Microsoft HTTP API 2.0
#Version: 1.0
#Date: 2018-12-30 13:48:36
#Fields: date time c-ip c-port s-ip s-port cs-version cs-method cs-uri streamid sc-status s-siteid s-reason s-queuename
2018-12-30 14:22:07 ::1%0 49958 ::1%0 80 - - - - - - Timer_ConnectionIdle -
17 changes: 17 additions & 0 deletions filebeat/module/iis/error/test/ipv6_zone_id.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"@timestamp": "2018-12-30T14:22:07.000Z",
"event.dataset": "iis.error",
"fileset.module": "iis",
"fileset.name": "error",
"iis.error.queue_name": "-",
"iis.error.reason_phrase": "Timer_ConnectionIdle",
"iis.error.remote_ip": "::1%0",
"iis.error.remote_port": "49958",
"iis.error.server_ip": "::1%0",
"iis.error.server_port": "80",
"input.type": "log",
"offset": 195,
"prospector.type": "log"
}
]