Move back docker event fields to it's namespace #10073
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
exekias
added
review
needs_backport
ruflin
reviewed
Jan 16, 2019
| "id": event.ID, | ||
| "type": event.Type, | ||
| "action": event.Action, | ||
| "time": event.Time, |
There was a problem hiding this comment.
time is probably the one I would move to ECS. I wonder if this should even be @timestamp?
There was a problem hiding this comment.
yes, I will just remove it from here, as it's already reported under @timestamp here:
beats/metricbeat/module/docker/event/event.go
Line 124 in 48d2295
ruflin
approved these changes
Jan 16, 2019
jsoriano
approved these changes
Jan 16, 2019
|
ouch, done! |
jsoriano
reviewed
Jan 17, 2019
| }, | ||
| "from": "busybox", |
There was a problem hiding this comment.
The description of this field is Event source, but here it seemed to contain an image on create 🤔
Can it be the image used when creating a container or building an image?
There was a problem hiding this comment.
yes, it takes many forms, you also get events when creating a network, so this field is not always a image
exekias
added a commit
to exekias/beats
that referenced
this pull request
Jan 18, 2019
* Move back docker event fields to it's namespace
exekias
added a commit
that referenced
this pull request
Jan 22, 2019
* Add docker `event` metricset (#9856) * Add docker `event` metricset This metricset will retrieve events coming from the Docker events API [0]. Example output: ``` "docker": { "event": { "id": "8c229155b039c2adcb4fab1f987f35a0d1f913dfaa95f3113ed6e4f91eb5398c", "from": "busybox", "type": "container", "action": "die", "actor": { "id": "8c229155b039c2adcb4fab1f987f35a0d1f913dfaa95f3113ed6e4f91eb5398c", "attributes": { "image": "busybox", "name": "distracted_lichterman", "exitCode": "0" } }, "time": "2019-01-02T22:41:02.000Z", "status": "die" } } ``` Actor attributes will container labels in the case of container events, the module will perform dedotting (if enabled) on them. [0] https://docs.docker.com/engine/api/v1.37/#operation/SystemEvents * Add tests * Update changelog * Add missing header * Add missing file * Adapt to ECS * Use a cheaper event for tests * Close docker client on module shutdown * Update data * clean created container * fix image pull (cherry picked from commit eef102d) * Disable migration in docker event fields (#9947) * Move back docker event fields to it's namespace (#10073) * Move back docker event fields to it's namespace
exekias
removed
the
needs_backport
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up of #9856. We realized changing the event format from the original one may mislead users