Skip to content

Fix pfsense grok to support new opensense log format #3612

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
kcreddy merged 10 commits into from
Jul 4, 2022
Merged

Fix pfsense grok to support new opensense log format #3612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2c3096d
fix opensense grok
kcreddy Jun 28, 2022
a71a138
add changelog
kcreddy Jun 28, 2022
1880eae
changed rule.id to DATA to match string type
kcreddy Jun 28, 2022
c4fd2ae
update expected log
kcreddy Jun 28, 2022
ba12dfa
update to word instead of data
kcreddy Jun 29, 2022
d9287ae
Merge remote-tracking branch 'upstream/main' into pfsense_grok
kcreddy Jun 29, 2022
c120afe
version fixed after pipeline test
kcreddy Jun 29, 2022
3aa714b
Merge remote-tracking branch 'upstream/main' into pfsense_grok
kcreddy Jun 29, 2022
f9be794
readme
kcreddy Jun 30, 2022
ef07e11
add 'bound' to network direction ecs field
kcreddy Jul 4, 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
3 changes: 2 additions & 1 deletion packages/pfsense/_dev/deploy/docker/sample_logs/pfsense.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@
<134>Jan 1 02:21:38 firewall.opnsense.net filterlog[97530]: 146,,,1535324496,igb1.12,match,block,in,4,0x0,,63,12617,0,DF,6,tcp,60,10.170.12.50,175.16.199.1,49724,853,0,S,1891286705,,64240,,mss;sackOK;TS;nop;wscale
<134>Dec 31 22:02:55 firewall.opnsense.net filterlog[15307]: 6,,,1000000105,igb1.27,match,block,in,6,0x00,0xf6279,1,UDP,17,32,fe80::208:9bff:fef3:652b,ff02::1:2,546,547,32
<190>Dec 31 22:06:16 firewall.opnsense.net dhcpd[40152]: DHCPDISCOVER from 4c:55:41:a0:fa:99 via eth0.60
<30>Dec 31 22:06:33 firewall.opnsense.net unbound[75499]: [26931:0] info: 192.168.1.1 api.opensubtitles.org. A IN
<30>Dec 31 22:06:33 firewall.opnsense.net unbound[75499]: [26931:0] info: 192.168.1.1 api.opensubtitles.org. A IN
<134>1 2022-06-09T14:44:11-06:00 OPNsense.example.com filterlog 76404 - [meta sequenceId="1"] 124,,,fae559338f65e11c53669fc3642c93c2,ixl1_vlan70,match,pass,out,4,0x0,,63,5687,0,DF,6,tcp,60,192.168.1.1,10.10.10.10,40370,80,0,S,3364871769,,65535,,mss;sackOK;TS;nop;wscale
5 changes: 5 additions & 0 deletions packages/pfsense/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.1.1"
changes:
- description: Fix grok to support new opensense log format
type: bugfix
link: https://github.com/elastic/integrations/pull/3612
- version: "1.1.0"
changes:
- description: Update package to ECS 8.3.0.
Expand Down
3 changes: 2 additions & 1 deletion packages/pfsense/data_stream/log/_dev/test/pipeline/test-opensense.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<134>Jan 1 02:21:38 firewall.opnsense.net filterlog[97530]: 146,,,1535324496,igb1.12,match,block,in,4,0x0,,63,12617,0,DF,6,tcp,60,10.170.12.50,175.16.199.1,49724,853,0,S,1891286705,,64240,,mss;sackOK;TS;nop;wscale
<134>Dec 31 22:02:55 firewall.opnsense.net filterlog[15307]: 6,,,1000000105,igb1.27,match,block,in,6,0x00,0xf6279,1,UDP,17,32,fe80::208:9bff:fef3:652b,ff02::1:2,546,547,32
<190>Dec 31 22:06:16 firewall.opnsense.net dhcpd[40152]: DHCPDISCOVER from 4c:55:41:a0:fa:99 via eth0.60
<30>Dec 31 22:06:33 firewall.opnsense.net unbound[75499]: [26931:0] info: 192.168.1.1 api.opensubtitles.org. A IN
<30>Dec 31 22:06:33 firewall.opnsense.net unbound[75499]: [26931:0] info: 192.168.1.1 api.opensubtitles.org. A IN
<134>1 2022-06-09T14:44:11-06:00 OPNsense.example.com filterlog 76404 - [meta sequenceId="1"] 124,,,fae559338f65e11c53669fc3642c93c2,ixl1_vlan70,match,pass,out,4,0x0,,63,5687,0,DF,6,tcp,60,192.168.1.1,10.10.10.10,40370,80,0,S,3364871769,,65535,,mss;sackOK;TS;nop;wscale
96 changes: 94 additions & 2 deletions packages/pfsense/data_stream/log/_dev/test/pipeline/test-opensense.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"network": {
"bytes": 60,
"community_id": "1:tVSUn9UzCrzCUQ+t4rluKGR9bZg=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -141,7 +141,7 @@
"network": {
"bytes": 32,
"community_id": "1:S6E0S9O3vdACB/y4guu8ivBG4KE=",
"direction": "in",
"direction": "inbound",
"iana_number": "17",
"transport": "udp",
"type": "ipv6"
Expand Down Expand Up @@ -319,6 +319,98 @@
"tags": [
"preserve_original_event"
]
},
{
"@timestamp": "2022-06-09T20:44:11.000Z",
"destination": {
"address": "10.10.10.10",
"ip": "10.10.10.10",
"port": 80
},
"ecs": {
"version": "8.3.0"
},
"event": {
"action": "pass",
"category": [
"network"
],
"kind": "event",
"original": "\u003c134\u003e1 2022-06-09T14:44:11-06:00 OPNsense.example.com filterlog 76404 - [meta sequenceId=\"1\"] 124,,,fae559338f65e11c53669fc3642c93c2,ixl1_vlan70,match,pass,out,4,0x0,,63,5687,0,DF,6,tcp,60,192.168.1.1,10.10.10.10,40370,80,0,S,3364871769,,65535,,mss;sackOK;TS;nop;wscale",
"provider": "filterlog",
"reason": "match",
"timezone": "-06:00",
"type": [
"connection",
"allowed"
]
},
"log": {
"syslog": {
"priority": 134
}
},
"message": "124,,,fae559338f65e11c53669fc3642c93c2,ixl1_vlan70,match,pass,out,4,0x0,,63,5687,0,DF,6,tcp,60,192.168.1.1,10.10.10.10,40370,80,0,S,3364871769,,65535,,mss;sackOK;TS;nop;wscale",
"network": {
"bytes": 60,
"community_id": "1:DAGv22V0JdwDZ4VIyfmfWGCGjco=",
"direction": "outbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
},
"observer": {
"ingress": {
"interface": {
"name": "ixl1_vlan70"
}
},
"name": "OPNsense.example.com",
"type": "firewall",
"vendor": "netgate"
},
"pfsense": {
"ip": {
"flags": "DF",
"id": 5687,
"offset": 0,
"tos": "0x0",
"ttl": 63
},
"tcp": {
"flags": "S",
"length": 0,
"options": [
"mss",
"sackOK",
"TS",
"nop",
"wscale"
],
"window": 65535
}
},
"process": {
"name": "filterlog",
"pid": 76404
},
"related": {
"ip": [
"10.10.10.10",
"192.168.1.1"
]
},
"rule": {
"id": "fae559338f65e11c53669fc3642c93c2"
},
"source": {
"address": "192.168.1.1",
"ip": "192.168.1.1",
"port": 40370
},
"tags": [
"preserve_original_event"
]
}
]
}
38 changes: 19 additions & 19 deletions packages/pfsense/data_stream/log/_dev/test/pipeline/test-pfsense-bsd.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"network": {
"bytes": 60,
"community_id": "1:tVSUn9UzCrzCUQ+t4rluKGR9bZg=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -152,7 +152,7 @@
"network": {
"bytes": 60,
"community_id": "1:JkXOpAe6IFE5MicGFNlnd7Kt6P8=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -258,7 +258,7 @@
"network": {
"bytes": 76,
"community_id": "1:lqVApk2FX0H8+Yluuj1CqR83drU=",
"direction": "in",
"direction": "inbound",
"iana_number": "17",
"transport": "udp",
"type": "ipv4"
Expand Down Expand Up @@ -355,7 +355,7 @@
"network": {
"bytes": 60,
"community_id": "1:s6BZ2dIpNflL1wK2GOTj03NPi+A=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -461,7 +461,7 @@
"network": {
"bytes": 60,
"community_id": "1:wCwVSYNHZmxkcrLYOgGhKzPLN0c=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -567,7 +567,7 @@
"network": {
"bytes": 60,
"community_id": "1:hU8z0kIzXfY6WDCCq4pzWYAEs8U=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -661,7 +661,7 @@
"network": {
"bytes": 32,
"community_id": "1:S6E0S9O3vdACB/y4guu8ivBG4KE=",
"direction": "in",
"direction": "inbound",
"iana_number": "17",
"transport": "udp",
"type": "ipv6"
Expand Down Expand Up @@ -756,7 +756,7 @@
"network": {
"bytes": 60,
"community_id": "1:s6BZ2dIpNflL1wK2GOTj03NPi+A=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -862,7 +862,7 @@
"network": {
"bytes": 60,
"community_id": "1:qhIea9mFyhvaUljq3IEFnGaluM8=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -968,7 +968,7 @@
"network": {
"bytes": 60,
"community_id": "1:yjMDSnd4M5ZNzvL0NOB1FR4Jjwk=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -1074,7 +1074,7 @@
"network": {
"bytes": 60,
"community_id": "1:bR7oo0ti5ImuczW3EAgomPxyvPc=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -1180,7 +1180,7 @@
"network": {
"bytes": 60,
"community_id": "1:tVSUn9UzCrzCUQ+t4rluKGR9bZg=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -1286,7 +1286,7 @@
"network": {
"bytes": 60,
"community_id": "1:rQmykACxQVu8Qt8eiPX4LilGkuQ=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -1392,7 +1392,7 @@
"network": {
"bytes": 60,
"community_id": "1:zOjPnHE+Tjfyak9LxE+IgjCB5GM=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -1486,7 +1486,7 @@
"network": {
"bytes": 78,
"community_id": "1:Xq8cH32nI1C1dM/L9U15Q1H4bvs=",
"direction": "in",
"direction": "inbound",
"iana_number": "17",
"transport": "udp",
"type": "ipv4"
Expand Down Expand Up @@ -1583,7 +1583,7 @@
"network": {
"bytes": 60,
"community_id": "1:bR7oo0ti5ImuczW3EAgomPxyvPc=",
"direction": "in",
"direction": "inbound",
"iana_number": "6",
"transport": "tcp",
"type": "ipv4"
Expand Down Expand Up @@ -1688,7 +1688,7 @@
"network": {
"bytes": 32,
"community_id": "1:LdbmIdVyI4RYGCjX644CYvLBhdE=",
"direction": "in",
"direction": "inbound",
"iana_number": "2",
"packets": 8,
"transport": "igmp",
Expand Down Expand Up @@ -1781,7 +1781,7 @@
"network": {
"bytes": 84,
"community_id": "1:gfzPY8KpURzu1udgYHkiWhvNozU=",
"direction": "in",
"direction": "inbound",
"iana_number": "1",
"transport": "icmp",
"type": "ipv4"
Expand Down Expand Up @@ -1866,7 +1866,7 @@
"network": {
"bytes": 84,
"community_id": "1:7mtp81Pyv1qrtuWW5VGpU521V2A=",
"direction": "in",
"direction": "inbound",
"iana_number": "1",
"transport": "icmp",
"type": "ipv4"
Expand Down
Loading