Skip to content

Commit

Permalink
Use default add_locale for fortinet.firewall
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-gr committed Jun 30, 2021
1 parent 8ca57d3 commit 26bd10e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add `uri_parts` and `user_agent` ingest processors to `aws.elb` module. {issue}26435[26435] {pull}26441[26441]
- Added dataset `recordedfuture` to the `threatintel` module to ingest indicators from Recorded Future Connect API {pull}26481[26481]
- Update `fortinet` ingest pipelines. {issue}22136[22136] {issue}25254[25254] {pull}24816[24816]
- Use default add_locale for fortinet.firewall {issue}20300[20300] {pull}26524[26524]

*Heartbeat*

Expand Down
4 changes: 3 additions & 1 deletion filebeat/docs/modules/fortinet.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ include::../include/gs-link.asciidoc[]
[float]
=== Compatibility

This module has been tested against FortiOS version 6.0.x and 6.2.x.
This module has been tested against FortiOS version 6.0.x and 6.2.x.
Versions above this are expected to work but have not been tested.

include::../include/configuring-intro.asciidoc[]
Expand All @@ -51,6 +51,8 @@ include::../include/config-option-intro.asciidoc[]

include::../include/var-paths.asciidoc[]

include::../include/timezone-support.asciidoc[]

*`var.input`*::

The input to use, can be either the value `tcp`, `udp` or `file`.
Expand Down
4 changes: 3 additions & 1 deletion x-pack/filebeat/module/fortinet/_meta/docs.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ include::../include/gs-link.asciidoc[]
[float]
=== Compatibility

This module has been tested against FortiOS version 6.0.x and 6.2.x.
This module has been tested against FortiOS version 6.0.x and 6.2.x.
Versions above this are expected to work but have not been tested.

include::../include/configuring-intro.asciidoc[]
Expand All @@ -46,6 +46,8 @@ include::../include/config-option-intro.asciidoc[]

include::../include/var-paths.asciidoc[]

include::../include/timezone-support.asciidoc[]

*`var.input`*::

The input to use, can be either the value `tcp`, `udp` or `file`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ tags: {{.tags | tojson}}
publisher_pipeline.disable_host: {{ inList .tags "forwarded" }}

processors:
- add_locale: ~
- add_fields:
target: ''
fields:
Expand Down
12 changes: 6 additions & 6 deletions x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ processors:
ignore_empty_value: true
- set:
field: _temp.time
value: "{{fortinet.firewall.date}} {{fortinet.firewall.time}} {{fortinet.firewall.tz}}"
if: "ctx.fortinet?.firewall?.tz != null"
value: "{{fortinet.firewall.date}} {{fortinet.firewall.time}} {{event.timezone}}"
if: "ctx.event?.timezone != null"
- set:
field: _temp.time
value: "{{fortinet.firewall.date}} {{fortinet.firewall.time}}"
if: "ctx.fortinet?.firewall?.tz == null"
if: "ctx.event?.timezone == null"
- date:
field: _temp.time
target_field: "@timestamp"
Expand All @@ -55,8 +55,8 @@ processors:
- yyyy-MM-dd HH:mm:ss Z
- yyyy-MM-dd HH:mm:ss z
- ISO8601
timezone: "{{fortinet.firewall.tz}}"
if: "ctx.fortinet?.firewall?.tz != null"
timezone: "{{event.timezone}}"
if: "ctx.event?.timezone != null"
- date:
field: _temp.time
target_field: "@timestamp"
Expand All @@ -65,7 +65,7 @@ processors:
- yyyy-MM-dd HH:mm:ss Z
- yyyy-MM-dd HH:mm:ss z
- ISO8601
if: "ctx.fortinet?.firewall?.tz == null"
if: "ctx.event?.timezone == null"
- gsub:
field: fortinet.firewall.eventtime
pattern: "\\d{6}$"
Expand Down

0 comments on commit 26bd10e

Please sign in to comment.