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 #20983 to 7.x: [Filebeat][fortinet] Map x509 ecs fields for fortinet fw fileset #21014

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 #20983 to 7.x branch. Original message:

What does this PR do?

Maps x509 fields for firewall fileset

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 #21014 updated]

  • Start Time: 2020-09-08T15:11:52.541+0000

  • Duration: 57 min 37 sec

Test stats 🧪

Test Results
Failed 0
Passed 2474
Skipped 388
Total 2862

@@ -286,6 +286,8 @@ field. You can revert this change by configuring tags for the module and omittin
- Fix long registry migration times. {pull}20717[20717] {issue}20705[20705]
- Fix event types and categories in auditd module to comply with ECS {pull}20652[20652]
- Update documentation in the azure module filebeat. {pull}20815[20815]
- Provide backwards compatibility for the `set` processor when Elasticsearch is less than 7.9.0. {pull}20908[20908]
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 pulled in an extra Changelog line

…stic#20983)

* Map x509 ecs fields for fortinet fw fileset

* Remove wrongly mapped field and bump ecs version

(cherry picked from commit e11283e)
@marc-gr marc-gr requested a review from leehinman September 8, 2020 15:10
Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

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

LGTM

@marc-gr marc-gr merged commit ee5d807 into elastic:7.x Sep 9, 2020
@marc-gr marc-gr deleted the backport_20983_7.x branch September 9, 2020 06:47
@zube zube bot removed the [zube]: Done label Dec 8, 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