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

[ecs] Upgrade juniper/srx to ecs 1.8.0 #23936

Merged
merged 2 commits into from
Feb 11, 2021
Merged

[ecs] Upgrade juniper/srx to ecs 1.8.0 #23936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
212d599
Upgrade juniper/srx to ecs 1.8.0
marc-gr Feb 9, 2021
ad66c2c
Merge branch 'feature-ecs-1.8' into juniper-ecs-1.8
marc-gr Feb 11, 2021
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 @@ -841,6 +841,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update aws/s3access to ECS 1.8. {issue}23118[23118] {pull}23920[23920]
- Upgrade panw module to ecs 1.8 {issue}23118[23118] {pull}23931[23931]
- Updated aws/cloudtrail fileset to ECS 1.8. {issue}23118[23118] {pull}23911[23911]
- Upgrade juniper/srx to ecs 1.8.0. {issue}23118[23118] {pull}23936[23936]

*Heartbeat*

Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/juniper/srx/config/srx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ processors:
- add_fields:
target: ''
fields:
ecs.version: 1.5.0
ecs.version: 1.8.0
20 changes: 20 additions & 0 deletions x-pack/filebeat/module/juniper/srx/ingest/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,37 +238,57 @@ processors:
field: related.ip
value: '{{source.ip}}'
ignore_failure: true
allow_duplicates: false
- append:
if: 'ctx.destination?.ip != null'
field: related.ip
value: '{{destination.ip}}'
ignore_failure: true
allow_duplicates: false
- append:
if: 'ctx.source?.nat?.ip != null'
field: related.ip
value: '{{source.nat.ip}}'
ignore_failure: true
allow_duplicates: false
- append:
if: 'ctx?.destination?.nat?.ip != null'
field: related.ip
value: '{{destination.nat.ip}}'
ignore_failure: true
allow_duplicates: false

- append:
if: 'ctx.url?.domain != null'
field: related.hosts
value: '{{url.domain}}'
ignore_failure: true
allow_duplicates: false
- append:
if: 'ctx.source?.domain != null'
field: related.hosts
value: '{{source.domain}}'
ignore_failure: true
allow_duplicates: false
- append:
if: 'ctx.destination?.domain != null'
field: related.hosts
value: '{{destination.domain}}'
ignore_failure: true
allow_duplicates: false

- append:
if: 'ctx?.source?.user?.name != null'
field: related.user
value: '{{source.user.name}}'
ignore_failure: true
allow_duplicates: false
- append:
if: 'ctx?.destination?.user?.name != null'
field: related.user
value: '{{destination.user.name}}'
ignore_failure: true
allow_duplicates: false

