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

Elastic-ecs: consolidate asset identifier #1477

Merged
merged 4 commits into from
May 10, 2023
Merged

Elastic-ecs: consolidate asset identifier #1477

merged 4 commits into from
May 10, 2023

Conversation

Harmedox
Copy link
Contributor

@Harmedox Harmedox commented May 9, 2023

In this PR:

  1. to_stix_map: converge all identifiers for an asset into x-oca-asset.device_id.
  2. from_stix_map: map asset identifiers into the id attribute of x-oca-asset.

@delliott90
Copy link
Collaborator

Would you be able to resolve the conflicts from your last PR that went in?

@Harmedox
Copy link
Contributor Author

Would you be able to resolve the conflicts from your last PR that went in?

resolved

@delliott90 delliott90 merged commit 0b67d44 into opencybersecurityalliance:develop May 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@delliott90 delliott90 delliott90 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Harmedox @delliott90