Skip to content

Cherry-pick #20273 to 7.x: [Filebeat][Fortinet] Remove pre populated event.timezone#20348

Merged
marc-gr merged 1 commit intoelastic:7.xfrom
marc-gr:backport_20273_7.x
Jul 30, 2020
Merged

Cherry-pick #20273 to 7.x: [Filebeat][Fortinet] Remove pre populated event.timezone#20348
marc-gr merged 1 commit intoelastic:7.xfrom
marc-gr:backport_20273_7.x

Conversation

@marc-gr
Copy link
Copy Markdown
Contributor

@marc-gr marc-gr commented Jul 30, 2020

Cherry-pick of PR #20273 to 7.x branch. Original message:

What does this PR do?

Removes the pre populated event.timezone field.

Why is it important?

Some fortinet logs do not have a tz field to set as event.timezone, for this reason, when this happens, the event.timezone was incorrectly set to the system default instead of UTC or none (which represents UTC).

With this change event.timezone will only be set when the log has a timezone itself.

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.

How to test this PR locally

cd x-pack/filebeat
TESTING_FILEBEAT_MODULES=fortinet mage pythonIntegTest

* Remove pre populated event.timezone

* Add changelog entry

* Remove  processor instead of the field

(cherry picked from commit b1b7860)
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/siem (Team:SIEM)

@botelastic 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 Jul 30, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #20348 opened]

  • Start Time: 2020-07-30T12:34:59.009+0000

  • Duration: 58 min 42 sec

Test stats 🧪

Test Results
Failed 0
Passed 2434
Skipped 385
Total 2819

@marc-gr marc-gr requested a review from a team July 30, 2020 13:33
@marc-gr marc-gr merged commit a796a3c into elastic:7.x Jul 30, 2020
@marc-gr marc-gr deleted the backport_20273_7.x branch July 30, 2020 14:36
@zube zube bot removed the [zube]: Done label Oct 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants