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

Fix fortinet.firewall.mem value to be interpreted as integer #19335

Merged
merged 3 commits into from
Aug 11, 2020
Merged

Fix fortinet.firewall.mem value to be interpreted as integer #19335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aecc88e
Fix fortinet.firewall.mem value to be interpreted as integer https://…
philippkahr Jun 23, 2020
30438d3
added fortinet mem fix changelog https://github.com/elastic/beats/pul…
philippkahr Jun 23, 2020
a6cd49f
Add convert processor for fortinet.firewall.mem
andrewkroh Aug 11, 2020
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 @@ -173,6 +173,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Filebeat*

- Fix mapping of fortinet.firewall.mem as integer. {pull}19335[19335]
- Ensure all zeek timestamps include millisecond precision. {issue}14599[14599] {pull}16766[16766]
- Fix s3 input hanging with GetObjectRequest API call by adding context_timeout config. {issue}15502[15502] {pull}15590[15590]
- Add shared_credential_file to cloudtrail config {issue}15652[15652] {pull}15656[15656]
Expand Down
2 changes: 1 addition & 1 deletion filebeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59147,7 +59147,7 @@ type: integer
Memory usage system statistics


type: keyword
type: integer

--

Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/fortinet/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion x-pack/filebeat/module/fortinet/firewall/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@
Fabric medium count

- name: mem
type: keyword
type: integer
description: >
Memory usage system statistics

Expand Down
5 changes: 5 additions & 0 deletions x-pack/filebeat/module/fortinet/firewall/ingest/event.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ processors:
ignore_failure: true
ignore_missing: true
if: "ctx.event?.duration == null"
- convert:
field: fortinet.firewall.mem
type: integer
ignore_failure: true
ignore_missing: true
- geoip:
field: source.ip
target_field: source.geo
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/module/fortinet/firewall/test/fortinet.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@
"fortinet.firewall.disklograte": "0",
"fortinet.firewall.fazlograte": "0",
"fortinet.firewall.freediskstorage": "331",
"fortinet.firewall.mem": "10",
"fortinet.firewall.mem": 10,
"fortinet.firewall.setuprate": "0",
"fortinet.firewall.subtype": "system",
"fortinet.firewall.sysuptime": "25170",
Expand Down