Skip to content

[sonicwall] Format {source,destination}.mac per ECS #3360

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
andrewkroh merged 1 commit into from
May 18, 2022
Merged

[sonicwall] Format {source,destination}.mac per ECS #3360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/sonicwall/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ services:
- ${SERVICE_LOGS_DIR}:/var/log
command: /bin/sh -c "cp /sample_logs/* /var/log/"
sonicwall-firewall-udp:
image: akroh/stream:v0.2.0
image: docker.elastic.co/observability/stream:v0.7.0
volumes:
- ./sample_logs:/sample_logs:ro
entrypoint: /bin/bash
command: -c "/stream log --start-signal=SIGHUP --delay=5s --addr elastic-agent:9536 -p=udp /sample_logs/sonicwall-firewall-*.log"
sonicwall-firewall-tcp:
image: akroh/stream:v0.2.0
image: docker.elastic.co/observability/stream:v0.7.0
volumes:
- ./sample_logs:/sample_logs:ro
entrypoint: /bin/bash
Expand Down
5 changes: 5 additions & 0 deletions packages/sonicwall/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: "0.8.1"
changes:
- description: Format source.mac and destination.mac as per ECS.
type: bugfix
link: https://github.com/elastic/integrations/pull/3360
- version: "0.8.0"
changes:
- description: Update to ECS 8.2.0
Expand Down
2 changes: 0 additions & 2 deletions packages/sonicwall/data_stream/firewall/_dev/test/pipeline/test-common-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
dynamic_fields:
event.ingested: ".*"
fields:
tags:
- preserve_original_event
109 changes: 109 additions & 0 deletions packages/sonicwall/data_stream/firewall/_dev/test/pipeline/test-rsa2elk-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"events": [
{
"@timestamp": "2018-04-08T04:33:58.000Z",
"agent": {
"ephemeral_id": "4848b949-d929-46d0-9b02-5beed1da7691",
"id": "de9c1b8e-5967-4715-bc22-6f9dd52f6cc2",
"name": "docker-fleet-agent",
"type": "filebeat",
"version": "8.1.3"
},
"data_stream": {
"dataset": "sonicwall.firewall",
"namespace": "ep",
"type": "logs"
},
"destination": {
"ip": "10.246.0.167",
"mac": "01:00:5e:2c:22:06",
"port": 2189
},
"ecs": {
"version": "8.0.0"
},
"elastic_agent": {
"id": "de9c1b8e-5967-4715-bc22-6f9dd52f6cc2",
"snapshot": false,
"version": "8.1.3"
},
"event": {
"action": "block",
"code": "utodita",
"dataset": "sonicwall.firewall",
"original": "id=utodita sn=aec time=\"2018-4-8 4:33:58\" fw=10.21.89.175 pri=medium c=diconse m=428 msg=\"elitse\" n=reseo src=10.71.238.250:41:lo3856 dst=10.246.0.167:2189:eth2632 srcMac= 01:00:5e:7c:42:0b dstMac=01:00:5e:2c:22:06 proto=icmp fw_action=\"block\"",
"timezone": "+00:00"
},
"host": {
"ip": "10.21.89.175"
},
"input": {
"type": "tcp"
},
"log": {
"level": "medium",
"source": {
"address": "172.18.0.7:34140"
}
},
"message": "elitse",
"network": {
"protocol": "icmp"
},
"observer": {
"egress": {
"interface": {
"name": "eth2632"
}
},
"ingress": {
"interface": {
"name": "lo3856"
}
},
"product": "Firewalls",
"type": "Firewall",
"vendor": "Sonicwall"
},
"related": {
"ip": [
"10.71.238.250",
"10.246.0.167",
"10.21.89.175"
]
},
"rsa": {
"internal": {
"event_desc": "elitse",
"messageid": "428"
},
"misc": {
"action": [
"block"
],
"category": "diconse",
"reference_id": "utodita",
"serial_number": "aec",
"severity": "medium"
},
"network": {
"dinterface": "eth2632",
"sinterface": "lo3856"
},
"time": {
"date": "2018-4-8",
"event_time": "2018-04-08T04:33:58.000Z"
}
},
"source": {
"ip": "10.71.238.250",
"mac": "01:00:5e:7c:42:0b",
"port": 41
},
"tags": [
"sonicwall-firewall",
"forwarded"
]
}
]
}
108 changes: 108 additions & 0 deletions .../sonicwall/data_stream/firewall/_dev/test/pipeline/test-rsa2elk-output.json-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"expected": [
{
"@timestamp": "2018-04-08T04:33:58.000Z",
"agent": {
"ephemeral_id": "4848b949-d929-46d0-9b02-5beed1da7691",
"id": "de9c1b8e-5967-4715-bc22-6f9dd52f6cc2",
"name": "docker-fleet-agent",
"type": "filebeat",
"version": "8.1.3"
},
"data_stream": {
"dataset": "sonicwall.firewall",
"namespace": "ep",
"type": "logs"
},
"destination": {
"ip": "10.246.0.167",
"mac": "01-00-5E-2C-22-06",
"port": 2189
},
"ecs": {
"version": "8.2.0"
},
"elastic_agent": {
"id": "de9c1b8e-5967-4715-bc22-6f9dd52f6cc2",
"snapshot": false,
"version": "8.1.3"
},
"event": {
"action": "block",
"code": "utodita",
"dataset": "sonicwall.firewall",
"original": "id=utodita sn=aec time=\"2018-4-8 4:33:58\" fw=10.21.89.175 pri=medium c=diconse m=428 msg=\"elitse\" n=reseo src=10.71.238.250:41:lo3856 dst=10.246.0.167:2189:eth2632 srcMac= 01:00:5e:7c:42:0b dstMac=01:00:5e:2c:22:06 proto=icmp fw_action=\"block\"",
"timezone": "+00:00"
},
"host": {
"ip": "10.21.89.175"
},
"input": {
"type": "tcp"
},
"log": {
"level": "medium",
"source": {
"address": "172.18.0.7:34140"
}
},
"message": "elitse",
"network": {
"protocol": "icmp"
},
"observer": {
"egress": {
"interface": {
"name": "eth2632"
}
},
"ingress": {
"interface": {
"name": "lo3856"
}
},
"product": "Firewalls",
"type": "Firewall",
"vendor": "Sonicwall"
},
"related": {
"ip": [
"10.71.238.250",
"10.246.0.167",
"10.21.89.175"
]
},
"rsa": {
"internal": {
"event_desc": "elitse",
"messageid": "428"
},
"misc": {
"action": [
"block"
],
"category": "diconse",
"reference_id": "utodita",
"serial_number": "aec",
"severity": "medium"
},
"network": {
"dinterface": "eth2632",
"sinterface": "lo3856"
},
"time": {
"date": "2018-4-8",
"event_time": "2018-04-08T04:33:58.000Z"
}
},
"source": {
"ip": "10.71.238.250",
"mac": "01-00-5E-7C-42-0B",
"port": 41
},
"tags": [
"preserve_original_event"
]
}
]
}
16 changes: 16 additions & 0 deletions packages/sonicwall/data_stream/firewall/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ processors:
- set:
field: ecs.version
value: '8.2.0'
- gsub:
field: destination.mac
ignore_missing: true
pattern: '[:]'
replacement: '-'
- gsub:
field: source.mac
ignore_missing: true
pattern: '[:]'
replacement: '-'
- uppercase:
field: destination.mac
ignore_missing: true
- uppercase:
field: source.mac
ignore_missing: true
# User agent
- user_agent:
field: user_agent.original
Expand Down
2 changes: 1 addition & 1 deletion packages/sonicwall/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: sonicwall
title: Sonicwall-FW Logs
version: 0.8.0
version: "0.8.1"
description: Collect logs from Sonicwall devices with Elastic Agent.
categories: ["network", "security"]
release: experimental
Expand Down