tmp

Signed-off-by: Andrea Terzolo <andreaterzolo3@gmail.com>
update(config): soft deprecation of old stats
2026-03-30 16:42:34 +00:00 · 2024-01-25 16:21:16 +01:00 · 2024-01-25 10:33:15 +01:00 · 2024-01-25 10:33:15 +01:00 · 2024-01-25 10:33:15 +01:00 · 2024-01-24 11:04:13 +01:00
5 changed files with 20 additions and 6 deletions
--- a/.github/workflows/reusable_test_packages.yaml
+++ b/.github/workflows/reusable_test_packages.yaml
@@ -19,7 +19,7 @@ on:
 jobs:
  test-packages:
    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-22.04' }}
    steps:
      - name: Checkout
        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
--- a/cmake/modules/njson.cmake
+++ b/cmake/modules/njson.cmake
@@ -19,8 +19,9 @@ if(USE_BUNDLED_NLOHMANN_JSON)
        CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/njson-prefix -DJSON_BuildTests=OFF -DBUILD_TESTING=OFF
    )

-    set(nlohmann_json_DIR ${PROJECT_BINARY_DIR}/njson-prefix/include)
+    set(nlohmann_json_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/njson-prefix/include)
 else()
    find_package(nlohmann_json CONFIG REQUIRED)
+    get_target_property(nlohmann_json_INCLUDE_DIRS nlohmann_json::nlohmann_json INTERFACE_INCLUDE_DIRECTORIES)
    add_custom_target(njson)
 endif()
--- a/falco.yaml
+++ b/falco.yaml
@@ -61,7 +61,7 @@
 # Falco logging / alerting / metrics related to software functioning (advanced)
 #     output_timeout
 #     syscall_event_timeouts
-#     syscall_event_drops
+#     syscall_event_drops -> [CHANGE NOTICE] Automatic notifications will be simplified in Falco 0.38! If you depend on the detailed drop counters payload, use 'metrics.output_rule' along with 'metrics.kernel_event_counters_enabled' instead
 #     metrics
 # Falco performance tuning (advanced)
 #     syscall_buf_size_preset [DEPRECATED] -> Replaced by `engine.<driver>.buf_size_preset` starting Falco 0.38!
@@ -793,7 +793,7 @@ output_timeout: 2000
 syscall_event_timeouts:
  max_consecutives: 1000

-# [Stable] `syscall_event_drops`
+# [Stable] `syscall_event_drops` -> [CHANGE NOTICE] Automatic notifications will be simplified in Falco 0.38! If you depend on the detailed drop counters payload, use 'metrics.output_rule' along with 'metrics.kernel_event_counters_enabled' instead
 #
 # Generates "Falco internal: syscall event drop" rule output when `priority=debug` at minimum
 #
--- a/userspace/engine/CMakeLists.txt
+++ b/userspace/engine/CMakeLists.txt
@@ -39,7 +39,7 @@ PUBLIC
    ${LIBSCAP_INCLUDE_DIRS}
    ${LIBSINSP_INCLUDE_DIRS}
    ${PROJECT_BINARY_DIR}/userspace/engine
-    ${nlohmann_json_DIR}
+    ${nlohmann_json_INCLUDE_DIRS}
    ${TBB_INCLUDE_DIR}
    ${YAMLCPP_INCLUDE_DIR}
 )
--- a/userspace/falco/stats_writer.cpp
+++ b/userspace/falco/stats_writer.cpp
@@ -366,9 +366,16 @@ void stats_writer::collector::get_metrics_output_fields_additional(
 	sinsp_thread_manager* thread_manager = inspector->m_thread_manager;
 	const scap_stats_v2* sinsp_stats_v2_snapshot = libsinsp::stats::get_sinsp_stats_v2(flags, agent_info, thread_manager, sinsp_stats_v2, buffer, &nstats, &rc);

+	uint32_t base_stat = 0;
+	// todo @incertum this needs to become better with the next proper stats refactor in libs 0.15.0
+	if ((flags & PPM_SCAP_STATS_STATE_COUNTERS) && !(flags & PPM_SCAP_STATS_RESOURCE_UTILIZATION))
+	{
+		base_stat = SINSP_STATS_V2_N_THREADS;
+	}
+
 	if (sinsp_stats_v2_snapshot && rc == 0 && nstats > 0)
 	{
-		for(uint32_t stat = 0; stat < nstats; stat++)
+		for(uint32_t stat = base_stat; stat < nstats; stat++)
 		{
 			if (sinsp_stats_v2_snapshot[stat].name[0] == '\0')
 			{
@@ -376,6 +383,12 @@ void stats_writer::collector::get_metrics_output_fields_additional(
 			}
 			char metric_name[STATS_NAME_MAX] = "falco.";
 			strlcat(metric_name, sinsp_stats_v2_snapshot[stat].name, sizeof(metric_name));
+			// todo @incertum temporary fix for n_fds and n_threads, type assignment was missed in libs, will be fixed in libs 0.15.0
+			if (strncmp(sinsp_stats_v2_snapshot[stat].name, "n_fds", 6) == 0 || strncmp(sinsp_stats_v2_snapshot[stat].name, "n_threads", 10) == 0)
+			{
+				output_fields[metric_name] = sinsp_stats_v2_snapshot[stat].value.u64;
+			}
+
 			switch(sinsp_stats_v2_snapshot[stat].type)
 			{
 			case STATS_VALUE_TYPE_U64:
Author	SHA1	Message	Date
Andrea Terzolo	baaafa2e60	tmp Signed-off-by: Andrea Terzolo <andreaterzolo3@gmail.com>	2024-01-25 16:21:16 +01:00
Melissa Kilby	bb4a643385	update(config): soft deprecation of old stats add CHANGE NOTICE wrt syscall_event_drops Co-authored-by: Leonardo Grasso <me@leonardograsso.com> Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-01-25 10:33:15 +01:00
Melissa Kilby	3675587aad	cleanup(configs): adjust old stats deprecation notice Co-authored-by: Andrea Terzolo <andreaterzolo3@gmail.com> Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-01-25 10:33:15 +01:00
Melissa Kilby	8a697502b9	update!(config): add deprecation notice for syscall_event_drops Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-01-25 10:33:15 +01:00
Melissa Kilby	2dc8d452ae	fix(userspace/metric): minor fixes in new libsinsp state metrics handling Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-01-24 11:04:13 +01:00
Federico Aponte	8143a194d2	fix: nlohmann_json lib include path Signed-off-by: Federico Aponte <federico.aponte@sysdig.com>	2024-01-24 09:38:13 +01:00
Jason Dellaluce	acba90d97a	test(engine): assess proper list escaping in engine collector Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>	2024-01-23 11:58:09 +01:00
Jason Dellaluce	ccf62a3745	fix(userspace/engine): avoid storing escaped strings in engine defs Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>	2024-01-23 11:58:09 +01:00
Federico Di Pierro	10eaf31881	update(cmake): bumped falcoctl to v0.7.1. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-01-23 11:57:09 +01:00