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

Tidy up model to resembles ECS more closely #5785

Merged
merged 2 commits into from
Jul 23, 2021
Merged

Conversation

axw
Copy link
Member

@axw axw commented Jul 22, 2021

Motivation/summary

Tidy up the model so it resembles ECS more closely:

  • Move Agent out of Service
  • Move Container, Kubernetes, and Network out of System
  • Rename System to Host, and rename hostname fields to match how they are emitted in docs.
  • Move host.os fields into a separate "OS" type and introduce OS as a field of Host.

Checklist

- [ ] Update CHANGELOG.asciidoc
- [ ] Documentation has been updated

How to test these changes

Non-functional change.

Related issues

#4120
#3565

axw added 2 commits July 22, 2021 17:37
Tidy up the model so it resembles ECS more closely:

- Move Agent out of Service
- Move Container, Kubernetes, and Network out of System
Again, rename System to Host to resemble ECS
more closely, and rename hostname fields.
Move host.os fields into a separate "OS" type
and introduce OS as a field of Host.
@apmmachine
Copy link
Contributor

💚 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-07-22T09:42:15.237+0000

  • Duration: 39 min 23 sec

  • Commit: 2f2cc3a

Test stats 🧪

Test Results
Failed 0
Passed 5965
Skipped 14
Total 5979

Trends 🧪

Image of Build Times

Image of Tests

@axw axw marked this pull request as ready for review July 22, 2021 10:24
@axw axw requested a review from a team July 22, 2021 10:24
@axw axw merged commit 3fe235c into elastic:master Jul 23, 2021
@axw axw deleted the model-tidyup branch July 23, 2021 01:40
mergify bot pushed a commit that referenced this pull request Jul 23, 2021
* model: move agent/container/kubernetes/network up

Tidy up the model so it resembles ECS more closely:

- Move Agent out of Service
- Move Container, Kubernetes, and Network out of System

* Rename model.System to model.Host

Again, rename System to Host to resemble ECS
more closely, and rename hostname fields.
Move host.os fields into a separate "OS" type
and introduce OS as a field of Host.

(cherry picked from commit 3fe235c)
axw added a commit that referenced this pull request Jul 26, 2021
* model: move agent/container/kubernetes/network up

Tidy up the model so it resembles ECS more closely:

- Move Agent out of Service
- Move Container, Kubernetes, and Network out of System

* Rename model.System to model.Host

Again, rename System to Host to resemble ECS
more closely, and rename hostname fields.
Move host.os fields into a separate "OS" type
and introduce OS as a field of Host.

(cherry picked from commit 3fe235c)

Co-authored-by: Andrew Wilkins <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants