[filebeat][fortinet] Use default add_locale for fortinet.firewall by marc-gr · Pull Request #26524 · elastic/beats

marc-gr · 2021-06-28T13:32:28Z

What does this PR do?

Adds a add_locale default processor to fortinet.firewall
Uses event.timezone on the ingest pipeline
Adds documentation about how to set a custom timezone

Why is it important?

It has been a recurrent request to be able to set a custom timezone to fortinet.firewall.

Checklist

My code follows the style guidelines of this project
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
I have made corresponding change to the default configuration files
I have added tests that prove my fix is effective or that my feature works
I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Closes [Filebeat][Fortinet] Add the ability to set a default timezone in fortinet config #20300

elasticmachine · 2021-06-28T13:32:30Z

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

elasticmachine · 2021-06-28T14:36:11Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: Pull request #26524 updated
Start Time: 2021-06-30T08:46:18.885+0000
Duration: 123 min 20 sec
Commit: 414c2f9

Test stats 🧪

Test	Results
Failed	0
Passed	14126
Skipped	2311
Total	16437

Trends 🧪

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test	Results
Failed	0
Passed	14126
Skipped	2311
Total	16437

legoguy1000 · 2021-06-28T22:07:24Z

Doesn't this cause issue if the firewall isn't in the same timezone as Filebeat??

marc-gr · 2021-06-29T09:16:54Z

/test

marc-gr · 2021-06-29T09:21:54Z

Doesn't this cause issue if the firewall isn't in the same timezone as Filebeat??

If that is the case, the timezone can be deleted or overwritten. The docs have been updated with https://github.com/elastic/beats/blob/7df6d010f2cdfdeced76e335049ae0fe78e4d1ea/filebeat/docs/include/timezone-support.asciidoc as per @jsoriano suggestion in #20300 (comment).

Hope that makes sense 👍

jsoriano

This pipeline has several date processors, I wonder if same timezone should be used in all of them.

x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml

P1llus

LGTM, seems the other reviews already catched the issues :)

x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml

mergify · 2021-06-29T15:52:56Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b feat-20300 upstream/feat-20300
git merge upstream/master
git push upstream feat-20300

jsoriano

👍

…6524) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

* master: [MetricBeat] [AWS] Fix aws metric tags with resourcegroupstaggingapi paginator (elastic#26385) (elastic#26443) Move openmetrics module to oss (elastic#26561) Skip flaky test TestFilestreamMetadataUpdatedOnRename (elastic#26609) [filebeat][fortinet] Use default add_locale for fortinet.firewall (elastic#26524) Enroll proxy settings (elastic#26514)

…6524) (#26611) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8) Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>

…astic#26524) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

…6524) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

…astic#26524) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

