Preserve runtime from container statuses in Kubernetes autodiscover #6456
Conversation
|
Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually? |
vjsamuel
force-pushed
the
set_correct_container_provider
branch
from
9c907ac
to
1a5a4a9
Compare
|
jenkins, test it |
|
@ruflin we do not but it is definitely possible to have it in a Kube cluster. (I think) |
|
@vjsamuel Interesting, was not aware that in one cluster you can mix the two. |
|
A single node can have only one runtime but there can be carved out nodes that do docker and some that do rkt if im not mistaken. |
| // that there is not an attempt to spin up a docker input for a rkt container and when a | ||
| // rkt input exists it would be natively supported. | ||
| if runtime, ok := container["runtime"]; ok { | ||
| e[runtime.(string)] = common.MapStr{ |
There was a problem hiding this comment.
I've second thoughts about our current field names. I think we should rename docker.container.* to container.* for 7.0. container.runtime will give you docker, rkt or any other.
For the time being, I'm ok with this I think, as removing the docker prefix would be a breaking change
There was a problem hiding this comment.
What do you think about this @vjsamuel? I'm thinking we could apply the change for autodiscover already, somehow duplicating docker.container == container.
Then in 7.0 we update metadata processor to use the new fields
| @@ -111,19 +111,22 @@ func (p *Provider) emitEvents(pod *kubernetes.Pod, flag string, containers []kub | |||
| containerstatuses []kubernetes.PodContainerStatus) { | |||
| host := pod.Status.PodIP | |||
|
|
|||
| // Collect all container IDs | |||
| // Collect all container IDs and runtimes from status information. Kubernetes has both docker and rkt | |||
There was a problem hiding this comment.
minor thing here, but it could be others at some point (apart from docker and rkt)
There was a problem hiding this comment.
should i update this?
vjsamuel
force-pushed
the
set_correct_container_provider
branch
from
75a0608
to
f3fdb8f
Compare
vjsamuel
force-pushed
the
set_correct_container_provider
branch
from
f3fdb8f
to
fff50d8
Compare
|
jenkins, test this please |
|
Thanks for the changes @vjsamuel 🎉 |
The initial implementation assumed always that containers come from docker. There are kube clusters that run
rktas the container runtime. Atleast we would not spin up docker prospectors/inputs by default when Beats is run in them and based onrktbehavior we can atleast manually set a config template on thelogsbuilder config.