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

[7.x](backport #28124) x-pack/filebeat/module/threatintel/misp: add support for secondary object attribute handling #28305

Merged
merged 2 commits into from
Oct 11, 2021
Merged

[7.x](backport #28124) x-pack/filebeat/module/threatintel/misp: add support for secondary object attribute handling #28305

merged 2 commits into from
Oct 11, 2021

Commits on Oct 7, 2021

  1. x-pack/filebeat/module/threatintel/misp: add support for secondary ob… 

    …ject attribute handling (#28124)

Co-authored-by: Marius Iversen <[email protected]>
(cherry picked from commit 22d1742)

# Conflicts:
#	x-pack/filebeat/module/threatintel/misp/test/misp_sample.ndjson.log-expected.json
    @efd6
    efd6 authored and mergify-bot committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    3079fea View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. Fix merge conflict

    @efd6
    efd6 committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    991ce4d View commit details
    Browse the repository at this point in the history