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

[7.15](backport #27323) [Filebeat] Threatintel compatibility updates #27778

Merged
merged 2 commits into from
Sep 7, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 7, 2021

This is an automatic backport of pull request #27323 done by Mergify.
Cherry-pick of 4be2694 has failed:

On branch mergify/bp/7.15/pr-27323
Your branch is up to date with 'origin/7.15'.

You are currently cherry-picking commit 4be26943b4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   filebeat/docs/fields.asciidoc
	modified:   filebeat/docs/modules/threatintel.asciidoc
	modified:   x-pack/filebeat/module/threatintel/_meta/docs.asciidoc
	modified:   x-pack/filebeat/module/threatintel/_meta/fields.yml
	modified:   x-pack/filebeat/module/threatintel/abusemalware/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/threatintel/abusemalware/test/abusechmalware.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/abuseurl/test/abusechurl.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/anomali/test/anomali_limo.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/anomalithreatstream/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/threatintel/anomalithreatstream/test/generated.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/fields.go
	modified:   x-pack/filebeat/module/threatintel/malwarebazaar/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/threatintel/misp/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/threatintel/misp/test/misp_sample.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/otx/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/threatintel/otx/test/otx_sample.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/recordedfuture/ingest/pipeline.yml
	modified:   x-pack/filebeat/module/threatintel/recordedfuture/test/domain.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/recordedfuture/test/hash.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/recordedfuture/test/ip.ndjson.log-expected.json
	modified:   x-pack/filebeat/module/threatintel/recordedfuture/test/url.ndjson.log-expected.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x-pack/filebeat/module/threatintel/abuseurl/ingest/pipeline.yml
	both modified:   x-pack/filebeat/module/threatintel/anomali/ingest/pipeline.yml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* First pass on updating filebeat threatintel logic for ECS 1.11

This only covers modules starting with an a; the rest will follow
shortly. In general, these changes address the following goals:

* preference for indicator.url.domain, and deprecation of
  indicator.domain
* moving from event.reference to indicator.reference

* Move remaining modules from indicator.domain -> indicator.url.domain

Along with conditional checks to ensure we're not overwriting the
relevant uri_parts data from earlier in the pipeline.

* Update indicator.reference in relevant modules

* Fix missing prefix in target field

* linting and apply new testfiles

* Run `make update` in filebeat

* fixing duplicate fields

* mage fmt update

* linting

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

# Conflicts:
#	x-pack/filebeat/module/threatintel/abuseurl/ingest/pipeline.yml
#	x-pack/filebeat/module/threatintel/anomali/ingest/pipeline.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Sep 7, 2021
@mergify mergify bot assigned rylnd Sep 7, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 7, 2021
@P1llus
Copy link
Member

P1llus commented Sep 7, 2021

@Mergifyio refresh

@mergify
Copy link
Contributor Author

mergify bot commented Sep 7, 2021

Command refresh: success

Pull request refreshed

@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 7, 2021

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-07T15:50:20.696+0000

  • Duration: 95 min 8 sec

  • Commit: ed2c06c

Test stats 🧪

Test Results
Failed 0
Passed 14581
Skipped 2327
Total 16908

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 14581
Skipped 2327
Total 16908

@P1llus P1llus merged commit 524e0e5 into 7.15 Sep 7, 2021
@mergify mergify bot deleted the mergify/bp/7.15/pr-27323 branch September 7, 2021 18:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants