From ed5c4640250bfe4e6145b7c87f7fa73e48d2702c Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Mon, 26 Aug 2024 15:19:49 +0200 Subject: [PATCH] fix(cmake,userspace/falco): bumped libs to latest master. Also, fixes some newly introduced API breaks. Signed-off-by: Federico Di Pierro --- cmake/modules/driver.cmake | 4 ++-- cmake/modules/falcosecurity-libs.cmake | 4 ++-- userspace/falco/app/actions/helpers_inspector.cpp | 4 ++-- userspace/falco/app/actions/init_inspectors.cpp | 6 +----- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index a931dd8813b..27adf7bdf80 100644 --- a/cmake/modules/driver.cmake +++ b/cmake/modules/driver.cmake @@ -34,8 +34,8 @@ else() # In case you want to test against another driver version (or branch, or commit) just pass the variable - # ie., `cmake -DDRIVER_VERSION=dev ..` if(NOT DRIVER_VERSION) - set(DRIVER_VERSION "9d76298020e9dbde6b5d8e4f36b17c1ad6a4a4c7") - set(DRIVER_CHECKSUM "SHA256=4e5ad4bbcf7b106891f6aefb71d07fe4a060d8e5c6b4ec111fefbdce6e4231e7") + set(DRIVER_VERSION "d3d43cf9e8b274c1c2ea234dc41ac242c3f392c1") + set(DRIVER_CHECKSUM "SHA256=aedc4120d335ee2ebf7f3c2e6346fc985ca09a49d14ff7c6249a033e47d160bf") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index a52b112136d..a4915cce065 100644 --- a/cmake/modules/falcosecurity-libs.cmake +++ b/cmake/modules/falcosecurity-libs.cmake @@ -35,8 +35,8 @@ else() # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable - # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..` if(NOT FALCOSECURITY_LIBS_VERSION) - set(FALCOSECURITY_LIBS_VERSION "9d76298020e9dbde6b5d8e4f36b17c1ad6a4a4c7") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=4e5ad4bbcf7b106891f6aefb71d07fe4a060d8e5c6b4ec111fefbdce6e4231e7") + set(FALCOSECURITY_LIBS_VERSION "d3d43cf9e8b274c1c2ea234dc41ac242c3f392c1") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=aedc4120d335ee2ebf7f3c2e6346fc985ca09a49d14ff7c6249a033e47d160bf") endif() # cd /path/to/build && cmake /path/to/source diff --git a/userspace/falco/app/actions/helpers_inspector.cpp b/userspace/falco/app/actions/helpers_inspector.cpp index 0767500170f..765844524e7 100644 --- a/userspace/falco/app/actions/helpers_inspector.cpp +++ b/userspace/falco/app/actions/helpers_inspector.cpp @@ -65,7 +65,7 @@ falco::app::run_result falco::app::actions::open_live_inspector( { auto cfg = s.plugin_configs.at(p->name()); falco_logger::log(falco_logger::level::INFO, "Opening '" + source + "' source with plugin '" + cfg->m_name + "'"); - inspector->open_plugin(cfg->m_name, cfg->m_open_params); + inspector->open_plugin(cfg->m_name, cfg->m_open_params, sinsp_plugin_platform::SINSP_PLATFORM_HOSTINFO); return run_result::ok(); } } @@ -83,7 +83,7 @@ falco::app::run_result falco::app::actions::open_live_inspector( { auto cfg = s.plugin_configs.at(p->name()); falco_logger::log(falco_logger::level::INFO, "Opening '" + source + "' source with plugin '" + cfg->m_name + "'"); - inspector->open_plugin(cfg->m_name, cfg->m_open_params); + inspector->open_plugin(cfg->m_name, cfg->m_open_params, sinsp_plugin_platform::SINSP_PLATFORM_FULL); return run_result::ok(); } } diff --git a/userspace/falco/app/actions/init_inspectors.cpp b/userspace/falco/app/actions/init_inspectors.cpp index 672aaa23939..fe18f98b32c 100644 --- a/userspace/falco/app/actions/init_inspectors.cpp +++ b/userspace/falco/app/actions/init_inspectors.cpp @@ -126,11 +126,7 @@ falco::app::run_result falco::app::actions::init_inspectors(falco::app::state& s } else { - src_info->inspector = std::make_shared(false, - "", - "", - "", - s.config->m_metrics_flags & METRICS_V2_STATE_COUNTERS); + src_info->inspector = std::make_shared(s.config->m_metrics_flags & METRICS_V2_STATE_COUNTERS); } // do extra preparation for the syscall source