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 #20976 to 7.x: [Filebeat][santa] Map x509 fields in santa module #21016

Merged
merged 1 commit into from
Sep 9, 2020

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Sep 8, 2020

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

What does this PR do?

Maps x509 fields in santa module.

Why is it important?

To keep modules up to date with ecs 1.6.

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.

Related issues

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

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 8, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 8, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21016 updated]

  • Start Time: 2020-09-09T06:50:11.852+0000

  • Duration: 57 min 0 sec

Test stats 🧪

Test Results
Failed 0
Passed 5558
Skipped 833
Total 6391

@@ -636,6 +636,8 @@ field. You can revert this change by configuring tags for the module and omittin
- Improve Zeek x509 module with `x509` ECS mappings {pull}20867[20867]
- Improve Zeek SSL module with `x509` ECS mappings {pull}20927[20927]
- Improve Zeek Kerberos module with `x509` ECS mappings {pull}20958[20958]
- Improve Fortinet firewall module with `x509` ECS mappings {pull}20983[20983]
Copy link
Contributor

Choose a reason for hiding this comment

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

looks like cherry_pick script picked up an extra Changelog line

* Map x509 fields in santa module

* Bump ecs version

(cherry picked from commit f3e532c)
@marc-gr marc-gr merged commit adc63fe into elastic:7.x Sep 9, 2020
@marc-gr marc-gr deleted the backport_20976_7.x branch September 9, 2020 14:43
@zube zube bot removed the [zube]: Done label Dec 9, 2020
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.

3 participants