…6524) (#26660) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

…stage-failed-within-same-build * upstream/master: (36 commits) Revert "[CI] fight the flakiness with some retry option in the CI only for the Pull Requests (elastic#26617)" (elastic#26704) Packaging: linux/armv7 is not supported (elastic#26706) Cyberarkpas: Link to official docs on how to setup TLS (elastic#26614) Make network_direction, registered_domain and convert processors compatible with ES older than 7.13.0 (elastic#26676) Disable armv7 packaging (elastic#26679) [Heartbeat] use --params flag for synthetics (elastic#26674) Update dependent package to avoid downloading a suspicious file (elastic#26406) [mergify] set title and allow bp in any direction (elastic#26648) Fix memory leak in SQL helper when database is not available (elastic#26607) [CI] fight the flakiness with some retry option in the CI only for the Pull Requests (elastic#26617) [mergify] automate PRs that change the backport rules (elastic#26641) [Metricbeat] Add Airflow module in xpack (elastic#26220) chore: add-backport-next (elastic#26620) [metricbeat] Add state_job metricset (elastic#26479) CI: jenkins labels are less time consuming now (elastic#26613) [MetricBeat] [AWS] Fix aws metric tags with resourcegroupstaggingapi paginator (elastic#26385) (elastic#26443) Move openmetrics module to oss (elastic#26561) Skip flaky test TestFilestreamMetadataUpdatedOnRename (elastic#26609) [filebeat][fortinet] Use default add_locale for fortinet.firewall (elastic#26524) Enroll proxy settings (elastic#26514) ...

marc-gr added enhancement Team:Security-External Integrations backport-v7.14.0 Automated backport with mergify labels Jun 28, 2021

botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jun 28, 2021

marc-gr force-pushed the feat-20300 branch from 209b391 to b95247a Compare June 28, 2021 13:32

marc-gr requested review from P1llus and jsoriano June 28, 2021 13:33

marc-gr added the needs_integration_sync Changes in this PR need synced to elastic/integrations. label Jun 28, 2021

jsoriano reviewed Jun 29, 2021

View reviewed changes

x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml Outdated Show resolved Hide resolved

x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml Outdated Show resolved Hide resolved

marc-gr force-pushed the feat-20300 branch from b95247a to 8ba96c0 Compare June 29, 2021 11:44

marc-gr requested a review from jsoriano June 29, 2021 11:45

P1llus approved these changes Jun 29, 2021

View reviewed changes

jsoriano reviewed Jun 29, 2021

View reviewed changes

x-pack/filebeat/module/fortinet/firewall/ingest/pipeline.yml Outdated Show resolved Hide resolved

Use default add_locale for fortinet.firewall

26bd10e

marc-gr force-pushed the feat-20300 branch 2 times, most recently from 937b8b4 to 5504dc2 Compare June 30, 2021 07:33

jsoriano approved these changes Jun 30, 2021

View reviewed changes

Use event.timezone in all date processors

414c2f9

marc-gr force-pushed the feat-20300 branch from 5504dc2 to 414c2f9 Compare June 30, 2021 08:45

marc-gr merged commit 5d258c8 into elastic:master Jun 30, 2021

marc-gr deleted the feat-20300 branch June 30, 2021 11:54

mergify bot pushed a commit that referenced this pull request Jun 30, 2021

[filebeat][fortinet] Use default add_locale for fortinet.firewall (#2…

febb559

…6524) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

mergify bot mentioned this pull request Jun 30, 2021

[7.x](backport #26524) [filebeat][fortinet] Use default add_locale for fortinet.firewall #26611

Merged

marc-gr mentioned this pull request Jul 1, 2021

Cherry-pick #26524 to 7.x: [filebeat][fortinet] Use default add_locale for fortinet.firewall #26658

Closed

6 tasks

marc-gr added the v7.14.0 label Jul 1, 2021

mergify bot pushed a commit that referenced this pull request Jul 1, 2021

[filebeat][fortinet] Use default add_locale for fortinet.firewall (#2…

297f71f

…6524) * Use default add_locale for fortinet.firewall * Use event.timezone in all date processors (cherry picked from commit 5d258c8)

mergify bot mentioned this pull request Jul 1, 2021

[filebeat][fortinet] Use default add_locale for fortinet.firewall (backport #26524) #26659

Closed

marc-gr mentioned this pull request Jul 1, 2021

Cherry-pick #26524 to 7.14: [filebeat][fortinet] Use default add_locale for fortinet.firewall #26660

Merged

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[filebeat][fortinet] Use default add_locale for fortinet.firewall#26524

[filebeat][fortinet] Use default add_locale for fortinet.firewall#26524
marc-gr merged 2 commits intoelastic:masterfrom
marc-gr:feat-20300

marc-gr commented Jun 28, 2021

Uh oh!

elasticmachine commented Jun 28, 2021

Uh oh!

elasticmachine commented Jun 28, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

Trends 🧪

Test stats 🧪

Uh oh!

legoguy1000 commented Jun 28, 2021

Uh oh!

marc-gr commented Jun 29, 2021

Uh oh!

marc-gr commented Jun 29, 2021

Uh oh!

jsoriano left a comment

Uh oh!

Uh oh!

Uh oh!

P1llus left a comment

Uh oh!

Uh oh!

mergify bot commented Jun 29, 2021

Uh oh!

jsoriano left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

marc-gr commented Jun 28, 2021

What does this PR do?

Why is it important?

Checklist

Related issues

Uh oh!

elasticmachine commented Jun 28, 2021

Uh oh!

elasticmachine commented Jun 28, 2021 • edited by jenkins-beats-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

💚 Build Succeeded

Build stats

Test stats 🧪

Trends 🧪

💚 Flaky test report

Test stats 🧪

Uh oh!

legoguy1000 commented Jun 28, 2021

Uh oh!

marc-gr commented Jun 29, 2021

Uh oh!

marc-gr commented Jun 29, 2021

Uh oh!

jsoriano left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

P1llus left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mergify bot commented Jun 29, 2021

Uh oh!

jsoriano left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

elasticmachine commented Jun 28, 2021 •

edited by jenkins-beats-ci bot

Loading