From 24eec1e92a1e622cf0428f18d8f6fbdb34417b7f Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Tue, 25 Jun 2024 14:02:24 +0200 Subject: [PATCH] update(cmake,userspace): bump libs and driver to latest master. Signed-off-by: Federico Di Pierro --- cmake/modules/driver.cmake | 4 ++-- cmake/modules/falcosecurity-libs.cmake | 4 ++-- .../falco/app/actions/helpers_inspector.cpp | 5 ----- .../falco/app/actions/init_inspectors.cpp | 20 ++++++++++++++++--- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index c61e68e26e6..8bfb77d442d 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 "774db6b944cb4c7bca692400cec89cf14312cac2") - set(DRIVER_CHECKSUM "SHA256=61984089d71cc96e4fdf1ffe82b4da16802a0228859d7f15745173f0c9673b5e") + set(DRIVER_VERSION "473bf06780abf9b00923c90d779e4ff16f19903a") + set(DRIVER_CHECKSUM "SHA256=aa45432acd385881365a8aee7bfe1982fd6278aa7b23466d6864c2ffda5216dd") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index 06d17c93859..1f5b3978c27 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 "774db6b944cb4c7bca692400cec89cf14312cac2") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=61984089d71cc96e4fdf1ffe82b4da16802a0228859d7f15745173f0c9673b5e") + set(FALCOSECURITY_LIBS_VERSION "473bf06780abf9b00923c90d779e4ff16f19903a") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=aa45432acd385881365a8aee7bfe1982fd6278aa7b23466d6864c2ffda5216dd") 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 f39ceb7491b..0767500170f 100644 --- a/userspace/falco/app/actions/helpers_inspector.cpp +++ b/userspace/falco/app/actions/helpers_inspector.cpp @@ -48,11 +48,6 @@ falco::app::run_result falco::app::actions::open_live_inspector( { try { - if((s.config->m_metrics_flags & METRICS_V2_STATE_COUNTERS)) - { - inspector->set_sinsp_stats_v2_enabled(); - } - if(s.config->m_falco_libs_thread_table_size > 0) { // Default value is set in libs as part of the sinsp_thread_manager setup diff --git a/userspace/falco/app/actions/init_inspectors.cpp b/userspace/falco/app/actions/init_inspectors.cpp index 9c52383667d..672aaa23939 100644 --- a/userspace/falco/app/actions/init_inspectors.cpp +++ b/userspace/falco/app/actions/init_inspectors.cpp @@ -109,15 +109,29 @@ falco::app::run_result falco::app::actions::init_inspectors(falco::app::state& s std::unordered_set used_plugins; const auto& all_plugins = s.offline_inspector->get_plugin_manager()->plugins(); + if((s.config->m_metrics_flags & METRICS_V2_STATE_COUNTERS)) + { + + } + for (const auto &src : s.loaded_sources) { auto src_info = s.source_infos.at(src); // in capture mode, every event source uses the offline inspector. // in live mode, we create a new inspector for each event source - src_info->inspector = s.is_capture_mode() - ? s.offline_inspector - : std::make_shared(); + if (s.is_capture_mode()) + { + src_info->inspector = s.offline_inspector; + } + else + { + src_info->inspector = std::make_shared(false, + "", + "", + "", + s.config->m_metrics_flags & METRICS_V2_STATE_COUNTERS); + } // do extra preparation for the syscall source if (src == falco_common::syscall_source)