Skip to content

[7.x] bc5 siem rules merge (#62679)#62725

Merged
spong merged 1 commit intoelastic:7.xfrom
spong:backport/7.x/pr-62679
Apr 7, 2020
Merged

[7.x] bc5 siem rules merge (#62679)#62725
spong merged 1 commit intoelastic:7.xfrom
spong:backport/7.x/pr-62679

Conversation

@spong
Copy link
Copy Markdown
Member

@spong spong commented Apr 7, 2020

Backports the following commits to 7.x:

* bc5 rule merge

version changes
field changes to endpoint rules
removed max_signals from 7 rules

* Fixing monitoring i18n (elastic#62715)

* Updates esarchiver test data with the latest rules (elastic#62723)

* Remove CR, only CRLF for rules

* delete two files

for Garrett

* deletes

delete 2 files (for Garrett)

* Revert "deletes"

This reverts commit cc2ac1e.

* Revert "Fixing monitoring i18n (elastic#62715)"

This reverts commit 0285740.

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Garrett Spong <spong@users.noreply.github.com>
Co-authored-by: Ross Wolf <31489089+rw-access@users.noreply.github.com>
@spong spong added the backport This PR is a backport of another PR label Apr 7, 2020
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@spong spong merged commit fa70396 into elastic:7.x Apr 7, 2020
@spong spong deleted the backport/7.x/pr-62679 branch April 7, 2020 04:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants