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.

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

Cherry-pick #19316 to 7.x: [Filebeat][Fortinet Module] Small bugfixes for time formats and IP address arrays #19373

Merged
merged 1 commit into from
Jun 25, 2020

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Jun 24, 2020

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

What does this PR do?

This PR resolves reported issues around the eventtime field being in both seconds and milliseconds and that the field ipaddr can also be an array.

Why is it important?

Resolves niche usecases that would otherwise throw an error

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.

Author's Checklist

Added new logs and reran nosetests to ensure it was fixed.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 24, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 24, 2020
@leehinman leehinman force-pushed the backport_19316_7.x branch from 06a31c6 to e37b444 Compare June 24, 2020 17:14
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 24, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19373 updated]

  • Start Time: 2020-06-25T14:16:38.628+0000

  • Duration: 48 min 57 sec

Test stats 🧪

Test Results
Failed 0
Passed 2344
Skipped 382
Total 2726

Steps errors

Expand to view the steps failures

  • Name: Report to Codecov
    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 1 min 27 sec

    • Start Time: 2020-06-25T14:59:34.705+0000

    • log

…dress arrays (elastic#19316)

* added split for when dns is array
* only fix eventtime if the time is not in seconds
* added new timezone format option
* new testlogs has been added
* updated changelog
* fixing format set for events with non timezones

(cherry picked from commit 39961ad)
@leehinman leehinman force-pushed the backport_19316_7.x branch from e37b444 to a091e6c Compare June 25, 2020 14:15
@leehinman leehinman merged commit a4b9e89 into elastic:7.x Jun 25, 2020
@leehinman leehinman deleted the backport_19316_7.x branch June 25, 2020 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants