From 5f6e490c8929c20276134359a487111873cdd498 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Thu, 18 Jan 2024 10:54:32 +0000 Subject: [PATCH 1/4] fix: adopt new libsinsp logger Signed-off-by: Roberto Scolaro --- userspace/falco/logger.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/userspace/falco/logger.cpp b/userspace/falco/logger.cpp index 12597392883..543ba3807c2 100644 --- a/userspace/falco/logger.cpp +++ b/userspace/falco/logger.cpp @@ -112,9 +112,9 @@ void falco_logger::set_sinsp_logging(bool enable, const std::string& severity, c if (enable) { s_sinsp_logger_prefix = prefix; - g_logger.set_severity(decode_sinsp_severity(severity)); - g_logger.disable_timestamps(); - g_logger.add_callback_log( + libsinsp_logger()->set_severity(decode_sinsp_severity(severity)); + libsinsp_logger()->disable_timestamps(); + libsinsp_logger()->add_callback_log( [](std::string&& str, const sinsp_logger::severity sev) { // note: using falco_logger::level ensures that the sinsp @@ -126,7 +126,7 @@ void falco_logger::set_sinsp_logging(bool enable, const std::string& severity, c } else { - g_logger.remove_callback_log(); + libsinsp_logger()->remove_callback_log(); } } From 49606e8705f0e66916268a6c39cd2f46bc5e0f73 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Tue, 30 Jan 2024 19:57:30 +0000 Subject: [PATCH 2/4] update: bump libs+driver to bfbc007 Signed-off-by: Roberto Scolaro --- cmake/modules/driver.cmake | 4 ++-- cmake/modules/falcosecurity-libs.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/driver.cmake b/cmake/modules/driver.cmake index 4166f11aaea..5b6c653e5a2 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 "7.0.0+driver") - set(DRIVER_CHECKSUM "SHA256=9f2a0f14827c0d9d1c3d1abe45b8f074dea531ebeca9859363a92f0d2475757e") + set(DRIVER_VERSION "bfbc0076b4dd52054f858cc45e98f1fdd9a91010") + set(DRIVER_CHECKSUM "SHA256=e987fef047925171be1f599e15e7ab0f5afc88a19596518bcaebd5dc9c3c81ef") endif() # cd /path/to/build && cmake /path/to/source diff --git a/cmake/modules/falcosecurity-libs.cmake b/cmake/modules/falcosecurity-libs.cmake index 4833944e043..eb4689d61be 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 "0.14.1") - set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=defdea24bf3b176c63f10900d3716fe4373151965cc09d3fe67a31a3a9af0b13") + set(FALCOSECURITY_LIBS_VERSION "bfbc0076b4dd52054f858cc45e98f1fdd9a91010") + set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=e987fef047925171be1f599e15e7ab0f5afc88a19596518bcaebd5dc9c3c81ef") endif() # cd /path/to/build && cmake /path/to/source From c1b25d6f3b6939a3e0cdfc91d04d14f800c71623 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Wed, 31 Jan 2024 09:55:51 +0000 Subject: [PATCH 3/4] chore(engine): update falco engine checksum Signed-off-by: Roberto Scolaro --- userspace/engine/falco_engine_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userspace/engine/falco_engine_version.h b/userspace/engine/falco_engine_version.h index 60a99aaad5e..b3fad972ae5 100644 --- a/userspace/engine/falco_engine_version.h +++ b/userspace/engine/falco_engine_version.h @@ -34,4 +34,4 @@ limitations under the License. // It represents the fields supported by this version of Falco, // the event types, and the underlying driverevent schema. It's used to // detetect changes in engine version in our CI jobs. -#define FALCO_ENGINE_CHECKSUM "7c512927c89f594f024f2ff181077c780c4fe6e9dd4cee3f20a9ef208a356e4e" +#define FALCO_ENGINE_CHECKSUM "b5e45959d248f7c28ad51ac12962150770770d1dd4506e8f7aa90d68ba670c12" From 2873458f923e02a9049571e80c8df93830c23417 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Wed, 31 Jan 2024 10:17:49 +0000 Subject: [PATCH 4/4] chore(engine): bump engine version Signed-off-by: Roberto Scolaro --- userspace/engine/falco_engine_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userspace/engine/falco_engine_version.h b/userspace/engine/falco_engine_version.h index b3fad972ae5..fe4bab91ffd 100644 --- a/userspace/engine/falco_engine_version.h +++ b/userspace/engine/falco_engine_version.h @@ -20,7 +20,7 @@ limitations under the License. // The version of this Falco engine #define FALCO_ENGINE_VERSION_MAJOR 0 -#define FALCO_ENGINE_VERSION_MINOR 31 +#define FALCO_ENGINE_VERSION_MINOR 32 #define FALCO_ENGINE_VERSION_PATCH 0 #define FALCO_ENGINE_VERSION \