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 #22361 to 7.x: [Filebeat][Fortinet] Fixing kv split for when assign-ip is not an IP and for date checking when eventtime is missing #22363

Merged
merged 1 commit into from
Nov 3, 2020

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Nov 2, 2020

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

What does this PR do?

Since the KV processor does typechecking while performing the splitting operations, it will fail if the assignIP field is of type string, even though it is removed later in the pipeline when its not in the correct format. This change moves the KV split to a temp field to bypass the datatype checking, and performs a check against the IP field before renaming the fields to its correct placement.

Why is it important?

Fixes an issue with KV in cases where eventtime is missing and assignip is not in the correct datatype.

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.

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

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 2, 2020
…and for date checking when eventtime is missing (elastic#22361)

* fixing assignip and making sure it does not error on missing eventtime field

* updating changelog

(cherry picked from commit 120f931)
Copy link
Contributor

@andrewstucki andrewstucki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM besides the changelog

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
@elasticmachine
Copy link
Collaborator

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1947
Skipped 259
Total 2206

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #22363 updated]

  • Start Time: 2020-11-02T20:51:12.966+0000

  • Duration: 83 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 1947
Skipped 259
Total 2206

@leehinman leehinman merged commit 2489578 into elastic:7.x Nov 3, 2020
@leehinman leehinman deleted the backport_22361_7.x branch November 3, 2020 00:00
@zube zube bot removed the [zube]: Done label Feb 1, 2021
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.

4 participants