Skip to content

[microsoft_dhcp] Fix incorrect log parsing for DHCP host.domain -> host.name (redo) #4311

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

Merged
efd6 merged 24 commits into from
Sep 27, 2022
Merged

[microsoft_dhcp] Fix incorrect log parsing for DHCP host.domain -> host.name (redo) #4311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5625d41
Change host.domain to host.name
nicpenning Sep 22, 2022
24d9805
Fix improper field name
nicpenning Sep 22, 2022
4b6a2dc
Update field name in sample
nicpenning Sep 22, 2022
e7c13a9
Update documentation and ECS field
nicpenning Sep 22, 2022
c22fbc0
Update changelog.yml
nicpenning Sep 22, 2022
eb17199
Change host.domain to host.name
nicpenning Sep 22, 2022
05b68f5
Update host.domain to host.name
nicpenning Sep 22, 2022
3eb8ef6
Change host.domain and to host.name
nicpenning Sep 22, 2022
4fa634f
Change host.domain to host.name
nicpenning Sep 22, 2022
ffbf587
Update changelog.yml
nicpenning Sep 22, 2022
4384ed9
Update changelog.yml
nicpenning Sep 22, 2022
e128baf
Update changelog.yml
nicpenning Sep 22, 2022
f242e24
Add host.domain grok extraction from host.name
nicpenning Sep 22, 2022
4c2c8a6
Add host.domain grok extraction from host.name
nicpenning Sep 22, 2022
2e09bb5
Examples of host.domain extracted from host.name
nicpenning Sep 22, 2022
d8942bb
Add host.domain example
nicpenning Sep 22, 2022
2676208
Add host.domain back
nicpenning Sep 22, 2022
cc74f52
Add host.domain back in
nicpenning Sep 23, 2022
b501ddc
Update version info to latest
nicpenning Sep 24, 2022
33f65b0
Add host.domain example
nicpenning Sep 25, 2022
19a4fa7
Update test-log.log-expected.json
nicpenning Sep 27, 2022
29f8b8b
Update test-logv6.log-expected.json
nicpenning Sep 27, 2022
73259f7
Update sample_event.json
nicpenning Sep 27, 2022
e4c0668
Update README.md
nicpenning Sep 27, 2022
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
5 changes: 5 additions & 0 deletions packages/microsoft_dhcp/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.7.0"
changes:
- description: Change host.domain to host.name to reflect the event data and then extract host.domain from the host.name
type: enhancement
link: https://github.com/elastic/integrations/pull/4280
- version: "1.6.0"
changes:
- description: Update package to ECS 8.4.0
Expand Down
53 changes: 32 additions & 21 deletions packages/microsoft_dhcp/data_stream/log/_dev/test/pipeline/test-log.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
]
},
"host": {
"domain": "057182593757.test.com",
"ip": "172.28.43.169"
"domain": "test.com",
"ip": "172.28.43.169",
"name": "057182593757.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -118,8 +119,9 @@
]
},
"host": {
"domain": "1-07.test.com",
"ip": "172.28.53.173"
"domain": "test.com",
"ip": "172.28.53.173",
"name": "1-07.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -158,8 +160,9 @@
]
},
"host": {
"domain": "3-07.test.com",
"ip": "172.28.53.36"
"domain": "test.com",
"ip": "172.28.53.36",
"name": "3-07.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -240,8 +243,9 @@
]
},
"host": {
"domain": "035856103966.test.com",
"ip": "172.28.43.159"
"domain": "test.com",
"ip": "172.28.43.159",
"name": "035856103966.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -280,8 +284,9 @@
]
},
"host": {
"domain": "001100581357.test.com",
"ip": "172.28.40.35"
"domain": "test.com",
"ip": "172.28.40.35",
"name": "001100581357.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -321,11 +326,12 @@
]
},
"host": {
"domain": "host.test.com",
"domain": "test.com",
"ip": "192.168.2.1",
"mac": [
"00-00-00-00-00-00"
]
],
"name": "host.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -358,11 +364,12 @@
]
},
"host": {
"domain": "host.test.com",
"domain": "test.com",
"ip": "192.168.2.10",
"mac": [
"00-00-00-00-00-00"
]
],
"name": "host.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -401,11 +408,12 @@
]
},
"host": {
"domain": "host.test.com",
"domain": "test.com",
"ip": "192.168.2.20",
"mac": [
"00-00-00-00-00-00"
]
],
"name": "host.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -484,8 +492,9 @@
]
},
"host": {
"domain": "hostname.test.com",
"ip": "10.10.10.10"
"domain": "test.com",
"ip": "10.10.10.10",
"name": "hostname.test.com"
},
"log": {
"file": {
Expand Down Expand Up @@ -564,7 +573,8 @@
]
},
"host": {
"domain": "domain.local"
"domain": "local",
"name": "domain.local"
},
"log": {
"file": {
Expand Down Expand Up @@ -597,7 +607,8 @@
]
},
"host": {
"domain": "domain.local"
"domain": "local",
"name": "domain.local"
},
"log": {
"file": {
Expand Down Expand Up @@ -640,4 +651,4 @@
]
}
]
}
}
37 changes: 19 additions & 18 deletions packages/microsoft_dhcp/data_stream/log/_dev/test/pipeline/test-logv6.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@
"timezone": "America/New_York"
},
"host": {
"domain": "test.local"
"domain": "local",
"name": "test.local"
},
"log": {
"file": {
Expand Down Expand Up @@ -155,8 +156,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -197,8 +198,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -239,8 +240,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -281,8 +282,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -323,8 +324,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -365,8 +366,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -407,8 +408,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -449,8 +450,8 @@
]
},
"host": {
"domain": "test-host",
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6"
"ip": "2a02:cf40:add:4002:91f2:a9b2:e09a:6fc6",
"name": "test-host"
},
"log": {
"file": {
Expand Down Expand Up @@ -500,4 +501,4 @@
]
}
]
}
}
10 changes: 9 additions & 1 deletion packages/microsoft_dhcp/data_stream/log/elasticsearch/ingest_pipeline/dhcp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ processors:
- _tmp_.time
- message
- host.ip
- host.domain
- host.name
- _tmp_.mac
- user.name
- microsoft.dhcp.transaction_id
Expand All @@ -25,6 +25,14 @@ processors:
- microsoft.dhcp.relay_agent_info
- microsoft.dhcp.dns_error_code
ignore_failure: true
- grok:
field: host.name
if: 'ctx.host?.name != null && ctx.host.name.contains(".")'
patterns:
- "%{HOSTNAME}\\.%{GREEDYDATA:host.domain}"
pattern_definitions:
"HOSTNAME": "[^.]+"
ignore_failure: true
- set:
field: _tmp_.timestamp
value: "{{{_tmp_.date}}} {{{_tmp_.time}}}"
Expand Down
10 changes: 9 additions & 1 deletion packages/microsoft_dhcp/data_stream/log/elasticsearch/ingest_pipeline/dhcpv6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,22 @@ processors:
- _tmp_.time
- message
- host.ip
- host.domain
- host.name
- microsoft.dhcp.error_code
- microsoft.dhcp.duid.length
- microsoft.dhcp.duid.hex
- microsoft.dhcp.user.string
- microsoft.dhcp.dhc_id
- microsoft.dhcp.subnet_prefix
ignore_failure: true
- grok:
field: host.name
if: 'ctx.host?.name != null && ctx.host.name.contains(".")'
patterns:
- "%{HOSTNAME}\\.%{GREEDYDATA:host.domain}"
pattern_definitions:
"HOSTNAME": "[^.]+"
ignore_failure: true
- set:
field: _tmp_.timestamp
value: "{{{_tmp_.date}}} {{{_tmp_.time}}}"
Expand Down
2 changes: 2 additions & 0 deletions packages/microsoft_dhcp/data_stream/log/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
name: event.type
- external: ecs
name: host.domain
- external: ecs
name: host.name
- external: ecs
name: host.ip
- external: ecs
Expand Down
Loading