on_failure:
- set:
Expand Down
6 changes: 6 additions & 0 deletions x-pack/filebeat/module/juniper/srx/test/atp.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
"10.10.10.1",
"187.19.188.200"
],
"related.user": [
"user1"
],
"server.ip": "187.19.188.200",
"server.port": 80,
"service.type": "juniper",
Expand Down Expand Up @@ -110,6 +113,9 @@
"related.ip": [
"192.0.2.0"
],
"related.user": [
"admin"
],
"service.type": "juniper",
"source.domain": "host.example.com",
"source.ip": "192.0.2.0",
Expand Down
62 changes: 22 additions & 40 deletions x-pack/filebeat/module/juniper/srx/test/flow.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"10.0.0.1",
"10.128.0.1",
"10.0.0.1",
"10.128.0.1"
],
Expand Down Expand Up @@ -245,8 +243,6 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"1.2.3.4",
"5.6.7.8",
"1.2.3.4",
"5.6.7.8"
],
Expand Down Expand Up @@ -323,8 +319,6 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"50.0.0.100",
"30.0.0.100",
"50.0.0.100",
"30.0.0.100"
],
Expand Down Expand Up @@ -396,7 +390,6 @@
"related.ip": [
"192.0.2.1",
"198.51.100.12",
"192.0.2.1",
"18.51.100.12"
],
"rule.name": "policy1",
Expand Down Expand Up @@ -472,7 +465,6 @@
"related.ip": [
"192.0.2.1",
"198.51.100.12",
"192.0.2.1",
"18.51.100.12"
],
"rule.name": "policy1",
Expand Down Expand Up @@ -563,8 +555,7 @@
"related.ip": [
"10.3.255.203",
"8.23.224.110",
"10.3.136.49",
"8.23.224.110"
"10.3.136.49"
],
"rule.name": "permit_all",
"server.bytes": 535,
Expand Down Expand Up @@ -636,8 +627,6 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"192.168.2.164",
"172.16.1.19",
"192.168.2.164",
"172.16.1.19"
],
Expand Down Expand Up @@ -722,8 +711,7 @@
"related.ip": [
"100.73.10.92",
"58.68.126.198",
"58.78.140.131",
"58.68.126.198"
"58.78.140.131"
],
"rule.name": "NAT",
"server.bytes": 136,
Expand Down Expand Up @@ -816,8 +804,7 @@
"related.ip": [
"192.168.255.2",
"8.8.8.8",
"192.168.0.47",
"8.8.8.8"
"192.168.0.47"
],
"rule.name": "trust-to-untrust-001",
"server.bytes": 116,
Expand Down Expand Up @@ -966,8 +953,7 @@
"related.ip": [
"192.168.224.30",
"207.17.137.56",
"173.167.224.7",
"207.17.137.56"
"173.167.224.7"
],
"rule.name": "General-Outbound",
"server.ip": "207.17.137.56",
Expand Down Expand Up @@ -1053,8 +1039,7 @@
"related.ip": [
"192.168.224.30",
"207.17.137.56",
"173.167.224.7",
"207.17.137.56"
"173.167.224.7"
],
"rule.name": "General-Outbound",
"server.bytes": 0,
Expand Down Expand Up @@ -1146,8 +1131,7 @@
"related.ip": [
"192.168.224.30",
"207.17.137.56",
"173.167.224.7",
"207.17.137.56"
"173.167.224.7"
],
"rule.name": "General-Outbound",
"server.bytes": 104,
Expand Down Expand Up @@ -1240,11 +1224,12 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"4.0.0.1",
"5.0.0.1",
"4.0.0.1",
"5.0.0.1"
],
"related.user": [
"user1"
],
"rule.name": "permit-all",
"server.bytes": 686432,
"server.ip": "5.0.0.1",
Expand Down Expand Up @@ -1328,11 +1313,12 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"4.0.0.1",
"5.0.0.1",
"4.0.0.1",
"5.0.0.1"
],
"related.user": [
"user1"
],
"rule.name": "permit-all",
"server.ip": "5.0.0.1",
"server.nat.port": 80,
Expand Down Expand Up @@ -1417,11 +1403,12 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"4.0.0.1",
"5.0.0.1",
"4.0.0.1",
"5.0.0.1"
],
"related.user": [
"user1"
],
"rule.name": "permit-all",
"server.bytes": 646,
"server.ip": "5.0.0.1",
Expand Down Expand Up @@ -1495,8 +1482,6 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"50.0.0.100",
"30.0.0.100",
"50.0.0.100",
"30.0.0.100"
],
Expand Down Expand Up @@ -1637,11 +1622,12 @@
"observer.type": "firewall",
"observer.vendor": "Juniper",
"related.ip": [
"4.0.0.1",
"5.0.0.1",
"4.0.0.1",
"5.0.0.1"
],
"related.user": [
"user1"
],
"rule.name": "permit-all",
"server.bytes": 646,
"server.ip": "5.0.0.1",
Expand Down Expand Up @@ -1733,8 +1719,7 @@
"related.ip": [
"10.1.1.100",
"46.165.154.241",
"172.19.34.100",
"46.165.154.241"
"172.19.34.100"
],
"rule.name": "default-permit",
"server.bytes": 2132,
Expand Down Expand Up @@ -1829,8 +1814,7 @@
"related.ip": [
"10.1.1.100",
"91.228.167.172",
"172.19.34.100",
"91.228.167.172"
"172.19.34.100"
],
"rule.name": "default-permit",
"server.bytes": 9670,
Expand Down Expand Up @@ -1906,8 +1890,7 @@
"related.ip": [
"10.1.1.100",
"8.8.8.8",
"172.19.34.100",
"8.8.8.8"
"172.19.34.100"
],
"rule.name": "default-permit",
"server.ip": "8.8.8.8",
Expand Down Expand Up @@ -1989,8 +1972,7 @@
"related.ip": [
"10.1.1.100",
"8.8.8.8",
"172.19.34.100",
"8.8.8.8"
"172.19.34.100"
],
"rule.name": "default-permit",
"server.bytes": 82,
Expand Down
6 changes: 6 additions & 0 deletions x-pack/filebeat/module/juniper/srx/test/idp.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@
"0.0.0.0",
"3.3.10.11"
],
"related.user": [
"unknown-user"
],
"rule.id": "3",
"rule.name": "IPS",
"server.bytes": 0,
Expand Down Expand Up @@ -155,6 +158,9 @@
"0.0.0.0",
"3.3.10.11"
],
"related.user": [
"unknown-user"
],
"rule.id": "3",
"rule.name": "IPS",
"server.bytes": 0,
Expand Down
15 changes: 15 additions & 0 deletions x-pack/filebeat/module/juniper/srx/test/utm.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
"192.168.1.100",
"103.235.46.39"
],
"related.user": [
"user01"
],
"server.ip": "103.235.46.39",
"server.port": 80,
"service.type": "juniper",
Expand Down Expand Up @@ -108,6 +111,9 @@
"10.10.10.50",
"216.200.241.66"
],
"related.user": [
"user02"
],
"server.ip": "216.200.241.66",
"server.port": 80,
"service.type": "juniper",
Expand Down Expand Up @@ -320,6 +326,9 @@
"related.ip": [
"10.10.10.1"
],
"related.user": [
"user01"
],
"service.type": "juniper",
"source.ip": "10.10.10.1",
"source.user.name": "user01",
Expand Down Expand Up @@ -372,6 +381,9 @@
"192.0.2.3",
"198.51.100.2"
],
"related.user": [
"[email protected]"
],
"server.ip": "198.51.100.2",
"server.port": 80,
"service.type": "juniper",
Expand Down Expand Up @@ -433,6 +445,9 @@
"192.168.1.100",
"103.235.46.39"
],
"related.user": [
"user01"
],
"server.ip": "103.235.46.39",
"server.port": 80,
"service.type": "juniper",
Expand Down