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

fix(userspace/libsinsp): podman support during scap files replay #1851

Merged
merged 3 commits into from
May 8, 2024
Merged

fix(userspace/libsinsp): podman support during scap files replay #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15d1626
fix(userspace/libsinsp): enable podman container engine when running …
FedeDP May 7, 2024
721fa55
chore(userspace/libsinsp): properly manage `podman` container type.
FedeDP May 7, 2024
ce04c9f
chore(userspace/libsinsp): better check leveraging `query_os_for_miss…
FedeDP May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion userspace/libsinsp/container_engine/docker/podman.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,15 @@ bool podman::resolve(sinsp_threadinfo *tinfo, bool query_os_for_missing_info)

if(!m_api_sock_can_exist.has_value())
{
m_api_sock_can_exist = can_api_sock_exist();
if (query_os_for_missing_info)
{
m_api_sock_can_exist = can_api_sock_exist();
}
else
{
// Short-circuit: always enable podman when running from a capture file.
m_api_sock_can_exist = true;
}
}

if(!m_api_sock_can_exist.value())
Expand Down
3 changes: 3 additions & 0 deletions userspace/libsinsp/sinsp_filtercheck_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ uint8_t* sinsp_filter_check_container::extract_single(sinsp_evt *evt, OUT uint32
case sinsp_container_type::CT_BPM:
m_tstr = "bpm";
break;
case sinsp_container_type::CT_PODMAN:
m_tstr = "podman";
break;
default:
ASSERT(false);
break;
Expand Down
Loading