Skip to content

[cisco_meraki] Address the changes in Firmware MX18.101 #7391

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
bhapas merged 2 commits into from
Aug 16, 2023
Merged

[cisco_meraki] Address the changes in Firmware MX18.101 #7391

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
2bc2270
Address the changes in Firmware MX18.101
bhapas Aug 15, 2023
fb629d1
Fix PR comments
bhapas Aug 16, 2023
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/cisco_meraki/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.11.1"
changes:
- description: Fix flows pipeline according to new Firmware MX18.101.
type: bugfix
link: https://github.com/elastic/integrations/pull/7391
- version: "1.11.0"
changes:
- description: Update package to ECS 8.9.0.
Expand Down
4 changes: 4 additions & 0 deletions packages/cisco_meraki/data_stream/log/_dev/test/pipeline/test-flows.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@
<134>1 1674604848.429996761 MX84 flows src=10.10.10.11 dst=172.16.12.23 mac=9C:7B:EF:A9:6C:D8 protocol=udp sport=64138 dport=3289 pattern: deny (src 10.10.0.0/16)
<134>1 1674604848.429996761 MX84 flows src=10.241.192.11 dst=10.8.2.6 mac=9C:7B:EF:A5:9C:9B protocol=tcp sport=54791 dport=80 pattern: deny all
<134>1 1674604848.429996761 MX84 flows src=192.168.201.81 dst=10.8.2.4 mac=B4:6B:FC:6A:E0:5A protocol=udp sport=60288 dport=53 pattern: allow all
<134>1 948136486.721741837 MX60 firewall src=10.10.10.11 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all
<134>1 948136486.721741837 MX60 vpn_firewall src=10.241.192.1 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all
<134>1 948136486.721741837 MX60 cellular_firewall src=10.10.10.11 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all
<134>1 948136486.721741837 MX60 bridge_anyconnect_client_vpn_firewall src=10.241.192.1 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all
180 changes: 180 additions & 0 deletions packages/cisco_meraki/data_stream/log/_dev/test/pipeline/test-flows.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,186 @@
"forwarded",
"preserve_original_event"
]
},
{
"@timestamp": "2000-01-17T19:14:46.721Z",
"cisco_meraki": {
"event_subtype": "ip_session_initiated",
"event_type": "firewall",
"firewall": {
"action": "allow",
"rule": "all"
}
},
"destination": {
"ip": "10.241.77.255",
"port": 53
},
"ecs": {
"version": "8.9.0"
},
"event": {
"action": "ip-session-initiated",
"category": [
"network"
],
"original": "\u003c134\u003e1 948136486.721741837 MX60 firewall src=10.10.10.11 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all",
"type": [
"info",
"access",
"start"
]
},
"network": {
"protocol": "udp"
},
"observer": {
"hostname": "MX60"
},
"source": {
"ip": "10.10.10.11",
"mac": "24-2F-FA-1E-B7-E6",
"port": 9562
},
"tags": [
"forwarded",
"preserve_original_event"
]
},
{
"@timestamp": "2000-01-17T19:14:46.721Z",
"cisco_meraki": {
"event_subtype": "ip_session_initiated",
"event_type": "vpn_firewall",
"firewall": {
"action": "allow",
"rule": "all"
}
},
"destination": {
"ip": "10.241.77.255",
"port": 53
},
"ecs": {
"version": "8.9.0"
},
"event": {
"action": "ip-session-initiated",
"category": [
"network"
],
"original": "\u003c134\u003e1 948136486.721741837 MX60 vpn_firewall src=10.241.192.1 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all",
"type": [
"info",
"access",
"start"
]
},
"network": {
"protocol": "udp"
},
"observer": {
"hostname": "MX60"
},
"source": {
"ip": "10.241.192.1",
"mac": "24-2F-FA-1E-B7-E6",
"port": 9562
},
"tags": [
"forwarded",
"preserve_original_event"
]
},
{
"@timestamp": "2000-01-17T19:14:46.721Z",
"cisco_meraki": {
"event_subtype": "ip_session_initiated",
"event_type": "cellular_firewall",
"firewall": {
"action": "allow",
"rule": "all"
}
},
"destination": {
"ip": "10.241.77.255",
"port": 53
},
"ecs": {
"version": "8.9.0"
},
"event": {
"action": "ip-session-initiated",
"category": [
"network"
],
"original": "\u003c134\u003e1 948136486.721741837 MX60 cellular_firewall src=10.10.10.11 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all",
"type": [
"info",
"access",
"start"
]
},
"network": {
"protocol": "udp"
},
"observer": {
"hostname": "MX60"
},
"source": {
"ip": "10.10.10.11",
"mac": "24-2F-FA-1E-B7-E6",
"port": 9562
},
"tags": [
"forwarded",
"preserve_original_event"
]
},
{
"@timestamp": "2000-01-17T19:14:46.721Z",
"cisco_meraki": {
"event_subtype": "ip_session_initiated",
"event_type": "bridge_anyconnect_client_vpn_firewall",
"firewall": {
"action": "allow",
"rule": "all"
}
},
"destination": {
"ip": "10.241.77.255",
"port": 53
},
"ecs": {
"version": "8.9.0"
},
"event": {
"action": "ip-session-initiated",
"category": [
"network"
],
"original": "\u003c134\u003e1 948136486.721741837 MX60 bridge_anyconnect_client_vpn_firewall src=10.241.192.1 dst=10.241.77.255 mac=24:2F:FA:1E:B7:E6 protocol=udp sport=9562 dport=53 pattern: allow all",
"type": [
"info",
"access",
"start"
]
},
"network": {
"protocol": "udp"
},
"observer": {
"hostname": "MX60"
},
"source": {
"ip": "10.241.192.1",
"mac": "24-2F-FA-1E-B7-E6",
"port": 9562
},
"tags": [
"forwarded",
"preserve_original_event"
]
}
]
}
2 changes: 1 addition & 1 deletion packages/cisco_meraki/data_stream/log/elasticsearch/ingest_pipeline/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ processors:
value: 'failed to parse time field ({{{ _temp.ts_nano }}}): {{{ _ingest.on_failure_message }}}'
- pipeline:
name: '{{ IngestPipeline "flows" }}'
if: ctx.cisco_meraki.event_type == 'flows'
if: "['flows', 'firewall', 'vpn_firewall', 'cellular_firewall', 'bridge_anyconnect_client_vpn_firewall'].contains(ctx.cisco_meraki.event_type)"
- pipeline:
name: '{{ IngestPipeline "ipflows" }}'
if: ctx.cisco_meraki.event_type == 'ip_flow_start' || ctx.cisco_meraki.event_type == 'ip_flow_end'
Expand Down
4 changes: 3 additions & 1 deletion packages/cisco_meraki/data_stream/log/elasticsearch/ingest_pipeline/flows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ processors:
- grok:
field: event.original
patterns:
- "flows( %{NOTSPACE:cisco_meraki.flows.op})? src=%{IP:source.ip:ip} dst=%{IP:destination.ip:ip}( mac=%{MAC:source.mac})? protocol=%{NOTSPACE:network.protocol}( type=%{NOTSPACE})?( sport=%{NONNEGINT:source.port:long})?( dport=%{NONNEGINT:destination.port:long})?( pattern: %{GREEDYDATA:cisco_meraki.firewall.pattern})?"
- "%{TYPE}( %{NOTSPACE:cisco_meraki.flows.op})? src=%{IP:source.ip:ip} dst=%{IP:destination.ip:ip}( mac=%{MAC:source.mac})? protocol=%{NOTSPACE:network.protocol}( type=%{NOTSPACE})?( sport=%{NONNEGINT:source.port:long})?( dport=%{NONNEGINT:destination.port:long})?( pattern: %{GREEDYDATA:cisco_meraki.firewall.pattern})?"
pattern_definitions:
TYPE: 'flows|firewall|vpn_firewall|cellular_firewall|bridge_anyconnect_client_vpn_firewall'
- grok:
field: cisco_meraki.firewall.pattern
patterns:
Expand Down
2 changes: 1 addition & 1 deletion packages/cisco_meraki/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 2.7.0
name: cisco_meraki
title: Cisco Meraki
version: "1.11.0"
version: "1.11.1"
description: Collect logs from Cisco Meraki with Elastic Agent.
type: integration
categories:
Expand Down