Skip to content

[Cisco FTD] Convert source.bytes and network.bytes to integer for proper calculation of network.bytes #5859

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
merged 5 commits into from
Apr 18, 2023
Merged

[Cisco FTD] Convert source.bytes and network.bytes to integer for proper calculation of network.bytes #5859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c2cd7c5
Convert source.bytes and network.bytes to integer for proper calculat…
MakoWish Apr 11, 2023
6290182
Update changelog.yml
MakoWish Apr 11, 2023
6c2b903
Increment version number
MakoWish Apr 11, 2023
281bb46
Update packages/cisco_ftd/changelog.yml
MakoWish Apr 17, 2023
48b7d77
generate test expectations
efd6 Apr 18, 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_ftd/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: "2.10.1"
changes:
- description: Convert source.bytes and destination.bytes to integer
type: bugfix
link: https://github.com/elastic/integrations/pull/5859
- version: "2.10.0"
changes:
- description: Update package to ECS 8.7.0.
Expand Down
42 changes: 21 additions & 21 deletions packages/cisco_ftd/data_stream/log/_dev/test/pipeline/test-dns.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
},
"network": {
"application": "dns client",
"bytes": 93145,
"bytes": 238,
"community_id": "1:KyO7KJquMkQbG2JhHtlE/xANNwA=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -240,7 +240,7 @@
},
"network": {
"application": "dns client",
"bytes": 93193,
"bytes": 286,
"community_id": "1:+uUWJ5PKqEMq8F4s0W+i0b/gph8=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -380,7 +380,7 @@
},
"network": {
"application": "dns client",
"bytes": 93166,
"bytes": 259,
"community_id": "1:Kf2+k7AyvIg2CiusWtfb6ktO17A=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -523,7 +523,7 @@
},
"network": {
"application": "dns client",
"bytes": 97200,
"bytes": 297,
"community_id": "1:ifBN42Zk12nVs0SYoFKVVsSvJQ0=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -664,7 +664,7 @@
},
"network": {
"application": "dns client",
"bytes": 93193,
"bytes": 286,
"community_id": "1:msL2v+FL8G2iEtmZzUSXOFUmMqU=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -804,7 +804,7 @@
},
"network": {
"application": "dns client",
"bytes": 93166,
"bytes": 259,
"community_id": "1:RqFtHQ/7yk2iMxEfh4RnynhiWjM=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -947,7 +947,7 @@
},
"network": {
"application": "dns client",
"bytes": 93199,
"bytes": 292,
"community_id": "1:eOgwnfNZLMNFZVdHRY9Eisa5PhM=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -1087,7 +1087,7 @@
},
"network": {
"application": "dns client",
"bytes": 93221,
"bytes": 314,
"community_id": "1:ecIerxjEQw7yKtLrWT8JjELnUJs=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -1228,7 +1228,7 @@
},
"network": {
"application": "dns client",
"bytes": 93166,
"bytes": 259,
"community_id": "1:yDWDpzcHJlH1IZW+oYvQUSpvt3w=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -1370,7 +1370,7 @@
},
"network": {
"application": "dns client",
"bytes": 93722,
"bytes": 815,
"community_id": "1:sO3JetvTOM9Lt5eomxqyJjYQnxU=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -1510,7 +1510,7 @@
},
"network": {
"application": "dns client",
"bytes": 9875,
"bytes": 173,
"community_id": "1:7YlQKXQpw4Ni/+j4wc0hOlfJvTE=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -1642,7 +1642,7 @@
},
"network": {
"application": "dns client",
"bytes": 457313,
"bytes": 770,
"community_id": "1:oaDSIEJqyQH86OHbA2jmw/CnWj0=",
"iana_number": "6",
"protocol": "dns",
Expand Down Expand Up @@ -1784,7 +1784,7 @@
},
"network": {
"application": "dns client",
"bytes": 107180,
"bytes": 287,
"community_id": "1:XqT/t5LjBxVwExdARl18UHH8ZyA=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -1925,7 +1925,7 @@
},
"network": {
"application": "dns client",
"bytes": 104108,
"bytes": 212,
"community_id": "1:R6GrckTqN6itxx1OXywZsW3on+o=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2067,7 +2067,7 @@
},
"network": {
"application": "dns client",
"bytes": 101162,
"bytes": 263,
"community_id": "1:2uIDAY+126r3pPZItAh4E+MRHUI=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2209,7 +2209,7 @@
},
"network": {
"application": "dns client",
"bytes": 93199,
"bytes": 292,
"community_id": "1:eOgwnfNZLMNFZVdHRY9Eisa5PhM=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2349,7 +2349,7 @@
},
"network": {
"application": "dns client",
"bytes": 93166,
"bytes": 259,
"community_id": "1:yDWDpzcHJlH1IZW+oYvQUSpvt3w=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2489,7 +2489,7 @@
},
"network": {
"application": "dns client",
"bytes": 93166,
"bytes": 259,
"community_id": "1:Kf2+k7AyvIg2CiusWtfb6ktO17A=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2629,7 +2629,7 @@
},
"network": {
"application": "dns client",
"bytes": 93221,
"bytes": 314,
"community_id": "1:ecIerxjEQw7yKtLrWT8JjELnUJs=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2765,7 +2765,7 @@
},
"network": {
"application": "dns client",
"bytes": 93131,
"bytes": 224,
"community_id": "1:j0x5eKTJTxDfnjC7UklcOZJRALc=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -2907,7 +2907,7 @@
},
"network": {
"application": "dns client",
"bytes": 93722,
"bytes": 815,
"community_id": "1:sO3JetvTOM9Lt5eomxqyJjYQnxU=",
"iana_number": "17",
"protocol": "dns",
Expand Down
20 changes: 10 additions & 10 deletions ...s/cisco_ftd/data_stream/log/_dev/test/pipeline/test-security-connection.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
},
"network": {
"application": "icmp client",
"bytes": 980,
"bytes": 98,
"community_id": "1:Lc5Ybc+aBSwS/2nqgn+rGxqrgck=",
"iana_number": "1",
"protocol": "icmp",
Expand Down Expand Up @@ -183,7 +183,7 @@
},
"network": {
"application": "icmp client",
"bytes": 9898,
"bytes": 196,
"community_id": "1:Lc5Ybc+aBSwS/2nqgn+rGxqrgck=",
"iana_number": "1",
"protocol": "icmp",
Expand Down Expand Up @@ -318,7 +318,7 @@
},
"network": {
"application": "dns client",
"bytes": 1060,
"bytes": 106,
"community_id": "1:Efg0qRPWpUqd/Ic35rOzr1m2j2I=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -457,7 +457,7 @@
},
"network": {
"application": "dns client",
"bytes": 164314,
"bytes": 478,
"community_id": "1:SoXhZK1CrFzc2miyTD2GGUIZBIc=",
"iana_number": "17",
"protocol": "dns",
Expand Down Expand Up @@ -578,7 +578,7 @@
"level": "alert"
},
"network": {
"bytes": 14074,
"bytes": 214,
"community_id": "1:e9BEufDTrN3BbL6412GOz3SWm5w=",
"iana_number": "6",
"transport": "tcp"
Expand Down Expand Up @@ -719,7 +719,7 @@
"advanced packaging tool",
"ubuntu"
],
"bytes": 9745441319018,
"bytes": 41416472,
"community_id": "1:e9BEufDTrN3BbL6412GOz3SWm5w=",
"iana_number": "6",
"protocol": "http",
Expand Down Expand Up @@ -850,7 +850,7 @@
"level": "alert"
},
"network": {
"bytes": 14074,
"bytes": 214,
"community_id": "1:Xumx4bGQqJmLtaW2LNJT/b/cOm8=",
"iana_number": "6",
"transport": "tcp"
Expand Down Expand Up @@ -987,7 +987,7 @@
},
"network": {
"application": "curl",
"bytes": 503690,
"bytes": 1193,
"community_id": "1:Xumx4bGQqJmLtaW2LNJT/b/cOm8=",
"iana_number": "6",
"protocol": "http",
Expand Down Expand Up @@ -1231,7 +1231,7 @@
},
"network": {
"application": "curl",
"bytes": 3651927,
"bytes": 2292,
"community_id": "1:EX7LDhHq0D9ez/OeVOOW5FWakkI=",
"iana_number": "6",
"protocol": "http",
Expand Down Expand Up @@ -1472,7 +1472,7 @@
},
"network": {
"application": "windows update client",
"bytes": 26166,
"bytes": 327,
"community_id": "1:/TWDqTc3QtnoY1BhAI68+Yj48bo=",
"iana_number": "6",
"protocol": "windows update",
Expand Down
2 changes: 1 addition & 1 deletion ...cisco_ftd/data_stream/log/_dev/test/pipeline/test-security-malware-site.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
},
"network": {
"application": "chrome",
"bytes": 729246,
"bytes": 975,
"community_id": "1:sHesqNOXlyCHLUQkPcN7vjbck3A=",
"iana_number": "6",
"protocol": "http",
Expand Down
15 changes: 15 additions & 0 deletions packages/cisco_ftd/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 @@ -1454,6 +1454,21 @@ processors:
field: "_temp_.duration_hms"
value: "{{{event.duration}}}"
ignore_empty_value: true
#
# Ensure source.bytes is integer
#
- convert:
if: "ctx.source?.bytes != null"
field: "source.bytes"
type: "integer"

#
# Ensure destination.bytes is integer
#
- convert:
if: "ctx.destination?.bytes != null"
field: "destination.bytes"
type: "integer"

#
# Sum source.bytes and destination.bytes in network.bytes
Expand Down
2 changes: 1 addition & 1 deletion packages/cisco_ftd/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: cisco_ftd
title: Cisco FTD
version: "2.10.0"
version: "2.10.1"
license: basic
description: Collect logs from Cisco FTD with Elastic Agent.
type: integration
Expand Down