Tags: BeyondCy/sysdig
Tags
Merge remote-tracking branch 'origin/dev' into falco-master
[SMAGENT-2019] fixes for cpuset on cri (draios#1512) * handle empty cpusets in crio and custom containers * for cri, Copy the cpuset_count to the container_info
Merge branch 'agent-release-0-92-2' into agent-master-3 Conflicts: userspace/libsinsp/CMakeLists.txt userspace/libsinsp/cgroup_limits.cpp userspace/libsinsp/chisel_api.cpp userspace/libsinsp/container.cpp userspace/libsinsp/container.h userspace/libsinsp/container_engine/cri.cpp userspace/libsinsp/container_engine/cri.h userspace/libsinsp/container_engine/docker.h userspace/libsinsp/container_engine/docker_common.cpp userspace/libsinsp/container_info.h userspace/libsinsp/ifinfo.cpp userspace/libsinsp/parsers.cpp userspace/libsinsp/sinsp.cpp userspace/libsinsp/sinsp.h
[SMAGENT-1855] Docker engine support for cpuset usage (draios#1473) Parses the CpusetCpus value from the docker socket, parses it to count the number of cpus and stores the value with the other container data.
Merge branch 'agent-release-0-92-1' into agent-master-3
PreviousNext