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.

Sign up for GitHub

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

Jump to bottom

[Filebeat] Fix bad append for abusechmalware #25674

Merged
merged 2 commits into from
May 25, 2021
Merged

[Filebeat] Fix bad append for abusechmalware #25674

merged 2 commits into from
May 25, 2021

Conversation

legoguy1000
Copy link
Contributor

@legoguy1000 legoguy1000 commented May 12, 2021 •
edited
Loading

What does this PR do?

Updates an append processor in the threatintel.abusechmalware fileset with the correct field name

Why is it important?

threatintel.indicator.file.hash.tlsh isn't currently appended to related.hash

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

  • [ ]

How to test this PR locally

cd beats/x-pack/filebeat
TESTING_FILEBEAT_MODULES=threatintel TESTING_FILEBEAT_FILESETS=abusemalware mage -v pythonIntegTest

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 12, 2021
@legoguy1000 legoguy1000 marked this pull request as ready for review May 12, 2021 00:10
@elasticmachine
Copy link
Collaborator

elasticmachine commented May 12, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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: P1llus commented: run tests

  • Start Time: 2021-05-25T12:44:28.678+0000

  • Duration: 9 min 36 sec

  • Commit: 61c2af4

Trends 🧪

Image of Build Times

❕ Flaky test report

No test was executed to be analysed.

@mergify
Copy link
Contributor

mergify bot commented May 13, 2021

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 25151-bad-append upstream/25151-bad-append
git merge upstream/master
git push upstream 25151-bad-append

@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 May 14, 2021
@P1llus
Copy link
Member

P1llus commented May 25, 2021

run tests

P1llus
P1llus approved these changes May 25, 2021
View reviewed changes
Copy link
Member

@P1llus P1llus left a comment

Choose a reason for hiding this comment

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

LGTM

@P1llus P1llus added the Filebeat Filebeat label May 25, 2021
@P1llus P1llus merged commit fafe6fb into elastic:master May 25, 2021
@P1llus P1llus added the backport-v7.14.0 Automated backport with mergify label May 25, 2021
mergify bot pushed a commit that referenced this pull request May 25, 2021
@legoguy1000
[Filebeat] Fix bad append for abusechmalware (#25674)
344f260 
* 25151: Fix bad append for abusechmalware

* update changelog

(cherry picked from commit fafe6fb)
@mergify mergify bot mentioned this pull request May 25, 2021
Merged
@legoguy1000 legoguy1000 deleted the 25151-bad-append branch May 25, 2021 15:02
P1llus added a commit that referenced this pull request May 25, 2021
@mergify @legoguy1000 @P1llus
[7.x](backport #25674) [Filebeat] Fix bad append for abusechmalware (#…
5e60010 
…25853)

* [Filebeat] Fix bad append for abusechmalware (#25674)

* 25151: Fix bad append for abusechmalware

* update changelog

(cherry picked from commit fafe6fb)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Alex Resnick <adr8292@gmail.com>
Co-authored-by: Marius Iversen <marius.iversen@elastic.co>
@P1llus P1llus added the backport-v7.13.0 Automated backport with mergify label May 27, 2021
@mergify mergify bot mentioned this pull request May 27, 2021
Closed
mergify bot pushed a commit that referenced this pull request May 27, 2021
@legoguy1000
[Filebeat] Fix bad append for abusechmalware (#25674)
3bdf553 
* 25151: Fix bad append for abusechmalware

* update changelog

(cherry picked from commit fafe6fb)

# Conflicts:
#	x-pack/filebeat/module/threatintel/abusemalware/test/abusechmalware.ndjson.log-expected.json
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@P1llus P1llus P1llus approved these changes

Assignees
No one assigned
Labels
backport-v7.13.0 Automated backport with mergify backport-v7.14.0 Automated backport with mergify enhancement Filebeat Filebeat
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Bug] Threat Intel tlsh Mismapped for Abuse Malware
3 participants
@legoguy1000 @elasticmachine @P1llus