new(metrics): enable plugins metrics

Signed-off-by: Gianmatteo Palmieri <mail@gian.im> Co-authored-by: Melissa Kilby <melissa.kilby.oss@gmail.com>
update(engine): allow using -p to pass a format to plugin events
2026-03-27 15:12:08 +00:00 · 2024-06-17 11:54:00 +02:00 · 2024-06-17 11:54:00 +02:00 · 2024-06-17 11:54:00 +02:00 · 2024-06-17 11:54:00 +02:00 · 2024-06-17 11:54:00 +02:00
224 changed files with 10893 additions and 13710 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,36 +1,16 @@
+---
 Language: Cpp
-BasedOnStyle: Google
-AccessModifierOffset: -4
-BreakBeforeBraces: Attach
-AllowAllArgumentsOnNextLine: false
-AllowAllConstructorInitializersOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: Inline
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
-BinPackArguments: false
-BinPackParameters: false
-ColumnLimit: 100
-DerivePointerBinding: false
-IndentCaseLabels: false
-IndentWidth: 4
-SpaceAfterTemplateKeyword: false
-TabWidth: 4
-UseTab: ForIndentation
+BasedOnStyle: LLVM
+AccessModifierOffset: -8
+BreakBeforeBraces: Allman
 BreakConstructorInitializers: AfterColon
+ColumnLimit: 0
 ConstructorInitializerIndentWidth: 8
 ContinuationIndentWidth: 8
 DerivePointerAlignment: true
-SortIncludes: Never
+IndentWidth: 8
+SortIncludes: false
+SpaceAfterTemplateKeyword: false
 SpaceBeforeCtorInitializerColon: false
 SpaceBeforeParens: Never
-InsertNewlineAtEOF: true
---
-Language: Proto
-DisableFormat: true
---
-Language: JavaScript
-DisableFormat: true
---
-Language: Java
-DisableFormat: true
+UseTab: Always
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -1,3 +0,0 @@
-# These files contain some JSON schema definitions that are not C++ code
-userspace/falco/config_json_schema.h
-userspace/engine/rule_json_schema.h
--- a/.cmake-format
+++ b/.cmake-format
@@ -0,0 +1,119 @@
+# --------------------------
+# General Formatting Options
+# --------------------------
+# How wide to allow formatted cmake files
+line_width = 120
+
+# How many spaces to tab for indent
+tab_size = 2
+
+# If arg lists are longer than this, break them always
+max_subargs_per_line = 3
+
+# If true, separate flow control names from their parentheses with a space
+separate_ctrl_name_with_space = False
+
+# If true, separate function names from parentheses with a space
+separate_fn_name_with_space = False
+
+# If a statement is wrapped to more than one line, than dangle the closing
+# parenthesis on it's own line
+dangle_parens = False
+
+# If the statement spelling length (including space and parenthesis is larger
+# than the tab width by more than this among, then force reject un-nested
+# layouts.
+max_prefix_chars = 2
+
+# If a candidate layout is wrapped horizontally but it exceeds this many lines,
+# then reject the layout.
+max_lines_hwrap = 2
+
+# What style line endings to use in the output.
+line_ending = 'unix'
+
+# Format command names consistently as 'lower' or 'upper' case
+command_case = 'canonical'
+
+# Format keywords consistently as 'lower' or 'upper' case
+keyword_case = 'unchanged'
+
+# Specify structure for custom cmake functions
+additional_commands = {
+  "pkg_find": {
+    "kwargs": {
+      "PKG": "*"
+    }
+  }
+}
+
+# A list of command names which should always be wrapped
+always_wrap = []
+
+# Specify the order of wrapping algorithms during successive reflow attempts
+algorithm_order = [0, 1, 2, 3, 4]
+
+# If true, the argument lists which are known to be sortable will be sorted
+# lexicographically
+enable_sort = True
+
+# If true, the parsers may infer whether or not an argument list is sortable
+# (without annotation).
+autosort = False
+
+# If a comment line starts with at least this many consecutive hash characters,
+# then don't lstrip() them off. This allows for lazy hash rulers where the first
+# hash char is not separated by space
+hashruler_min_length = 10
+
+# A dictionary containing any per-command configuration overrides. Currently
+# only `command_case` is supported.
+per_command = {}
+
+
+# --------------------------
+# Comment Formatting Options
+# --------------------------
+# What character to use for bulleted lists
+bullet_char = '*'
+
+# What character to use as punctuation after numerals in an enumerated list
+enum_char = '.'
+
+# enable comment markup parsing and reflow
+enable_markup = True
+
+# If comment markup is enabled, don't reflow the first comment block in each
+# listfile. Use this to preserve formatting of your copyright/license
+# statements.
+first_comment_is_literal = False
+
+# If comment markup is enabled, don't reflow any comment block which matches
+# this (regex) pattern. Default is `None` (disabled).
+literal_comment_pattern = None
+
+# Regular expression to match preformat fences in comments
+# default=r'^\s*([`~]{3}[`~]*)(.*)$'
+fence_pattern = '^\\s*([`~]{3}[`~]*)(.*)$'
+
+# Regular expression to match rulers in comments
+# default=r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'
+ruler_pattern = '^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
+
+# If true, then insert a space between the first hash char and remaining hash
+# chars in a hash ruler, and normalize it's length to fill the column
+canonicalize_hashrulers = True
+
+
+# ---------------------------------
+# Miscellaneous Options
+# ---------------------------------
+# If true, emit the unicode byte-order mark (BOM) at the start of the file
+emit_byteorder_mark = False
+
+# Specify the encoding of the input file. Defaults to utf-8.
+input_encoding = 'utf-8'
+
+# Specify the encoding of the output file. Defaults to utf-8. Note that cmake
+# only claims to support utf-8 so be careful when using anything else
+output_encoding = 'utf-8'
--- a/.cmake-format.json
+++ b/.cmake-format.json
@@ -1,254 +0,0 @@
-{
-	"_help_format": "Options affecting formatting.",
-	"format": {
-		"_help_disable": [
-			"Disable formatting entirely, making cmake-format a no-op"
-		],
-		"disable": false,
-		"_help_line_width": [
-			"How wide to allow formatted cmake files"
-		],
-		"line_width": 100,
-		"_help_tab_size": [
-			"How many spaces to tab for indent"
-		],
-		"tab_size": 4,
-		"_help_use_tabchars": [
-			"If true, lines are indented using tab characters (utf-8",
-			"0x09) instead of <tab_size> space characters (utf-8 0x20).",
-			"In cases where the layout would require a fractional tab",
-			"character, the behavior of the  fractional indentation is",
-			"governed by <fractional_tab_policy>"
-		],
-		"use_tabchars": true,
-		"_help_fractional_tab_policy": [
-			"If <use_tabchars> is True, then the value of this variable",
-			"indicates how fractional indentions are handled during",
-			"whitespace replacement. If set to 'use-space', fractional",
-			"indentation is left as spaces (utf-8 0x20). If set to",
-			"`round-up` fractional indentation is replaced with a single",
-			"tab character (utf-8 0x09) effectively shifting the column",
-			"to the next tabstop"
-		],
-		"fractional_tab_policy": "use-space",
-		"_help_max_subgroups_hwrap": [
-			"If an argument group contains more than this many sub-groups",
-			"(parg or kwarg groups) then force it to a vertical layout."
-		],
-		"max_subgroups_hwrap": 2,
-		"_help_max_pargs_hwrap": [
-			"If a positional argument group contains more than this many",
-			"arguments, then force it to a vertical layout."
-		],
-		"max_pargs_hwrap": 6,
-		"_help_max_rows_cmdline": [
-			"If a cmdline positional group consumes more than this many",
-			"lines without nesting, then invalidate the layout (and nest)"
-		],
-		"max_rows_cmdline": 2,
-		"_help_separate_ctrl_name_with_space": [
-			"If true, separate flow control names from their parentheses",
-			"with a space"
-		],
-		"separate_ctrl_name_with_space": false,
-		"_help_separate_fn_name_with_space": [
-			"If true, separate function names from parentheses with a",
-			"space"
-		],
-		"separate_fn_name_with_space": false,
-		"_help_dangle_parens": [
-			"If a statement is wrapped to more than one line, than dangle",
-			"the closing parenthesis on its own line."
-		],
-		"dangle_parens": true,
-		"_help_dangle_align": [
-			"If the trailing parenthesis must be 'dangled' on its on",
-			"line, then align it to this reference: `prefix`: the start",
-			"of the statement,  `prefix-indent`: the start of the",
-			"statement, plus one indentation  level, `child`: align to",
-			"the column of the arguments"
-		],
-		"dangle_align": "prefix",
-		"_help_min_prefix_chars": [
-			"If the statement spelling length (including space and",
-			"parenthesis) is smaller than this amount, then force reject",
-			"nested layouts."
-		],
-		"min_prefix_chars": 4,
-		"_help_max_prefix_chars": [
-			"If the statement spelling length (including space and",
-			"parenthesis) is larger than the tab width by more than this",
-			"amount, then force reject un-nested layouts."
-		],
-		"max_prefix_chars": 10,
-		"_help_max_lines_hwrap": [
-			"If a candidate layout is wrapped horizontally but it exceeds",
-			"this many lines, then reject the layout."
-		],
-		"max_lines_hwrap": 2,
-		"_help_line_ending": [
-			"What style line endings to use in the output."
-		],
-		"line_ending": "unix",
-		"_help_command_case": [
-			"Format command names consistently as 'lower' or 'upper' case"
-		],
-		"command_case": "canonical",
-		"_help_keyword_case": [
-			"Format keywords consistently as 'lower' or 'upper' case"
-		],
-		"keyword_case": "unchanged",
-		"_help_always_wrap": [
-			"A list of command names which should always be wrapped"
-		],
-		"always_wrap": [],
-		"_help_enable_sort": [
-			"If true, the argument lists which are known to be sortable",
-			"will be sorted lexicographicall"
-		],
-		"enable_sort": true,
-		"_help_autosort": [
-			"If true, the parsers may infer whether or not an argument",
-			"list is sortable (without annotation)."
-		],
-		"autosort": false,
-		"_help_require_valid_layout": [
-			"By default, if cmake-format cannot successfully fit",
-			"everything into the desired linewidth it will apply the",
-			"last, most agresive attempt that it made. If this flag is",
-			"True, however, cmake-format will print error, exit with non-",
-			"zero status code, and write-out nothing"
-		],
-		"require_valid_layout": false,
-		"_help_layout_passes": [
-			"A dictionary mapping layout nodes to a list of wrap",
-			"decisions. See the documentation for more information."
-		],
-		"layout_passes": {}
-	},
-	"_help_markup": "Options affecting comment reflow and formatting.",
-	"markup": {
-		"_help_bullet_char": [
-			"What character to use for bulleted lists"
-		],
-		"bullet_char": "*",
-		"_help_enum_char": [
-			"What character to use as punctuation after numerals in an",
-			"enumerated list"
-		],
-		"enum_char": ".",
-		"_help_first_comment_is_literal": [
-			"If comment markup is enabled, don't reflow the first comment",
-			"block in each listfile. Use this to preserve formatting of",
-			"your copyright/license statements."
-		],
-		"first_comment_is_literal": false,
-		"_help_literal_comment_pattern": [
-			"If comment markup is enabled, don't reflow any comment block",
-			"which matches this (regex) pattern. Default is `None`",
-			"(disabled)."
-		],
-		"literal_comment_pattern": null,
-		"_help_fence_pattern": [
-			"Regular expression to match preformat fences in comments",
-			"default= ``r'^\\s*([`~]{3}[`~]*)(.*)$'``"
-		],
-		"fence_pattern": "^\\s*([`~]{3}[`~]*)(.*)$",
-		"_help_ruler_pattern": [
-			"Regular expression to match rulers in comments default=",
-			"``r'^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'``"
-		],
-		"ruler_pattern": "^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$",
-		"_help_explicit_trailing_pattern": [
-			"If a comment line matches starts with this pattern then it",
-			"is explicitly a trailing comment for the preceding",
-			"argument. Default is '#<'"
-		],
-		"explicit_trailing_pattern": "#<",
-		"_help_hashruler_min_length": [
-			"If a comment line starts with at least this many consecutive",
-			"hash characters, then don't lstrip() them off. This allows",
-			"for lazy hash rulers where the first hash char is not",
-			"separated by space"
-		],
-		"hashruler_min_length": 10,
-		"_help_canonicalize_hashrulers": [
-			"If true, then insert a space between the first hash char and",
-			"remaining hash chars in a hash ruler, and normalize its",
-			"length to fill the column"
-		],
-		"canonicalize_hashrulers": true,
-		"_help_enable_markup": [
-			"enable comment markup parsing and reflow"
-		],
-		"enable_markup": true
-	},
-	"_help_lint": "Options affecting the linter",
-	"lint": {
-		"_help_disabled_codes": [
-			"a list of lint codes to disable"
-		],
-		"disabled_codes": [],
-		"_help_function_pattern": [
-			"regular expression pattern describing valid function names"
-		],
-		"function_pattern": "[0-9a-z_]+",
-		"_help_macro_pattern": [
-			"regular expression pattern describing valid macro names"
-		],
-		"macro_pattern": "[0-9A-Z_]+",
-		"_help_global_var_pattern": [
-			"regular expression pattern describing valid names for",
-			"variables with global (cache) scope"
-		],
-		"global_var_pattern": "[A-Z][0-9A-Z_]+",
-		"_help_internal_var_pattern": [
-			"regular expression pattern describing valid names for",
-			"variables with global scope (but internal semantic)"
-		],
-		"internal_var_pattern": "_[A-Z][0-9A-Z_]+",
-		"_help_local_var_pattern": [
-			"regular expression pattern describing valid names for",
-			"variables with local scope"
-		],
-		"local_var_pattern": "[a-z][a-z0-9_]+",
-		"_help_private_var_pattern": [
-			"regular expression pattern describing valid names for",
-			"privatedirectory variables"
-		],
-		"private_var_pattern": "_[0-9a-z_]+",
-		"_help_public_var_pattern": [
-			"regular expression pattern describing valid names for public",
-			"directory variables"
-		],
-		"public_var_pattern": "[A-Z][0-9A-Z_]+",
-		"_help_argument_var_pattern": [
-			"regular expression pattern describing valid names for",
-			"function/macro arguments and loop variables."
-		],
-		"argument_var_pattern": "[a-z][a-z0-9_]+",
-		"_help_keyword_pattern": [
-			"regular expression pattern describing valid names for",
-			"keywords used in functions or macros"
-		],
-		"keyword_pattern": "[A-Z][0-9A-Z_]+",
-		"_help_max_conditionals_custom_parser": [
-			"In the heuristic for C0201, how many conditionals to match",
-			"within a loop in before considering the loop a parser."
-		],
-		"max_conditionals_custom_parser": 2,
-		"_help_min_statement_spacing": [
-			"Require at least this many newlines between statements"
-		],
-		"min_statement_spacing": 1,
-		"_help_max_statement_spacing": [
-			"Require no more than this many newlines between statements"
-		],
-		"max_statement_spacing": 2,
-		"max_returns": 6,
-		"max_branches": 12,
-		"max_arguments": 5,
-		"max_localvars": 15,
-		"max_statements": 50
-	}
-}
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +0,0 @@
-# This commit formatted the Falco code for the first time.
-50b98b30e588eadce641136da85bc94a60eb6a3d
--- a/.github/release_template.md
+++ b/.github/release_template.md
@@ -10,11 +10,12 @@
 | deb-aarch64      | [![deb](https://img.shields.io/badge/Falco-FALCOVER-%2300aec7?style=flat-square)](https://download.falco.org/packages/debFALCOBUCKET/stable/falco-FALCOVER-aarch64.deb) |
 | tgz-aarch64      | [![tgz](https://img.shields.io/badge/Falco-FALCOVER-%2300aec7?style=flat-square)](https://download.falco.org/packages/binFALCOBUCKET/aarch64/falco-FALCOVER-aarch64.tar.gz) |

-| Images                                                                    |
-|---------------------------------------------------------------------------|
-| `docker pull docker.io/falcosecurity/falco:FALCOVER`                      |
-| `docker pull public.ecr.aws/falcosecurity/falco:FALCOVER`                 |
-| `docker pull docker.io/falcosecurity/falco-driver-loader:FALCOVER`        |
-| `docker pull docker.io/falcosecurity/falco-driver-loader:FALCOVER-buster` |
-| `docker pull docker.io/falcosecurity/falco:FALCOVER-debian`               |
+| Images                                                                      |
+| --------------------------------------------------------------------------- |
+| `docker pull docker.io/falcosecurity/falco:FALCOVER`                           |
+| `docker pull public.ecr.aws/falcosecurity/falco:FALCOVER`                      |
+| `docker pull docker.io/falcosecurity/falco-driver-loader:FALCOVER`             |
+| `docker pull docker.io/falcosecurity/falco-driver-loader-legacy:FALCOVER`      |
+| `docker pull docker.io/falcosecurity/falco-no-driver:FALCOVER`                 |
+| `docker pull docker.io/falcosecurity/falco-distroless:FALCOVER`                |

--- a/.github/workflows/bump-libs.yaml
+++ b/.github/workflows/bump-libs.yaml
@@ -1,63 +0,0 @@
---
-name: Bump Libs
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '30 6 * * 1' # on each monday 6:30
-
-# Checks if any concurrent jobs is running for kernels CI and eventually cancel it.
-concurrency:
-  group: bump-libs-ci
-  cancel-in-progress: true
-
-jobs:
-  bump-libs:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Download libs master tar.gz
-        run: |
-          wget https://github.com/falcosecurity/libs/archive/refs/heads/master.tar.gz
-
-      - name: Store libs hash and shasum
-        id: store
-        run: |
-          gunzip -c master.tar.gz > master.tar
-          commit=$(cat master.tar | git get-tar-commit-id)
-          echo "COMMIT=$commit" >> "$GITHUB_OUTPUT"
-          wget https://github.com/falcosecurity/libs/archive/$commit.tar.gz
-          echo "SHASUM=$(sha256sum $commit.tar.gz | awk '{print $1}')" >> "$GITHUB_OUTPUT"
-
-      - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          path: falco
-
-      - name: Bump libs version and hash
-        run: |
-          cd falco
-          sed -i -E '45s/FALCOSECURITY_LIBS_VERSION "(.+)"/FALCOSECURITY_LIBS_VERSION "${{ steps.store.outputs.COMMIT }}"/' cmake/modules/falcosecurity-libs.cmake
-          sed -i -E '47s/"SHA256=(.+)"/"SHA256=${{ steps.store.outputs.SHASUM }}"/' cmake/modules/falcosecurity-libs.cmake
-          sed -i -E '38s/DRIVER_VERSION "(.+)"/DRIVER_VERSION "${{ steps.store.outputs.COMMIT }}"/' cmake/modules/driver.cmake
-          sed -i -E '40s/"SHA256=(.+)"/"SHA256=${{ steps.store.outputs.SHASUM }}"/' cmake/modules/driver.cmake
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
-        with:
-          path: falco
-          signoff: true
-          base: master
-          branch: update/libs
-          title: 'update(cmake): update libs and driver to latest master'
-          body: |
-            This PR updates libs and driver to latest commit.
-            /kind release
-            /area build
-            ```release-note
-            NONE
-            ```
-          commit-message: 'update(cmake): update libs and driver to latest master.'
-          token: ${{ secrets.GITHUB_TOKEN }}	  
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,21 +12,26 @@ concurrency:
  group: ${{ github.head_ref || github.run_id }}
  cancel-in-progress: true  

-permissions:  
-  contents: read
-  
 jobs:
  fetch-version:
    uses: ./.github/workflows/reusable_fetch_version.yaml

+  build-dev-packages-sanitizers-x86_64:
+    needs: [fetch-version]
+    uses: ./.github/workflows/reusable_build_packages.yaml
+    with:
+      arch: x86_64
+      version: ${{ needs.fetch-version.outputs.version }}
+      build_type: Debug
+      sanitizers: true
+
  build-dev-packages-x86_64:
    needs: [fetch-version]
    uses: ./.github/workflows/reusable_build_packages.yaml
    with:
      arch: x86_64
      version: ${{ needs.fetch-version.outputs.version }}
-      enable_debug: true
-      enable_sanitizers: true
+      build_type: Release

  build-dev-packages-arm64:
    needs: [fetch-version]
@@ -34,19 +39,22 @@ jobs:
    with:
      arch: aarch64
      version: ${{ needs.fetch-version.outputs.version }}
-      enable_debug: true
+      build_type: Debug
+      sanitizers: false

  test-dev-packages:
-    needs: [fetch-version, build-dev-packages-x86_64]
+    needs: [fetch-version, build-dev-packages-sanitizers-x86_64]
    uses: ./.github/workflows/reusable_test_packages.yaml
-    strategy:
-      fail-fast: false
-      matrix:
-        static: ["static", ""]
+    # The musl build job is currently disabled because we link libelf dynamically and it is
+    # not possible to dynamically link with musl
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     static: ["static", ""]
    with:
      arch: x86_64
-      sanitizers: ${{ matrix.static == '' && true || false }}
-      static: ${{ matrix.static != '' && true || false }}
+      sanitizers: true
+      # static: ${{ matrix.static != '' && true || false }}
      version: ${{ needs.fetch-version.outputs.version }}

  test-dev-packages-arm64:
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -18,9 +18,6 @@ on:
    # The branches below must be a subset of the branches above
    branches: [ "master" ]

-permissions:  
-  contents: read
-
 jobs:
  analyze:
    name: Analyze
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -1,10 +1,6 @@
 name: Codespell
 on:
  pull_request:
-    
-permissions:  
-  contents: read
-
 jobs:
  codespell:
    runs-on: ubuntu-latest
--- a/.github/workflows/engine-version-weakcheck.yaml
+++ b/.github/workflows/engine-version-weakcheck.yaml
@@ -9,9 +9,6 @@ on:
      - 'userspace/engine/*.cpp'
      - 'userspace/engine/*.h'

-permissions:  
-  contents: read
-
 jobs:
  paths-filter:
    runs-on: ubuntu-latest
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -1,38 +0,0 @@
-name: Format code
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - "release/**"
-
-jobs:
-  format:
-    name: format code 🐲
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout repository 🎉
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-        with:
-          fetch-depth: 0
-
-      - name: Install deps ⛓️
-        run: |
-          sudo apt update -y
-          sudo apt install -y --no-install-recommends ca-certificates pip git
-          pip install pre-commit
-
-      - name: Run pre-commit ©️
-        run: |
-          pre-commit run --all-files
-
-      - name: Generate the git-diff 🚒
-        if: failure()
-        run: git diff > format_diff.patch
-
-      - name: Upload the git diff artifact 📦
-        if: failure()
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: format_diff.patch
-          path: ./format_diff.patch
--- a/.github/workflows/insecure-api.yaml
+++ b/.github/workflows/insecure-api.yaml
@@ -6,15 +6,12 @@ on:
      - 'release/**'
      - 'maintainers/**'

-permissions:  
-  contents: read
-
 jobs:
  insecure-api:
    name: check-insecure-api
    runs-on: ubuntu-latest
    container:
-      image: semgrep/semgrep:1.85.0@sha256:b4c2272e0a2e59ca551ff96d3bbae657bd2b7356e339af557b27a96d9e751544
+      image: returntocorp/semgrep:1.41.0@sha256:85956fbe795a0e8a3825d5252f175887c0e0c6ce7a766a07062c0fb68415cd67
    steps:
      - name: Checkout Falco ⤵️
        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -6,7 +6,7 @@ on:
 # Checks if any concurrent jobs is running for master CI and eventually cancel it
 concurrency:
  group: ci-master
-  cancel-in-progress: true
+  cancel-in-progress: true  

 jobs:
  fetch-version:
@@ -31,13 +31,15 @@ jobs:
  test-dev-packages:
    needs: [fetch-version, build-dev-packages]
    uses: ./.github/workflows/reusable_test_packages.yaml
-    strategy:
-      fail-fast: false
-      matrix:
-        static: ["static", ""]
+    # The musl build job is currently disabled because we link libelf dynamically and it is
+    # not possible to dynamically link with musl
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     static: ["static", ""]
    with:
      arch: x86_64
-      static: ${{ matrix.static != '' && true || false }}
+      # static: ${{ matrix.static != '' && true || false }}
      version: ${{ needs.fetch-version.outputs.version }}
  
  test-dev-packages-arm64:
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -6,17 +6,17 @@ on:
 # Checks if any concurrent jobs is running for release CI and eventually cancel it.
 concurrency:
  group: ci-release
-  cancel-in-progress: true
+  cancel-in-progress: true  

 jobs:
  release-settings:
    runs-on: ubuntu-latest
    outputs:
-      is_latest: ${{ steps.get_settings.outputs.is_latest }}
+      is_latest: ${{ steps.get_settings.outputs.is_latest }} 
      bucket_suffix: ${{ steps.get_settings.outputs.bucket_suffix }}
    steps:
      - name: Get latest release
-        uses: rez0n/actions-github-release@27a57820ee808f8fd940c8a9d1f7188f854aa2b5 # v2.0
+        uses: rez0n/actions-github-release@v2.0
        id: latest_release
        env:
          token: ${{ secrets.GITHUB_TOKEN }}
@@ -69,22 +69,25 @@ jobs:
  test-packages:
    needs: [release-settings, build-packages]
    uses: ./.github/workflows/reusable_test_packages.yaml
-    strategy:
-      fail-fast: false
-      matrix:
-        static: ["static", ""]
+
+    # The musl build job is currently disabled because we link libelf dynamically and it is
+    # not possible to dynamically link with musl
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     static: ["static", ""]
    with:
      arch: x86_64
-      static: ${{ matrix.static != '' && true || false }}
+      # static: ${{ matrix.static != '' && true || false }}
      version: ${{ github.event.release.tag_name }}
-
+  
  test-packages-arm64:
    needs: [release-settings, build-packages-arm64]
    uses: ./.github/workflows/reusable_test_packages.yaml
    with:
      arch: aarch64
      version: ${{ github.event.release.tag_name }}
-
+    
  publish-packages:
    needs: [release-settings, test-packages, test-packages-arm64]
    uses: ./.github/workflows/reusable_publish_packages.yaml
@@ -92,7 +95,7 @@ jobs:
      bucket_suffix: ${{ needs.release-settings.outputs.bucket_suffix }}
      version: ${{ github.event.release.tag_name }}
    secrets: inherit
-
+  
  # Both build-docker and its arm64 counterpart require build-packages because they use its output
  build-docker:
    needs: [release-settings, build-packages, publish-packages]
@@ -103,7 +106,7 @@ jobs:
      version: ${{ github.event.release.tag_name }}
      tag: ${{ github.event.release.tag_name }}
    secrets: inherit
-
+    
  build-docker-arm64:
    needs: [release-settings, build-packages, publish-packages]
    uses: ./.github/workflows/reusable_build_docker.yaml
@@ -122,7 +125,7 @@ jobs:
      is_latest: ${{ needs.release-settings.outputs.is_latest == 'true' }}
      tag: ${{ github.event.release.tag_name }}
      sign: true
-
+      
  release-body:
    needs: [release-settings, publish-docker]
    if: ${{ needs.release-settings.outputs.is_latest == 'true' }} # only for latest releases
@@ -132,7 +135,7 @@ jobs:
    steps:
      - name: Clone repo
        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
+          
      - name: Extract LIBS and DRIVER versions
        run: |
          cp .github/release_template.md release-body.md
@@ -140,48 +143,29 @@ jobs:
          DRIVER_VERS=$(cat cmake/modules/driver.cmake | grep 'set(DRIVER_VERSION' | tail -n1 | grep -o '[[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*+driver')
          sed -i s/LIBSVER/$LIBS_VERS/g release-body.md
          sed -i s/DRIVERVER/$DRIVER_VERS/g release-body.md
-
+          
      - name: Append release matrixes
        run: |
          sed -i s/FALCOBUCKET/${{ needs.release-settings.outputs.bucket_suffix }}/g release-body.md
          sed -i s/FALCOVER/${{ github.event.release.tag_name }}/g release-body.md
-
+          
      - name: Generate release notes
        uses: leodido/rn2md@9c351d81278644c0e17b1ca68edbdba305276c73
        with:
          milestone: ${{ github.event.release.tag_name }}
          output: ./notes.md
-
+        
      - name: Merge release notes to pre existent body
        run: cat notes.md >> release-body.md
-
+        
      - name: Attach release creator to release body
        run: |
          echo "" >> release-body.md
          echo "#### Release Manager @${{ github.event.release.author.login }}" >> release-body.md
-
-      - name: Download debug symbols for Falco x86_64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: falco-${{ github.event.release.tag_name }}-x86_64.debug
-
-      - name: Rename x86_64 debug symbols
-        run: mv falco.debug falco-x86_64.debug
-
-      - name: Download debug symbols for Falco aarch64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: falco-${{ github.event.release.tag_name }}-aarch64.debug
-
-      - name: Rename aarch64 debug symbols
-        run: mv falco.debug falco-aarch64.debug
-
+        
      - name: Release
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v0.1.15
        with:
          body_path: ./release-body.md
          tag_name: ${{ github.event.release.tag_name }}
          name: ${{ github.event.release.name }}
-          files: |
-            falco-x86_64.debug
-            falco-aarch64.debug
--- a/.github/workflows/reusable_build_dev.yaml
+++ b/.github/workflows/reusable_build_dev.yaml
@@ -33,13 +33,10 @@ on:
        default: ''
        type: string

-permissions: 
-  contents: read
-
 jobs:
  build-and-test:
    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-22.04' }}
+    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-22.04' }}
    outputs:
      cmdout: ${{ steps.run_cmd.outputs.out }}
    steps:
--- a/.github/workflows/reusable_build_docker.yaml
+++ b/.github/workflows/reusable_build_docker.yaml
@@ -20,46 +20,52 @@ on:
        required: true
        type: string

-# Here we just build all docker images as tarballs,
+# Here we just build all docker images as tarballs, 
 # then we upload all the tarballs to be later downloaded by reusable_publish_docker workflow.
-# In this way, we don't need to publish any arch specific image,
+# In this way, we don't need to publish any arch specific image, 
 # and this "build" workflow is actually only building images.
-
-permissions:
-  contents: read
-
 jobs:
  build-docker:
    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
    env:
      TARGETARCH: ${{ (inputs.arch == 'aarch64' && 'arm64') || 'amd64' }}
    steps:
      - name: Checkout
        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
+        
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      - name: Build falco image
+          
+      - name: Build no-driver image
        run: |
-          cd ${{ github.workspace }}/docker/falco/
-          docker build -t docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }} \
+          cd ${{ github.workspace }}/docker/no-driver/
+          docker build -t docker.io/falcosecurity/falco-no-driver:${{ inputs.arch }}-${{ inputs.tag }} \
            --build-arg VERSION_BUCKET=bin${{ inputs.bucket_suffix }} \
            --build-arg FALCO_VERSION=${{ inputs.version }} \
            --build-arg TARGETARCH=${TARGETARCH} \
            .
-            docker save docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-${{ inputs.arch }}.tar
+            docker save docker.io/falcosecurity/falco-no-driver:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-no-driver-${{ inputs.arch }}.tar

-      - name: Build falco-debian image
+      - name: Build distroless image
        run: |
-          cd ${{ github.workspace }}/docker/falco-debian/
-          docker build -t docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }}-debian \
+          cd ${{ github.workspace }}/docker/no-driver/
+          docker build -f Dockerfile.distroless -t docker.io/falcosecurity/falco-distroless:${{ inputs.arch }}-${{ inputs.tag }} \
+            --build-arg VERSION_BUCKET=bin${{ inputs.bucket_suffix }} \
+            --build-arg FALCO_VERSION=${{ inputs.version }} \
+            --build-arg TARGETARCH=${TARGETARCH} \
+            .
+            docker save docker.io/falcosecurity/falco-distroless:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-distroless-${{ inputs.arch }}.tar
+            
+      - name: Build falco image
+        run: |
+          cd ${{ github.workspace }}/docker/falco/
+          docker build -t docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }} \
            --build-arg VERSION_BUCKET=deb${{ inputs.bucket_suffix }} \
            --build-arg FALCO_VERSION=${{ inputs.version }} \
            --build-arg TARGETARCH=${TARGETARCH} \
            .
-            docker save docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }}-debian --output /tmp/falco-${{ inputs.arch }}-debian.tar
+            docker save docker.io/falcosecurity/falco:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-${{ inputs.arch }}.tar

      - name: Build falco-driver-loader image
        run: |
@@ -70,19 +76,19 @@ jobs:
            .
            docker save docker.io/falcosecurity/falco-driver-loader:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-driver-loader-${{ inputs.arch }}.tar

-      - name: Build falco-driver-loader-buster image
+      - name: Build falco-driver-loader-legacy image
        run: |
-          cd ${{ github.workspace }}/docker/driver-loader-buster/
-          docker build -t docker.io/falcosecurity/falco-driver-loader:${{ inputs.arch }}-${{ inputs.tag }}-buster \
+          cd ${{ github.workspace }}/docker/driver-loader-legacy/
+          docker build -t docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.arch }}-${{ inputs.tag }} \
            --build-arg VERSION_BUCKET=deb${{ inputs.bucket_suffix }} \
            --build-arg FALCO_VERSION=${{ inputs.version }} \
            --build-arg TARGETARCH=${TARGETARCH} \
            .
-            docker save docker.io/falcosecurity/falco-driver-loader:${{ inputs.arch }}-${{ inputs.tag }}-buster --output /tmp/falco-driver-loader-${{ inputs.arch }}-buster.tar
+            docker save docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.arch }}-${{ inputs.tag }} --output /tmp/falco-driver-loader-legacy-${{ inputs.arch }}.tar

      - name: Upload images tarballs
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
-          name: falco-images-${{ inputs.arch }}
+          name: falco-images
          path: /tmp/falco-*.tar
          retention-days: 1
--- a/.github/workflows/reusable_build_packages.yaml
+++ b/.github/workflows/reusable_build_packages.yaml
@@ -10,30 +10,27 @@ on:
        description: The Falco version to use when building packages
        required: true
        type: string
-      enable_debug:
-        description: Also create a debug build
+      build_type:
+        description: The build type
+        required: false
+        type: string
+        default: 'Release'
+      sanitizers:
+        description: enable sanitizer support
        required: false
        type: boolean
        default: false
-      enable_sanitizers:
-        description: Also create a sanitizer build
-        required: false
-        type: boolean
-        default: false
-
-permissions:  
-  contents: read

 jobs:
  build-modern-bpf-skeleton:
    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
    container: fedora:latest
    steps:
      # Always install deps before invoking checkout action, to properly perform a full clone.
      - name: Install build dependencies
        run: |
-          dnf install -y bpftool ca-certificates cmake make automake gcc gcc-c++ kernel-devel clang git pkg-config autoconf automake
+          dnf install -y bpftool ca-certificates cmake make automake gcc gcc-c++ kernel-devel clang git pkg-config autoconf automake libbpf-devel elfutils-libelf-devel

      - name: Checkout
        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
@@ -45,197 +42,98 @@ jobs:
          cmake --build skeleton-build --target ProbeSkeleton -j6

      - name: Upload skeleton
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: bpf_probe_${{ inputs.arch }}.skel.h
          path: skeleton-build/skel_dir/bpf_probe.skel.h
          retention-days: 1

-  build-packages-release:
+  build-packages:
    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
    needs: [build-modern-bpf-skeleton]
+    container: centos:7
    steps:
      # Always install deps before invoking checkout action, to properly perform a full clone.
-      - name: Install build deps
+      - name: Install build dependencies
        run: |
-          sudo apt update && sudo apt install -y --no-install-recommends ca-certificates cmake curl wget build-essential git pkg-config autoconf automake libtool m4 rpm
+          yum -y install centos-release-scl
+          yum -y install devtoolset-9-gcc devtoolset-9-gcc-c++
+          source /opt/rh/devtoolset-9/enable
+          yum install -y wget git make m4 rpm-build elfutils-libelf-devel perl-IPC-Cmd devtoolset-9-libasan-devel devtoolset-9-libubsan-devel

      - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        # It is not possible to upgrade the checkout action to versions >= v4.0.0 because of incompatibilities with centos 7's libc.
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

      - name: Download skeleton
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: bpf_probe_${{ inputs.arch }}.skel.h
          path: /tmp

-      - name: Install zig
-        if: inputs.sanitizers == false
-        uses: falcosecurity/libs/.github/actions/install-zig@master
+      - name: Install updated cmake
+        run: |
+          curl -L https://github.com/Kitware/CMake/releases/download/v3.22.5/cmake-3.22.5-linux-$(uname -m).tar.gz \
+            | tar --directory=/usr --strip-components=1 -xzp

      - name: Prepare project
        run: |
+          source /opt/rh/devtoolset-9/enable
          cmake -B build -S . \
-              -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+              -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \
              -DUSE_BUNDLED_DEPS=On \
              -DFALCO_ETC_DIR=/etc/falco \
              -DMODERN_BPF_SKEL_DIR=/tmp \
              -DBUILD_DRIVER=Off \
              -DBUILD_BPF=Off \
-              -DUSE_JEMALLOC=ON \
+              -DUSE_ASAN=${{ (inputs.sanitizers == true && inputs.arch == 'x86_64' && 'ON') || 'OFF' }} \
              -DFALCO_VERSION=${{ inputs.version }}

      - name: Build project
        run: |
+          source /opt/rh/devtoolset-9/enable
          cmake --build build --target falco -j6

      - name: Build packages
        run: |
+          source /opt/rh/devtoolset-9/enable
          cmake --build build --target package

      - name: Upload Falco tar.gz package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
-          name: falco-${{ inputs.version }}-${{ inputs.arch }}.tar.gz
+          name: falco-${{ inputs.version }}-${{ inputs.arch }}${{ inputs.sanitizers == true && '-sanitizers' || '' }}.tar.gz
          path: |
            ${{ github.workspace }}/build/falco-*.tar.gz

      - name: Upload Falco deb package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
-          name: falco-${{ inputs.version }}-${{ inputs.arch }}.deb
+          name: falco-${{ inputs.version }}-${{ inputs.arch }}${{ inputs.sanitizers == true && '-sanitizers' || '' }}.deb
          path: |
            ${{ github.workspace }}/build/falco-*.deb

      - name: Upload Falco rpm package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
-          name: falco-${{ inputs.version }}-${{ inputs.arch }}.rpm
+          name: falco-${{ inputs.version }}-${{ inputs.arch }}${{ inputs.sanitizers == true && '-sanitizers' || '' }}.rpm
          path: |
            ${{ github.workspace }}/build/falco-*.rpm

-      - name: Upload Falco debug symbols
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: falco-${{ inputs.version }}-${{ inputs.arch }}.debug
-          path: |
-            ${{ github.workspace }}/build/userspace/falco/falco.debug
-
-  build-packages-debug:
-    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-22.04' }}
-    if: ${{ inputs.enable_debug == true }}
-    needs: [build-modern-bpf-skeleton]
-    steps:
-      # Always install deps before invoking checkout action, to properly perform a full clone.
-      - name: Install build deps
-        run: |
-          sudo apt update && sudo apt install -y --no-install-recommends ca-certificates cmake curl wget build-essential git pkg-config autoconf automake libtool m4 rpm
-
-      - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
-      - name: Download skeleton
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: bpf_probe_${{ inputs.arch }}.skel.h
-          path: /tmp
-
-      - name: Install zig
-        if: inputs.sanitizers == false
-        uses: falcosecurity/libs/.github/actions/install-zig@master
-
-      - name: Prepare project
-        run: |
-          cmake -B build -S . \
-              -DCMAKE_BUILD_TYPE=Debug \
-              -DUSE_BUNDLED_DEPS=On \
-              -DFALCO_ETC_DIR=/etc/falco \
-              -DMODERN_BPF_SKEL_DIR=/tmp \
-              -DBUILD_DRIVER=Off \
-              -DBUILD_BPF=Off \
-              -DUSE_JEMALLOC=On \
-              -DFALCO_VERSION=${{ inputs.version }}
-
-      - name: Build project
-        run: |
-          cmake --build build --target falco -j6
-
-      - name: Build packages
-        run: |
-          cmake --build build --target package
-
-      - name: Upload Falco tar.gz package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: falco-${{ inputs.version }}-${{ inputs.arch }}-debug.tar.gz
-          path: |
-            ${{ github.workspace }}/build/falco-*.tar.gz
-
-  build-packages-sanitizers:
-    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
-    if: ${{ inputs.enable_sanitizers == true }}
-    needs: [build-modern-bpf-skeleton]
-    steps:
-      # Always install deps before invoking checkout action, to properly perform a full clone.
-      - name: Install build deps
-        run: |
-          sudo apt update && sudo apt install -y --no-install-recommends ca-certificates cmake curl wget build-essential git pkg-config autoconf automake libtool m4 rpm
-
-      - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
-      - name: Download skeleton
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: bpf_probe_${{ inputs.arch }}.skel.h
-          path: /tmp
-
-      - name: Prepare project
-        # Jemalloc and ASAN don't play very well together.
-        run: |
-          cmake -B build -S . \
-              -DCMAKE_BUILD_TYPE=Debug \
-              -DUSE_BUNDLED_DEPS=On \
-              -DFALCO_ETC_DIR=/etc/falco \
-              -DMODERN_BPF_SKEL_DIR=/tmp \
-              -DBUILD_DRIVER=Off \
-              -DBUILD_BPF=Off \
-              -DUSE_JEMALLOC=Off \
-              -DUSE_ASAN=On \
-              -DFALCO_VERSION=${{ inputs.version }}
-
-      - name: Build project
-        run: |
-          cmake --build build --target falco -j6
-
-      - name: Build packages
-        run: |
-          cmake --build build --target package
-
-      - name: Upload Falco tar.gz package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        with:
-          name: falco-${{ inputs.version }}-${{ inputs.arch }}-sanitizers.tar.gz
-          path: |
-            ${{ github.workspace }}/build/falco-*.tar.gz
-
+  # The musl build job is currently disabled because we link libelf dynamically and it is
+  # not possible to dynamically link with musl
  build-musl-package:
    # x86_64 only for now
-    if: ${{ inputs.arch == 'x86_64' }}
+    # if: ${{ inputs.arch == 'x86_64' }}
+    if: false
    runs-on: ubuntu-latest
    container: alpine:3.17
    steps:
      # Always install deps before invoking checkout action, to properly perform a full clone.
      - name: Install build dependencies
        run: |
-          apk add g++ gcc cmake make git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils clang llvm
-          git clone https://github.com/libbpf/bpftool.git --branch v7.3.0 --single-branch
-          cd bpftool
-          git submodule update --init
-          cd src && make install
+          apk add g++ gcc cmake make git bash perl linux-headers autoconf automake m4 libtool elfutils-dev libelf-static patch binutils bpftool clang

      - name: Checkout
        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
@@ -245,14 +143,10 @@ jobs:
      - name: Prepare project
        run: |
          cmake -B build -S . \
-                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \
                -DCPACK_GENERATOR=TGZ \
                -DBUILD_BPF=Off -DBUILD_DRIVER=Off \
-                -DUSE_JEMALLOC=On \
-                -DUSE_BUNDLED_DEPS=On \
-                -DMUSL_OPTIMIZED_BUILD=On \
-                -DFALCO_ETC_DIR=/etc/falco \
-                -DFALCO_VERSION=${{ inputs.version }}
+                -DUSE_BUNDLED_DEPS=On -DUSE_BUNDLED_LIBELF=Off -DBUILD_LIBSCAP_MODERN_BPF=ON -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco -DFALCO_VERSION=${{ inputs.version }}

      - name: Build project
        run: |
@@ -268,7 +162,7 @@ jobs:
          mv falco-${{ inputs.version }}-x86_64.tar.gz falco-${{ inputs.version }}-static-x86_64.tar.gz

      - name: Upload Falco static package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: falco-${{ inputs.version }}-static-x86_64.tar.gz
          path: |
@@ -276,7 +170,7 @@ jobs:

  build-wasm-package:
    if: ${{ inputs.arch == 'x86_64' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
      # Always install deps before invoking checkout action, to properly perform a full clone.
      - name: Install build dependencies
@@ -297,7 +191,10 @@ jobs:
      - name: Prepare project
        run: |
          emcmake cmake -B build -S . \
-            -DCMAKE_BUILD_TYPE=Release \
+            -DBUILD_BPF=Off \
+            -DBUILD_DRIVER=Off \
+            -DBUILD_FALCO_MODERN_BPF=Off \
+            -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} \
            -DUSE_BUNDLED_DEPS=On \
            -DFALCO_ETC_DIR=/etc/falco \
            -DBUILD_FALCO_UNIT_TESTS=On \
@@ -319,7 +216,7 @@ jobs:
          emmake make -j6 package

      - name: Upload Falco WASM package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: falco-${{ inputs.version }}-wasm.tar.gz
          path: |
@@ -337,28 +234,28 @@ jobs:
      # NOTE: Backslash doesn't work as line continuation on Windows.
      - name: Prepare project
        run: |
-          cmake -B build -S . -DCMAKE_BUILD_TYPE=Release -DMINIMAL_BUILD=On -DUSE_BUNDLED_DEPS=On -DBUILD_FALCO_UNIT_TESTS=On -DFALCO_VERSION=${{ inputs.version }}
+          cmake -B build -S . -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DMINIMAL_BUILD=On -DUSE_BUNDLED_DEPS=On -DBUILD_FALCO_UNIT_TESTS=On -DFALCO_VERSION=${{ inputs.version }}

      - name: Build project
        run: |
-          cmake --build build --target package --config Release
+          cmake --build build --target package --config ${{ inputs.build_type }}

      - name: Run unit Tests
        run: |
-          build/unit_tests/Release/falco_unit_tests.exe
+          build/unit_tests/${{ inputs.build_type }}/falco_unit_tests.exe

      - name: Upload Falco win32 installer
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
-          name: falco-installer-Release-win32.exe
+          name: falco-installer-${{ inputs.version }}-win32.exe
          path: build/falco-*.exe

      - name: Upload Falco win32 package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
-          name: falco-Release-win32.exe
+          name: falco-${{ inputs.version }}-win32.exe
          path: |
-            ${{ github.workspace }}/build/userspace/falco/Release/falco.exe
+            ${{ github.workspace }}/build/userspace/falco/${{ inputs.build_type }}/falco.exe

  build-macos-package:
    if: ${{ inputs.arch == 'x86_64' }}
@@ -383,7 +280,7 @@ jobs:
          sudo build/unit_tests/falco_unit_tests

      - name: Upload Falco macos package
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: falco-${{ inputs.version }}-macos
          path: |
--- a/.github/workflows/reusable_fetch_version.yaml
+++ b/.github/workflows/reusable_fetch_version.yaml
@@ -6,9 +6,6 @@ on:
        description: "Falco version"
        value: ${{ jobs.fetch-version.outputs.version }}

-permissions:  
-  contents: read
-
 jobs:
  # We need to use an ubuntu-latest to fetch Falco version because
  # Falco version is computed by some cmake scripts that do git sorceries
--- a/.github/workflows/reusable_publish_docker.yaml
+++ b/.github/workflows/reusable_publish_docker.yaml
@@ -18,55 +18,44 @@ on:
        default: false

 permissions:
+  id-token: write
  contents: read
-
+  
 jobs:
  publish-docker:
    runs-on: ubuntu-latest
-
-    permissions:
-      attestations: write
-      id-token: write
-      contents: read
-
    steps:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
-
-      - name: Download x86_64 images tarballs
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+    
+      - name: Download images tarballs
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
-          name: falco-images-x86_64
+          name: falco-images
          path: /tmp/falco-images
-
-      - name: Download aarch64 images tarballs
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
-        with:
-          name: falco-images-aarch64
-          path: /tmp/falco-images
-
+      
      - name: Load all images
        run: |
          for img in /tmp/falco-images/falco-*.tar; do docker load --input $img; done
-
+    
      - name: Login to Docker Hub
        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
        with:
          username: ${{ secrets.DOCKERHUB_USER }}
          password: ${{ secrets.DOCKERHUB_SECRET }}
-
+      
      - name: Configure AWS credentials
        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
        with:
          role-to-assume: "arn:aws:iam::292999226676:role/github_actions-falco-ecr"
          aws-region: us-east-1 # The region must be set to us-east-1 in order to access ECR Public.
-
+          
      - name: Login to Amazon ECR
        id: login-ecr-public
        uses: aws-actions/amazon-ecr-login@2f9f10ea3fa2eed41ac443fee8bfbd059af2d0a4 # v1.6.0
        with:
-          registry-type: public
-
+          registry-type: public    
+      
      - name: Setup Crane
        uses: imjasonh/setup-crane@00c9e93efa4e1138c9a7a5c594acd6c75a2fbf0c # v0.3
        with:
@@ -75,29 +64,42 @@ jobs:
      # We're pushing the arch-specific manifests to Docker Hub so that we'll be able to easily create the index/multiarch later
      - name: Push arch-specific images to Docker Hub
        run: |
+          docker push docker.io/falcosecurity/falco-no-driver:aarch64-${{ inputs.tag }}
+          docker push docker.io/falcosecurity/falco-no-driver:x86_64-${{ inputs.tag }}
+          docker push docker.io/falcosecurity/falco-distroless:aarch64-${{ inputs.tag }}
+          docker push docker.io/falcosecurity/falco-distroless:x86_64-${{ inputs.tag }}
          docker push docker.io/falcosecurity/falco:aarch64-${{ inputs.tag }}
          docker push docker.io/falcosecurity/falco:x86_64-${{ inputs.tag }}
-          docker push docker.io/falcosecurity/falco:aarch64-${{ inputs.tag }}-debian
-          docker push docker.io/falcosecurity/falco:x86_64-${{ inputs.tag }}-debian
          docker push docker.io/falcosecurity/falco-driver-loader:aarch64-${{ inputs.tag }}
          docker push docker.io/falcosecurity/falco-driver-loader:x86_64-${{ inputs.tag }}
-          docker push docker.io/falcosecurity/falco-driver-loader:aarch64-${{ inputs.tag }}-buster
-          docker push docker.io/falcosecurity/falco-driver-loader:x86_64-${{ inputs.tag }}-buster
+          docker push docker.io/falcosecurity/falco-driver-loader-legacy:aarch64-${{ inputs.tag }}
+          docker push docker.io/falcosecurity/falco-driver-loader-legacy:x86_64-${{ inputs.tag }}

-      - name: Create Falco manifest on Docker Hub
+      - name: Create no-driver manifest on Docker Hub
+        uses: Noelware/docker-manifest-action@8e337e3cb9656abfcf20146b99706fd88716e942 # v0.4.0
+        with:
+          inputs: docker.io/falcosecurity/falco-no-driver:${{ inputs.tag }}
+          images: docker.io/falcosecurity/falco-no-driver:aarch64-${{ inputs.tag }},docker.io/falcosecurity/falco-no-driver:x86_64-${{ inputs.tag }}
+          push: true
+
+      - name: Create distroless manifest on Docker Hub
+        uses: Noelware/docker-manifest-action@8e337e3cb9656abfcf20146b99706fd88716e942 # v0.4.0
+        with:
+          inputs: docker.io/falcosecurity/falco-distroless:${{ inputs.tag }}
+          images: docker.io/falcosecurity/falco-distroless:aarch64-${{ inputs.tag }},docker.io/falcosecurity/falco-distroless:x86_64-${{ inputs.tag }}
+          push: true
+          
+      - name: Tag slim manifest on Docker Hub
+        run: |
+          crane copy docker.io/falcosecurity/falco-no-driver:${{ inputs.tag }} docker.io/falcosecurity/falco:${{ inputs.tag }}-slim
+
+      - name: Create falco manifest on Docker Hub
        uses: Noelware/docker-manifest-action@8e337e3cb9656abfcf20146b99706fd88716e942 # v0.4.0
        with:
          inputs: docker.io/falcosecurity/falco:${{ inputs.tag }}
          images: docker.io/falcosecurity/falco:aarch64-${{ inputs.tag }},docker.io/falcosecurity/falco:x86_64-${{ inputs.tag }}
          push: true
-
-      - name: Create falco-debian manifest on Docker Hub
-        uses: Noelware/docker-manifest-action@8e337e3cb9656abfcf20146b99706fd88716e942 # v0.4.0
-        with:
-          inputs: docker.io/falcosecurity/falco:${{ inputs.tag }}-debian
-          images: docker.io/falcosecurity/falco:aarch64-${{ inputs.tag }}-debian,docker.io/falcosecurity/falco:x86_64-${{ inputs.tag }}-debian
-          push: true
-
+          
      - name: Create falco-driver-loader manifest on Docker Hub
        uses: Noelware/docker-manifest-action@8e337e3cb9656abfcf20146b99706fd88716e942 # v0.4.0
        with:
@@ -105,41 +107,48 @@ jobs:
          images: docker.io/falcosecurity/falco-driver-loader:aarch64-${{ inputs.tag }},docker.io/falcosecurity/falco-driver-loader:x86_64-${{ inputs.tag }}
          push: true

-      - name: Create falco-driver-loader-buster manifest on Docker Hub
+      - name: Create falco-driver-loader-legacy manifest on Docker Hub
        uses: Noelware/docker-manifest-action@8e337e3cb9656abfcf20146b99706fd88716e942 # v0.4.0
        with:
-          inputs: docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }}-buster
-          images: docker.io/falcosecurity/falco-driver-loader:aarch64-${{ inputs.tag }}-buster,docker.io/falcosecurity/falco-driver-loader:x86_64-${{ inputs.tag }}-buster
+          inputs: docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.tag }}
+          images: docker.io/falcosecurity/falco-driver-loader-legacy:aarch64-${{ inputs.tag }},docker.io/falcosecurity/falco-driver-loader-legacy:x86_64-${{ inputs.tag }}
          push: true

      - name: Get Digests for images
        id: digests
        # We could probably use the docker-manifest-action output instead of recomputing those with crane
        run: |
+          echo "falco-no-driver=$(crane digest docker.io/falcosecurity/falco-no-driver:${{ inputs.tag }})" >> $GITHUB_OUTPUT
+          echo "falco-distroless=$(crane digest docker.io/falcosecurity/falco-distroless:${{ inputs.tag }})" >> $GITHUB_OUTPUT
          echo "falco=$(crane digest docker.io/falcosecurity/falco:${{ inputs.tag }})" >> $GITHUB_OUTPUT
-          echo "falco-debian=$(crane digest docker.io/falcosecurity/falco:${{ inputs.tag }}-debian)" >> $GITHUB_OUTPUT
          echo "falco-driver-loader=$(crane digest docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }})" >> $GITHUB_OUTPUT
-          echo "falco-driver-loader-buster=$(crane digest docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }}-buster)" >> $GITHUB_OUTPUT
+          echo "falco-driver-loader-legacy=$(crane digest docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.tag }})" >> $GITHUB_OUTPUT

      - name: Publish images to ECR
        run: |
+          crane copy docker.io/falcosecurity/falco-no-driver:${{ inputs.tag }} public.ecr.aws/falcosecurity/falco-no-driver:${{ inputs.tag }}
+          crane copy docker.io/falcosecurity/falco-distroless:${{ inputs.tag }} public.ecr.aws/falcosecurity/falco-distroless:${{ inputs.tag }}
          crane copy docker.io/falcosecurity/falco:${{ inputs.tag }} public.ecr.aws/falcosecurity/falco:${{ inputs.tag }}
-          crane copy docker.io/falcosecurity/falco:${{ inputs.tag }}-debian public.ecr.aws/falcosecurity/falco:${{ inputs.tag }}-debian
          crane copy docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }} public.ecr.aws/falcosecurity/falco-driver-loader:${{ inputs.tag }}
-          crane copy docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }}-buster public.ecr.aws/falcosecurity/falco-driver-loader:${{ inputs.tag }}-buster
+          crane copy docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.tag }} public.ecr.aws/falcosecurity/falco-driver-loader-legacy:${{ inputs.tag }}
+          crane copy public.ecr.aws/falcosecurity/falco-no-driver:${{ inputs.tag }} public.ecr.aws/falcosecurity/falco:${{ inputs.tag }}-slim

      - name: Tag latest on Docker Hub and ECR
        if: inputs.is_latest
        run: |
+          crane tag docker.io/falcosecurity/falco-no-driver:${{ inputs.tag }} latest
+          crane tag docker.io/falcosecurity/falco-distroless:${{ inputs.tag }} latest
          crane tag docker.io/falcosecurity/falco:${{ inputs.tag }} latest
-          crane tag docker.io/falcosecurity/falco:${{ inputs.tag }}-debian latest-debian
          crane tag docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }} latest
-          crane tag docker.io/falcosecurity/falco-driver-loader:${{ inputs.tag }}-buster latest-buster
+          crane tag docker.io/falcosecurity/falco-driver-loader-legacy:${{ inputs.tag }} latest
+          crane tag docker.io/falcosecurity/falco:${{ inputs.tag }}-slim latest-slim

+          crane tag public.ecr.aws/falcosecurity/falco-no-driver:${{ inputs.tag }} latest
+          crane tag public.ecr.aws/falcosecurity/falco-distroless:${{ inputs.tag }} latest
          crane tag public.ecr.aws/falcosecurity/falco:${{ inputs.tag }} latest
-          crane tag public.ecr.aws/falcosecurity/falco:${{ inputs.tag }}-debian latest-debian
          crane tag public.ecr.aws/falcosecurity/falco-driver-loader:${{ inputs.tag }} latest
-          crane tag public.ecr.aws/falcosecurity/falco-driver-loader:${{ inputs.tag }}-buster latest-buster
+          crane tag public.ecr.aws/falcosecurity/falco-driver-loader-legacy:${{ inputs.tag }} latest
+          crane tag public.ecr.aws/falcosecurity/falco:${{ inputs.tag }}-slim latest-slim

      - name: Setup Cosign
        if: inputs.sign
@@ -151,24 +160,14 @@ jobs:
          COSIGN_EXPERIMENTAL: "true"
          COSIGN_YES: "true"
        run: |
-          cosign sign docker.io/falcosecurity/falco:latest@${{ steps.digests.outputs.falco }}
-          cosign sign docker.io/falcosecurity/falco:latest-debian@${{ steps.digests.outputs.falco-debian }}
-          cosign sign docker.io/falcosecurity/falco-driver-loader:latest@${{ steps.digests.outputs.falco-driver-loader }}
-          cosign sign docker.io/falcosecurity/falco-driver-loader:latest-buster@${{ steps.digests.outputs.falco-driver-loader-buster }}
+          cosign sign docker.io/falcosecurity/falco-no-driver@${{ steps.digests.outputs.falco-no-driver }}
+          cosign sign docker.io/falcosecurity/falco-distroless@${{ steps.digests.outputs.falco-distroless }}
+          cosign sign docker.io/falcosecurity/falco@${{ steps.digests.outputs.falco }}
+          cosign sign docker.io/falcosecurity/falco-driver-loader@${{ steps.digests.outputs.falco-driver-loader }}
+          cosign sign docker.io/falcosecurity/falco-driver-loader-legacy@${{ steps.digests.outputs.falco-driver-loader-legacy }}

-          cosign sign public.ecr.aws/falcosecurity/falco:latest@${{ steps.digests.outputs.falco }}
-          cosign sign public.ecr.aws/falcosecurity/falco:latest-debian@${{ steps.digests.outputs.falco-debian }}
-          cosign sign public.ecr.aws/falcosecurity/falco-driver-loader:latest@${{ steps.digests.outputs.falco-driver-loader }}
-          cosign sign public.ecr.aws/falcosecurity/falco-driver-loader:latest-buster@${{ steps.digests.outputs.falco-driver-loader-buster }}
-
-      - uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d # v1.1.2
-        with:
-          subject-name: docker.io/falcosecurity/falco
-          subject-digest: ${{ steps.digests.outputs.falco }}
-          push-to-registry: true
-
-      - uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d # v1.1.2
-        with:
-          subject-name: docker.io/falcosecurity/falco-driver-loader
-          subject-digest: ${{ steps.digests.outputs.falco-driver-loader }}
-          push-to-registry: true
+          cosign sign public.ecr.aws/falcosecurity/falco-no-driver@${{ steps.digests.outputs.falco-no-driver }}
+          cosign sign public.ecr.aws/falcosecurity/falco-distroless@${{ steps.digests.outputs.falco-distroless }}
+          cosign sign public.ecr.aws/falcosecurity/falco@${{ steps.digests.outputs.falco }}
+          cosign sign public.ecr.aws/falcosecurity/falco-driver-loader@${{ steps.digests.outputs.falco-driver-loader }}
+          cosign sign public.ecr.aws/falcosecurity/falco-driver-loader-legacy@${{ steps.digests.outputs.falco-driver-loader-legacy }}
--- a/.github/workflows/reusable_publish_packages.yaml
+++ b/.github/workflows/reusable_publish_packages.yaml
@@ -42,37 +42,40 @@ jobs:
          aws-region: ${{ env.AWS_S3_REGION }}    
          
      - name: Download RPM x86_64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-x86_64.rpm
          path: /tmp/falco-build-rpm

      - name: Download RPM aarch64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-aarch64.rpm
          path: /tmp/falco-build-rpm

      - name: Download binary x86_64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-x86_64.tar.gz
          path: /tmp/falco-build-bin

      - name: Download binary aarch64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-aarch64.tar.gz
          path: /tmp/falco-build-bin

+      # The musl build job is currently disabled because we link libelf dynamically and it is
+      # not possible to dynamically link with musl
      - name: Download static binary x86_64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        if: false
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-static-x86_64.tar.gz
          path: /tmp/falco-build-bin-static

      - name: Download WASM package
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-wasm.tar.gz
          path: /tmp/falco-wasm
@@ -85,7 +88,7 @@ jobs:
      - name: Sign rpms
        run: |
          rpmsign --define '_gpg_name Falcosecurity Package Signing' --addsign /tmp/falco-build-rpm/falco-*.rpm
-          rpm -qp --qf '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{(none)}|}|\n' /tmp/falco-build-rpm/falco-*.rpm
+          rpm --qf %{SIGPGP:pgpsig} -qp /tmp/falco-build-rpm/falco-*.rpm | grep SHA256

      - name: Publish wasm
        run: |
@@ -99,8 +102,11 @@ jobs:
        run: |
          ./scripts/publish-bin -f /tmp/falco-build-bin/falco-${{ inputs.version }}-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64
          ./scripts/publish-bin -f /tmp/falco-build-bin/falco-${{ inputs.version }}-aarch64.tar.gz -r bin${{ inputs.bucket_suffix }} -a aarch64
-          
+
+      # The musl build job is currently disabled because we link libelf dynamically and it is
+      # not possible to dynamically link with musl
      - name: Publish static
+        if: false
        run: |
          ./scripts/publish-bin -f /tmp/falco-build-bin-static/falco-${{ inputs.version }}-static-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64

@@ -125,13 +131,13 @@ jobs:
          aws-region: ${{ env.AWS_S3_REGION }}     
      
      - name: Download deb x86_64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-x86_64.deb
          path: /tmp/falco-build-deb

      - name: Download deb aarch64
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}-aarch64.deb
          path: /tmp/falco-build-deb
--- a/.github/workflows/reusable_test_packages.yaml
+++ b/.github/workflows/reusable_test_packages.yaml
@@ -21,16 +21,13 @@ on:
        default: false
        type: boolean

-permissions:  
-  contents: read
-  
 jobs:
  test-packages:
    # See https://github.com/actions/runner/issues/409#issuecomment-1158849936
-    runs-on: ${{ (inputs.arch == 'aarch64' && 'ubuntu-22.04-arm') || 'ubuntu-latest' }}
+    runs-on: ${{ (inputs.arch == 'aarch64' && 'actuated-arm64-8cpu-16gb') || 'ubuntu-latest' }}
    steps:
      - name: Download binary
-        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
        with:
          name: falco-${{ inputs.version }}${{ inputs.static && '-static' || '' }}-${{ inputs.arch }}${{ inputs.sanitizers == true && '-sanitizers' || '' }}.tar.gz
      
@@ -43,6 +40,7 @@ jobs:
     
      # We only run driver loader tests on x86_64
      - name: Install kernel headers for falco-driver-loader tests
+        if: ${{ inputs.arch == 'x86_64' }}
        run: |
          sudo apt update -y
          sudo apt install -y --no-install-recommends linux-headers-$(uname -r)
@@ -56,13 +54,11 @@ jobs:
      - name: Run tests
        env:
          LSAN_OPTIONS: "intercept_tls_get_addr=0"
-        uses: falcosecurity/testing@main 
+        uses: falcosecurity/testing@main    
        with:
          test-falco: 'true'
          test-falcoctl: 'true'
          test-k8saudit: 'true'
-          test-dummy: 'true'
          static: ${{ inputs.static && 'true' || 'false' }}
-          test-drivers: 'true'
+          test-drivers: ${{ inputs.arch == 'x86_64' && 'true' || 'false' }}
          show-all: 'true'
-          report-name-suffix: ${{ inputs.static && '-static' || '' }}${{ inputs.sanitizers && '-sanitizers' || '' }}
--- a/.github/workflows/scorecard.yaml
+++ b/.github/workflows/scorecard.yaml
@@ -65,7 +65,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
        with:
          name: SARIF file
          path: results.sarif
--- a/.github/workflows/staticanalysis.yaml
+++ b/.github/workflows/staticanalysis.yaml
@@ -1,9 +1,6 @@
 name: StaticAnalysis
 on:
  pull_request:
-permissions:  
-  contents: read
-
 jobs:
  staticanalysis:
    runs-on: ubuntu-22.04
@@ -29,7 +26,7 @@ jobs:
          cmake --build build -j4 --target cppcheck_htmlreport

      - name: Upload reports ⬆️
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
        with:
          name: static-analysis-reports
          path: ./build/static-analysis-reports
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,23 +0,0 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-fail_fast: false
-minimum_pre_commit_version: '0'
-repos:
- repo: https://github.com/cheshirekow/cmake-format-precommit
-  rev: v0.6.13
-  hooks:
-  - id: cmake-format
-    stages: [commit]
- repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v18.1.8
-  hooks:
-  - id: clang-format
-    types_or: [c++, c]
-    stages: [commit]
- repo: local
-  hooks:
-  - id: dco-hook-local
-    name: DCO hook local
-    entry: ./tools/local_hooks/dco-pre-commit-msg.sh
-    language: script
-    stages: [prepare-commit-msg]
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -74,8 +74,6 @@ This is a list of production adopters of Falco (in alphabetical order):

 * [Thought Machine](https://www.thoughtmachine.net) Thought Machine builds Vault Core and Vault Payments: cloud-native core and payments technology enabling banks and fintechs to remain competitive and flourish into the future. Vault Core and Vault Payments are the foundation layer of a bank's technology stack. They can run any bank, any product, and any payment set. Thought Machine uses Falco to perform cloud agnostic real time detections of suspicious container behaviour.

-* [Tulip Retail](https://tulip.com) Tulip Retail uses Falco to monitor container activity in our environments. It's numerous integration points, easy deployment and easily customizable rules were the main reasons we chose Falco.
-
 * [Vinted](https://vinted.com/) Vinted uses Falco to continuously monitor container activities, identifying security threats, and ensuring compliance. The container-native approach, rule-based real-time threat detection, community support, extensibility, and compliance capabilities are the main factors why we chose it to enhance Vinted Kubernetes security. Falco Sidekick is used to send critical and warning severity alerts to our incident management solution (RTIR).

 * [Xenit AB](https://xenit.se/contact/) Xenit is a growth company with services within cloud and digital transformation. We provide an open-source Kubernetes framework that we leverage to help our customers get their applications to production as quickly and as securely as possible. We use Falco's detection capabilities to identify anomalous behaviour within our clusters in both Azure and AWS.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,176 +1,5 @@
 # Change Log

-## v0.39.2
-
-Released on 2024-11-21
-
-### Minor Changes
-
-* update(cmake): bumped falcoctl to v0.10.1. [[#3408](https://github.com/falcosecurity/falco/pull/3408)] - [@FedeDP](https://github.com/FedeDP)
-* update(cmake): bump yaml-cpp to latest master. [[#3394](https://github.com/falcosecurity/falco/pull/3394)] - [@FedeDP](https://github.com/FedeDP)
-
-### Non user-facing changes
-
-* update(ci): use arm64 CNCF runners for GH actions [[#3386](https://github.com/falcosecurity/falco/pull/3386)] - [@LucaGuerra](https://github.com/LucaGuerra)
-
-### Statistics
-
-|   MERGED PRS    | NUMBER |
-|-----------------|--------|
-| Not user-facing |      1 |
-| Release note    |      2 |
-| Total           |      3 |
-
-
-## v0.39.1
-
-Released on 2024-10-09
-
-### Bug Fixes
-
-* fix(engine): allow null init_config for plugin info [[#3372](https://github.com/falcosecurity/falco/pull/3372)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* fix(engine): fix parsing issues in -o key={object} when the object definition contains a comma [[#3363](https://github.com/falcosecurity/falco/pull/3363)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* fix(userspace/falco): fix event set selection for plugin with parsing capability [[#3368](https://github.com/falcosecurity/falco/pull/3368)] - [@FedeDP](https://github.com/FedeDP)
-
-### Statistics
-
-|   MERGED PRS    | NUMBER |
-|-----------------|--------|
-| Not user-facing |      0 |
-| Release note    |      3 |
-| Total           |      3 |
-
-
-## v0.39.0
-
-Released on 2024-10-01
-
-### Breaking Changes :warning:
-
-* fix(falco_metrics)!: split tags label into multiple `tag_`-prefixed labels [[#3337](https://github.com/falcosecurity/falco/pull/3337)] - [@ekoops](https://github.com/ekoops)
-* fix(falco_metrics)!: use full name for configs and rules files [[#3337](https://github.com/falcosecurity/falco/pull/3337)] - [@ekoops](https://github.com/ekoops)
-* update(falco_metrics)!: rearrange `n_evts_cpu` and `n_drops_cpu` Prometheus metrics to follow best practices [[#3319](https://github.com/falcosecurity/falco/pull/3319)] - [@incertum](https://github.com/incertum)
-* cleanup(userspace/falco)!: drop deprecated -t,-T,-D options. [[#3311](https://github.com/falcosecurity/falco/pull/3311)] - [@FedeDP](https://github.com/FedeDP)
-
-
-### Major Changes
-
-* feat(stats): add host_netinfo networking information stats family [[#3344](https://github.com/falcosecurity/falco/pull/3344)] - [@ekoops](https://github.com/ekoops)
-* new(falco): add json_include_message_property to have a message field without date and priority [[#3314](https://github.com/falcosecurity/falco/pull/3314)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* new(userspace/falco,userspace/engine): rule json schema validation [[#3313](https://github.com/falcosecurity/falco/pull/3313)] - [@FedeDP](https://github.com/FedeDP)
-* new(falco): introduce append_output configuration [[#3308](https://github.com/falcosecurity/falco/pull/3308)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* new(userspace/falco): added --config-schema action to print config schema [[#3312](https://github.com/falcosecurity/falco/pull/3312)] - [@FedeDP](https://github.com/FedeDP)
-* new(falco): enable CLI options with -o key={object} [[#3310](https://github.com/falcosecurity/falco/pull/3310)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* new(config): add `container_engines` config to falco.yaml [[#3266](https://github.com/falcosecurity/falco/pull/3266)] - [@incertum](https://github.com/incertum)
-* new(metrics): add host_ifinfo metric [[#3253](https://github.com/falcosecurity/falco/pull/3253)] - [@incertum](https://github.com/incertum)
-* new(userspace,unit_tests): validate configs against schema [[#3302](https://github.com/falcosecurity/falco/pull/3302)] - [@FedeDP](https://github.com/FedeDP)
-
-
-### Minor Changes
-
-* update(falco): upgrade libs to 0.18.1 [[#3349](https://github.com/falcosecurity/falco/pull/3349)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* update(systemd): users can refer to systemd falco services with a consistent unique alias falco.service [[#3332](https://github.com/falcosecurity/falco/pull/3332)] - [@ekoops](https://github.com/ekoops)
-* update(cmake): bump libs to 0.18.0 and driver to 7.3.0+driver. [[#3330](https://github.com/falcosecurity/falco/pull/3330)] - [@FedeDP](https://github.com/FedeDP)
-* chore(userspace/falco): deprecate `cri` related CLI options. [[#3329](https://github.com/falcosecurity/falco/pull/3329)] - [@FedeDP](https://github.com/FedeDP)
-* update(cmake): bumped falcoctl to v0.10.0 and rules to 3.2.0 [[#3327](https://github.com/falcosecurity/falco/pull/3327)] - [@FedeDP](https://github.com/FedeDP)
-* update(falco_metrics): change prometheus rules metric naming [[#3324](https://github.com/falcosecurity/falco/pull/3324)] - [@incertum](https://github.com/incertum)
-
-
-### Bug Fixes
-
-* fix(falco): allow disable_cri_async from both CLI and config [[#3353](https://github.com/falcosecurity/falco/pull/3353)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* fix(engine): sync outputs before printing stats at shutdown [[#3338](https://github.com/falcosecurity/falco/pull/3338)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* fix(falco): allow plugin init_config map in json schema [[#3335](https://github.com/falcosecurity/falco/pull/3335)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* fix(userspace/falco): properly account for plugin with CAP_PARSING when computing interesting sc set [[#3334](https://github.com/falcosecurity/falco/pull/3334)] - [@FedeDP](https://github.com/FedeDP)
-
-
-
-### Non user-facing changes
-
-* feat(cmake): add conditional builds for falcoctl and rules paths [[#3305](https://github.com/falcosecurity/falco/pull/3305)] - [@tembleking](https://github.com/tembleking)
-* cleanup(falco): ignore lint commit [[#3354](https://github.com/falcosecurity/falco/pull/3354)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* chore(falco): apply code formatting [[#3350](https://github.com/falcosecurity/falco/pull/3350)] - [@poiana](https://github.com/poiana)
-* chore: ignore_some_files for clang format [[#3351](https://github.com/falcosecurity/falco/pull/3351)] - [@Andreagit97](https://github.com/Andreagit97)
-* sync: release 0.39.x [[#3340](https://github.com/falcosecurity/falco/pull/3340)] - [@FedeDP](https://github.com/FedeDP)
-* fix(userspace/engine): improve rule json schema to account for `source` and `required_plugin_versions` [[#3328](https://github.com/falcosecurity/falco/pull/3328)] - [@FedeDP](https://github.com/FedeDP)
-* cleanup(falco): use header file for json schema [[#3325](https://github.com/falcosecurity/falco/pull/3325)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* update(engine): modify append_output format [[#3322](https://github.com/falcosecurity/falco/pull/3322)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* chore: scaffolding for enabling code formatting [[#3321](https://github.com/falcosecurity/falco/pull/3321)] - [@Andreagit97](https://github.com/Andreagit97)
-* update(cmake): bump libs and driver to 0.18.0-rc1. [[#3320](https://github.com/falcosecurity/falco/pull/3320)] - [@FedeDP](https://github.com/FedeDP)
-* fix(ci): restore master and release CI workflow permissions. [[#3317](https://github.com/falcosecurity/falco/pull/3317)] - [@FedeDP](https://github.com/FedeDP)
-* fixed the token-permission and pinned-dependencies issue [[#3299](https://github.com/falcosecurity/falco/pull/3299)] - [@harshitasao](https://github.com/harshitasao)
-* update(cmake): bump falcoctl to v0.10.0-rc1 [[#3316](https://github.com/falcosecurity/falco/pull/3316)] - [@alacuku](https://github.com/alacuku)
-* ci(insecure-api): update semgrep docker image [[#3315](https://github.com/falcosecurity/falco/pull/3315)] - [@francesco-furlan](https://github.com/francesco-furlan)
-* Add demo environment instructions and docker-config files [[#3295](https://github.com/falcosecurity/falco/pull/3295)] - [@bbl232](https://github.com/bbl232)
-* chore(deps): Bump submodules/falcosecurity-rules from `baecf18` to `b6ad373` [[#3301](https://github.com/falcosecurity/falco/pull/3301)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* update(cmake): bump libs and driver to latest master  [[#3283](https://github.com/falcosecurity/falco/pull/3283)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* chore(deps): Bump submodules/falcosecurity-rules from `342b20d` to `baecf18` [[#3298](https://github.com/falcosecurity/falco/pull/3298)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* chore(deps): Bump submodules/falcosecurity-rules from `068f0f2` to `342b20d` [[#3288](https://github.com/falcosecurity/falco/pull/3288)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* vote: add sgaist to OWNERS [[#3264](https://github.com/falcosecurity/falco/pull/3264)] - [@sgaist](https://github.com/sgaist)
-* Add Tulip Retail to adopters list [[#3291](https://github.com/falcosecurity/falco/pull/3291)] - [@bbl232](https://github.com/bbl232)
-* chore(deps): Bump submodules/falcosecurity-rules from `28b98b6` to `068f0f2` [[#3282](https://github.com/falcosecurity/falco/pull/3282)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* chore(deps): Bump submodules/falcosecurity-rules from `c0a9bf1` to `28b98b6` [[#3267](https://github.com/falcosecurity/falco/pull/3267)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* Added the OpenSSF Scorecard Badge [[#3250](https://github.com/falcosecurity/falco/pull/3250)] - [@harshitasao](https://github.com/harshitasao)
-* chore(deps): Bump submodules/falcosecurity-rules from `ea57e78` to `c0a9bf1` [[#3247](https://github.com/falcosecurity/falco/pull/3247)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* update(cmake,userspace): bump libs and driver to latest master. [[#3263](https://github.com/falcosecurity/falco/pull/3263)] - [@FedeDP](https://github.com/FedeDP)
-* If rule compilation fails, return immediately [[#3260](https://github.com/falcosecurity/falco/pull/3260)] - [@mstemm](https://github.com/mstemm)
-* new(userspace/engine): generalize indexable ruleset [[#3251](https://github.com/falcosecurity/falco/pull/3251)] - [@mstemm](https://github.com/mstemm)
-* update(cmake): bump libs to master. [[#3249](https://github.com/falcosecurity/falco/pull/3249)] - [@FedeDP](https://github.com/FedeDP)
-* chore(deps): Bump submodules/falcosecurity-rules from `df963b6` to `ea57e78` [[#3240](https://github.com/falcosecurity/falco/pull/3240)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* chore(ci): enable dummy tests on the testing framework. [[#3233](https://github.com/falcosecurity/falco/pull/3233)] - [@FedeDP](https://github.com/FedeDP)
-* chore(deps): Bump submodules/falcosecurity-rules from `679a50a` to `df963b6` [[#3231](https://github.com/falcosecurity/falco/pull/3231)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* update(cmake): bump libs and driver to master. [[#3225](https://github.com/falcosecurity/falco/pull/3225)] - [@FedeDP](https://github.com/FedeDP)
-* chore(deps): Bump submodules/falcosecurity-rules from `9e56293` to `679a50a` [[#3222](https://github.com/falcosecurity/falco/pull/3222)] - [@dependabot[bot]](https://github.com/apps/dependabot)
-* update(docs): update CHANGELOG for 0.38.0 (master branch) [[#3224](https://github.com/falcosecurity/falco/pull/3224)] - [@LucaGuerra](https://github.com/LucaGuerra)
-
-### Statistics
-
-|   MERGED PRS    | NUMBER |
-|-----------------|--------|
-| Not user-facing |     35 |
-| Release note    |     22 |
-| Total           |     57 |
-
-## v0.38.2
-
-Released on 2024-08-19
-
-### Bug Fixes
-
-* fix(engine): fix metrics names to better adhere to best practices [[#3272](https://github.com/falcosecurity/falco/pull/3272)] - [@incertum](https://github.com/incertum)
-* fix(ci): use vault.centos.org for centos:7 CI build. [[#3274](https://github.com/falcosecurity/falco/pull/3274)] - [@FedeDP](https://github.com/FedeDP)
-
-## v0.38.1
-
-Released on 2024-06-19
-
-### Major Changes
-
-* new(metrics): enable plugins metrics [[#3228](https://github.com/falcosecurity/falco/pull/3228)] - [@mrgian](https://github.com/mrgian)
-
-
-### Minor Changes
-
-* cleanup(falco): clarify that --print variants only affect syscalls [[#3238](https://github.com/falcosecurity/falco/pull/3238)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* update(engine): enable -p option for all sources, -pk, -pc etc only for syscall sources [[#3239](https://github.com/falcosecurity/falco/pull/3239)] - [@LucaGuerra](https://github.com/LucaGuerra)
-
-
-### Bug Fixes
-
-* fix(engine): enable output substitution only for syscall rules, prevent engine from exiting with validation errors when a plugin is loaded and -pc/pk is specified [[#3236](https://github.com/falcosecurity/falco/pull/3236)] - [@mrgian](https://github.com/mrgian)
-* fix(metrics): allow each metric output channel to be selected independently [[#3232](https://github.com/falcosecurity/falco/pull/3232)] - [@incertum](https://github.com/incertum)
-* fix(userspace/falco): fixed `falco_metrics::to_text` implementation when running with plugins [[#3230](https://github.com/falcosecurity/falco/pull/3230)] - [@FedeDP](https://github.com/FedeDP)
-
-
-
-### Statistics
-
-|   MERGED PRS    | NUMBER |
-|-----------------|--------|
-| Not user-facing |      0 |
-| Release note    |      6 |
-| Total           |      6 |
-
 ## v0.38.0

 Released on 2024-05-30
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,100 +2,78 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #
 cmake_minimum_required(VERSION 3.5.1)

 project(falco)

 option(USE_BUNDLED_DEPS "Bundle hard to find dependencies into the Falco binary" ON)
-option(USE_DYNAMIC_LIBELF "Dynamically link libelf" OFF)
+option(USE_DYNAMIC_LIBELF "Dynamically link libelf" ON)
 option(BUILD_WARNINGS_AS_ERRORS "Enable building with -Wextra -Werror flags" OFF)
-option(
-	MINIMAL_BUILD
-	"Build a minimal version of Falco, containing only the engine and basic input/output (EXPERIMENTAL)"
-	OFF
-)
+option(MINIMAL_BUILD "Build a minimal version of Falco, containing only the engine and basic input/output (EXPERIMENTAL)" OFF)
 option(MUSL_OPTIMIZED_BUILD "Enable if you want a musl optimized build" OFF)
 option(BUILD_FALCO_UNIT_TESTS "Build falco unit tests" OFF)
 option(USE_ASAN "Build with AddressSanitizer" OFF)
 option(USE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF)
 option(UBSAN_HALT_ON_ERROR "Halt on error when building with UBSan" ON)
-option(USE_JEMALLOC "Use jemalloc allocator" OFF)

 if(WIN32)
-	if(POLICY CMP0091)
-		# Needed for CMAKE_MSVC_RUNTIME_LIBRARY
-		# https://cmake.org/cmake/help/latest/policy/CMP0091.html
-		cmake_policy(SET CMP0091 NEW)
-	endif()
+  if(POLICY CMP0091)
+    # Needed for CMAKE_MSVC_RUNTIME_LIBRARY
+    # https://cmake.org/cmake/help/latest/policy/CMP0091.html
+    cmake_policy(SET CMP0091 NEW)
+  endif()
 	set(CPACK_GENERATOR "NSIS") # this needs NSIS installed, and available
-elseif(APPLE)
+elseif (APPLE)
 	set(CPACK_GENERATOR "DragNDrop")
 elseif(EMSCRIPTEN)
-	set(USE_BUNDLED_DEPS
-		ON
-		CACHE BOOL "" FORCE
-	)
-	set(BUILD_DRIVER
-		OFF
-		CACHE BOOL "" FORCE
-	)
-	set(ENABLE_DKMS
-		OFF
-		CACHE BOOL "" FORCE
-	)
-	set(BUILD_BPF
-		OFF
-		CACHE BOOL "" FORCE
-	)
-	set(CPACK_GENERATOR
-		TGZ
-		CACHE BOOL "" FORCE
-	)
+  set(USE_BUNDLED_DEPS ON CACHE BOOL "" FORCE)
+  set(BUILD_DRIVER OFF CACHE BOOL "" FORCE)
+  set(ENABLE_DKMS OFF CACHE BOOL "" FORCE)
+  set(BUILD_BPF OFF CACHE BOOL "" FORCE)
+  set(CPACK_GENERATOR TGZ CACHE BOOL "" FORCE)
 endif()

 # gVisor is currently only supported on Linux x86_64
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64"
-   AND CMAKE_SYSTEM_NAME MATCHES "Linux"
-   AND NOT MINIMAL_BUILD
-)
-	option(BUILD_FALCO_GVISOR "Build gVisor support for Falco" ON)
-	if(BUILD_FALCO_GVISOR)
-		add_definitions(-DHAS_GVISOR)
-	endif()
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT MINIMAL_BUILD)
+  option(BUILD_FALCO_GVISOR "Build gVisor support for Falco" ON)
+  if (BUILD_FALCO_GVISOR)
+    add_definitions(-DHAS_GVISOR)
+  endif()
 endif()

 # Modern BPF is not supported on not Linux systems and in MINIMAL_BUILD
 if(CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT MINIMAL_BUILD)
-	option(BUILD_FALCO_MODERN_BPF "Build modern BPF support for Falco" ON)
-	if(BUILD_FALCO_MODERN_BPF)
-		add_definitions(-DHAS_MODERN_BPF)
-	endif()
+  option(BUILD_FALCO_MODERN_BPF "Build modern BPF support for Falco" ON)
+  if(BUILD_FALCO_MODERN_BPF)
+    add_definitions(-DHAS_MODERN_BPF)
+  endif()
 endif()

 # We shouldn't need to set this, see https://gitlab.kitware.com/cmake/cmake/-/issues/16419
 option(EP_UPDATE_DISCONNECTED "ExternalProject update disconnected" OFF)
-if(${EP_UPDATE_DISCONNECTED})
-	set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY EP_UPDATE_DISCONNECTED TRUE)
+if (${EP_UPDATE_DISCONNECTED})
+  set_property(
+    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    PROPERTY EP_UPDATE_DISCONNECTED TRUE)
 endif()

-# Elapsed time set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_COMMAND} -E time") #
-# TODO(fntlnz, leodido): add a flag to enable this
+# Elapsed time
+# set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CMAKE_COMMAND} -E time") # TODO(fntlnz, leodido): add a flag to enable this

 # Make flag for parallel processing
 include(ProcessorCount)
-ProcessorCount(PROCESSOR_COUNT)
+processorcount(PROCESSOR_COUNT)
 if(NOT PROCESSOR_COUNT EQUAL 0)
-	set(PROCESSOUR_COUNT_MAKE_FLAG -j${PROCESSOR_COUNT})
+  set(PROCESSOUR_COUNT_MAKE_FLAG -j${PROCESSOR_COUNT})
 endif()

 # Custom CMake modules
@@ -105,14 +83,14 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 include(GNUInstallDirs)

 if(NOT DEFINED FALCO_ETC_DIR)
-	set(FALCO_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falco")
+  set(FALCO_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falco")
 endif()

 # This will be used to print the architecture for which Falco is compiled.
-if(EMSCRIPTEN)
-	set(FALCO_TARGET_ARCH "wasm")
+if (EMSCRIPTEN)
+  set(FALCO_TARGET_ARCH "wasm")
 else()
-	set(FALCO_TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
+  set(FALCO_TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 endif()

 include(CompilerFlags)
@@ -122,33 +100,25 @@ set(DRIVER_NAME "falco")
 set(DRIVER_DEVICE_NAME "falco")
 set(DRIVERS_REPO "https://download.falco.org/driver")

-# If no path is provided, try to search the BPF probe in: `home/.falco/falco-bpf.o` This is the same
-# fallback that we had in the libraries: `SCAP_PROBE_BPF_FILEPATH`.
+# If no path is provided, try to search the BPF probe in: `home/.falco/falco-bpf.o`
+# This is the same fallback that we had in the libraries: `SCAP_PROBE_BPF_FILEPATH`.
 set(FALCO_PROBE_BPF_FILEPATH ".${DRIVER_NAME}/${DRIVER_NAME}-bpf.o")
 add_definitions(-DFALCO_PROBE_BPF_FILEPATH="${FALCO_PROBE_BPF_FILEPATH}")

 if(NOT DEFINED FALCO_COMPONENT_NAME)
-	set(FALCO_COMPONENT_NAME "${CMAKE_PROJECT_NAME}")
+    set(FALCO_COMPONENT_NAME "${CMAKE_PROJECT_NAME}")
 endif()

 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-	set(CMAKE_INSTALL_PREFIX
-		/usr
-		CACHE PATH "Default install path" FORCE
-	)
+  set(CMAKE_INSTALL_PREFIX
+      /usr
+      CACHE PATH "Default install path" FORCE)
 endif()

 set(CMD_MAKE make)

 include(ExternalProject)

-if(USE_JEMALLOC)
-	if(USE_ASAN)
-		message(WARNING "Jemalloc and ASAN are known to have issues when combined")
-	endif()
-	include(jemalloc)
-endif()
-
 # libs
 include(falcosecurity-libs)

@@ -161,93 +131,60 @@ include(njson)
 # yaml-cpp
 include(yaml-cpp)

-if(NOT WIN32
-   AND NOT APPLE
-   AND NOT MINIMAL_BUILD
-   AND NOT EMSCRIPTEN
-)
-	# OpenSSL
-	include(openssl)
+if(NOT WIN32 AND NOT APPLE AND NOT MINIMAL_BUILD AND NOT EMSCRIPTEN)
+  # OpenSSL
+  include(openssl)

-	# libcurl
-	include(curl)
+  # libcurl
+  include(curl)

-	# todo(jasondellaluce,rohith-raju): support webserver for non-linux builds too cpp-httlib
-	include(cpp-httplib)
+  # todo(jasondellaluce,rohith-raju): support webserver for non-linux builds too
+  # cpp-httlib
+  include(cpp-httplib)
 endif()

 include(cxxopts)

 # One TBB
-if(NOT EMSCRIPTEN)
-	include(tbb)
+if (NOT EMSCRIPTEN)
+  include(tbb)
 endif()

 include(zlib)
-include(valijson)
-if(NOT MINIMAL_BUILD)
-	if(NOT WIN32
-	   AND NOT APPLE
-	   AND NOT EMSCRIPTEN
-	)
-		include(cares)
-		include(protobuf)
-		# gRPC
-		include(grpc)
-	endif()
+if (NOT MINIMAL_BUILD)
+  if (NOT WIN32 AND NOT APPLE AND NOT EMSCRIPTEN)
+    include(cares)
+    include(protobuf)
+    # gRPC
+    include(grpc)
+  endif()
 endif()

 # Installation
 if(WIN32)
-	set(FALCO_INSTALL_CONF_FILE
-		"%PROGRAMFILES%/${PACKAGE_NAME}-${FALCO_VERSION}/etc/falco/falco.yaml"
-	)
-	install(
-		FILES falco.yaml
-		DESTINATION etc/falco/
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
-	install(
-		DIRECTORY
-		DESTINATION etc/falco/config.d
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+	set(FALCO_INSTALL_CONF_FILE "%PROGRAMFILES%/${PACKAGE_NAME}-${FALCO_VERSION}/etc/falco/falco.yaml")
+	install(FILES falco.yaml DESTINATION etc/falco/ COMPONENT "${FALCO_COMPONENT_NAME}")
+    install(DIRECTORY DESTINATION etc/falco/config.d COMPONENT "${FALCO_COMPONENT_NAME}")
 elseif(APPLE)
 	set(FALCO_INSTALL_CONF_FILE "/etc/falco/falco.yaml")
-	install(
-		FILES falco.yaml
-		DESTINATION etc/falco/
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
-	install(
-		DIRECTORY
-		DESTINATION etc/falco/config.d
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+	install(FILES falco.yaml DESTINATION etc/falco/ COMPONENT "${FALCO_COMPONENT_NAME}")
+    install(DIRECTORY DESTINATION etc/falco/config.d COMPONENT "${FALCO_COMPONENT_NAME}")
 else()
 	set(FALCO_INSTALL_CONF_FILE "/etc/falco/falco.yaml")
-	install(
-		FILES falco.yaml
-		DESTINATION "${FALCO_ETC_DIR}"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
-	install(
-		DIRECTORY
-		DESTINATION "${FALCO_ETC_DIR}/config.d"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+	install(FILES falco.yaml DESTINATION "${FALCO_ETC_DIR}" COMPONENT "${FALCO_COMPONENT_NAME}")
+    install(DIRECTORY DESTINATION "${FALCO_ETC_DIR}/config.d" COMPONENT "${FALCO_COMPONENT_NAME}")
 endif()

 if(NOT MINIMAL_BUILD)
-	# Coverage
-	include(Coverage)
+  # Coverage
+  include(Coverage)
 endif()

 # Rules
 include(rules)

-# Clang format add_custom_target(format COMMAND clang-format --style=file -i
-# $<TARGET_PROPERTY:falco,SOURCES> COMMENT "Formatting ..." VERBATIM)
+# Clang format
+# add_custom_target(format COMMAND clang-format --style=file -i $<TARGET_PROPERTY:falco,SOURCES> COMMENT "Formatting ..." VERBATIM)

 # Static analysis
 include(static-analysis)
@@ -261,17 +198,13 @@ add_subdirectory(scripts)
 add_subdirectory(userspace/engine)
 add_subdirectory(userspace/falco)

-if(NOT WIN32
-   AND NOT APPLE
-   AND NOT EMSCRIPTEN
-   AND NOT MUSL_OPTIMIZED_BUILD
-)
-	include(falcoctl)
+if(NOT WIN32 AND NOT APPLE AND NOT EMSCRIPTEN AND NOT MUSL_OPTIMIZED_BUILD)
+  include(falcoctl)
 endif()

 # Packages configuration
 include(CPackConfig)

 if(BUILD_FALCO_UNIT_TESTS)
-	add_subdirectory(unit_tests)
+  add_subdirectory(unit_tests)
 endif()
--- a/Contributing.md
+++ b/Contributing.md
@@ -1,207 +0,0 @@
-# How to contribute
-
-## Enforce coding style 💻
-
-### Introduction
-
-This document introduces the coding style that will be applied in this repository.
-This coding style involves all the following files: `.c`, `.h`, `.cpp`, `.cmake`, `CMakeLists.txt`. To enforce it we rely on two main tools:
-
-1. `clang-format` version `18.1.8`.
-2. `cmake-format` version `0.6.13`.
-
-> __Please note__: tools versions are important! Different versions will enforce slightly different changes on the code. For example `clang-format-18` will produce a slightly different output respect to `clang-format-17` always respecting the imposed style.
-
-The coding style is expressed through the 2 configuration file that you find in this repo: `.clang-format`, `.cmake-format.json`.  
-
-### Enforce the style locally
-
-There are many ways to enforce the style locally, here we will describe two of them:
-
-1. Use `pre-commit` framework.
-2. Use the repo `Makefile`.
-
-#### 1.Pre-commit framework (suggested if you don't have the 2 tools already installed on your machine)
-
-The `pre-commit` framework allows you to automatically install different `git-hooks` that will run at every new commit. More precisely, if you use the `.pre-commit-config.yaml` in this repo you will install 3 different hooks:
-
-1. The `clang-format` hook: this is a `pre-commit` git hook that runs `clang-format` on your staged changes.
-2. The `cmake-format` hook: this is a `pre-commit` git hook that runs `cmake-format` on your staged changes.
-3. The `DCO signed-off` hook: this is a `pre-commit-msg` git hook that adds the `DCO` on your commit if not present. This hook is not strictly related to the coding style so we will talk about it in a separate section: [Add DCO signed-off to your commits](#add-dco-signed-off-to-your-commits).
-
-Now let's see what we need to use `pre-commit` framework.
-
-##### Step 1
-
-Install `pre-commit` framework following the [official documentation](https://pre-commit.com/#installation).
-
-> __Please note__: you have to follow only the "Installation" section.
-
-##### Step 2
-
-Once you have installed `pre-commit`, you don't need to install anything else! This is the good point of using a framework like `pre-commit`, all the tools necessary to format your code will be directly managed by the framework. But in order to be ready, you need to install the git hooks in your local repo.
-
-This simple command allows you to install the two `pre-commit` git hooks, `clang-format` and `cmake-format`.
-
-```bash
-pre-commit install --install-hooks --hook-type pre-commit --overwrite  
-```
-
-If you want to install also the `pre-commit-msg` git hook for the DCO you have to type the following command, but be sure to have configured all you need as said in the [dedicated section]((#add-dco-signed-off-to-your-commits))
-
-```bash
-pre-commit install --install-hooks --hook-type prepare-commit-msg --overwrite 
-```
-
-You have done, at every new commit, this hook will check that your patch respects the coding style of this repo!
-
-If you want to detach the git hooks, you can simply type:
-
-```bash
-pre-commit uninstall --hook-type prepare-commit-msg
-pre-commit uninstall --hook-type pre-commit 
-```
-
-#### 2.Makefile
-
-##### Step 1
-
-In order to use the repo `Makefile`, you need to install on your local machine the two aforementioned tools:
-
-__clang-format v18.1.8__
-
-One of the easiest ways to install `clang-format` could be directly downloading its static binary from [here](https://github.com/muttleyxd/clang-tools-static-binaries).
-There are other ways for example you can download the package for your distro or you can also build it from sources.
-
-__cmake-format v0.6.13__
-
-To install `cmake-format` you can follow the official documentation [here](https://cmake-format.readthedocs.io/en/latest/installation.html).
-
-> __NOTE__: Please check the versions of the two tool with `clang-format --version` and `cmake-format --version`.
-
-##### Step 2
-
-Once you have installed the __right__ versions of the 2 tools, you can simply type `make format-all` from the root directory of the project (`/libs`) to format all your code according to the coding style.
-
-Remember to do that before submitting a new patch upstream! 😁
-
-#### Other solutions
-
-Obviously, you can also install the 2 tools locally and enable some extension of your favorite IDE (like `VScode`) to format your code every time you save your files!
-
-## Add DCO signed-off to your commits 🔏
-
-### Introduction
-
-Another requirement for contributing to the `libs` repository, is applying the [DCO](https://cert-manager.io/docs/contributing/sign-off/) to every commit you want to push upstream.
-Before doing this you have to configure your git user `name` and `email` if you haven't already done it. To check your actual `name` and `email` type:
-
-```bash
-git config --get user.name
-git config --get user.email
-```
-
-If they are correct you have done, otherwise, you have to set them:
-
-```bash
-git config user.name <full-name>
-git config user.email <mail-used_with-GitHub-profile>
-```
-
->__Please note__: If you have problems in doing this you can read the full documentation [here](https://docs.github.com/en/get-started/getting-started-with-git/setting-your-username-in-git).
-
-### Enforce the DCO locally
-
-Now you are ready to sign your commits! You have two main ways to do this:
-
-1. Manually with `git` tool.
-2. Use the `pre-commit-msg` hook quoted before.
-
-### Manually
-
-To do this you just need to remember the `-s` while performing your commits:
-
-```bash
-git commit -s
-```
-
-or with the inline message:
-
-```bash
-git commit -s -m "my first commit"
-```
-
-### Use `pre-commit` hook
-
-Here if you have already added the hook in the [previous section](#step-2), you have to do nothing otherwise you have to simply install the DCO hook with:
-
-```bash
-pre-commit install --install-hooks --hook-type prepare-commit-msg --overwrite 
-```
-
-And you have done! Now you don't have to remember the `-s` option every time you commit something, the DCO hook will automatically add the DCO if you forget it! 😄
-
-## Some best practices 📏
-
-### Class variables
-
-To know whether a variable belongs to a `class` or a `function`, we start member variables with `m_`.
-
-Example:
-
-```c
-    public int32_t m_counter;
-```
-
-### Global variables
-
-To know whether the variable is global or not, we start globals with `g_`.
-
-Example:
-
-```c
-    int g_nplugins;
-```
-
-### Capitalization
-
-The naming convention is camel-cased "Unix" style, i.e. always lower case. Words are separated by underscores.
-
-Example:
-
-```c
-    int32_t g_global_bean_counter;
-    int32_t count_beans();
-```
-
-and not,
-
-```c
-    int32_t GlobalBeanCounter;
-    int32_t CountBeans();
-```
-
-### Packed Structures
-
-Packed structures should use the GCC and MSVC-style supported `pragma`:
-
-Example:
-
-```c
-    #pragma pack(push,1)
-    struct frame_control
-    {
-        struct fields....
-    };
-    #pragma pack(pop)
-```
-
-### 64-bit constants
-
-Put an `LL` at the end of your `64-bit` constants. Without the `LL`, some platform compilers try to interpret the constant on the right-hand side as a `long integer` instead of a `long long` and this could lead to an error at building time.
-
-Example:
-
-```c
-    x=0X00FF00000000000LL
-```
--- a/81
+++ b/81
@@ -1,81 +0,0 @@
-#
-# Copyright (C) 2024 The Falco Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# mofidy the following variables to match your paths
-CLANG_FORMAT_EXE ?= clang-format
-CLANG_FORMAT_VERSION = "$(shell ${CLANG_FORMAT_EXE} --version | grep -o '[0-9]*\.[0-9]*\.[0-9]*')"
-CLANG_FORMAT_DESIRED_VERSION ="18.1.8"
-
-CMAKE_FORMAT_EXE ?= cmake-format
-CMAKE_FORMAT_VERSION = "$(shell ${CMAKE_FORMAT_EXE} --version | grep -o '[0-9]*\.[0-9]*\.[0-9]*')"
-CMAKE_FORMAT_DESIRED_VERSION = "0.6.13"
-
-PROJECT_ROOT_DIR = $(shell git rev-parse --show-toplevel)
-
-######################
-#    Clang-format    #
-######################
-.PHONY: clang-format-install
-clang-format-install:
-ifeq (, $(shell ${CLANG_FORMAT_EXE} --version))
-	@echo "${CLANG_FORMAT_EXE} is not installed. Please read the 'coding style' doc to get more info."
-	@exit 1
-endif
-
-ifneq ($(CLANG_FORMAT_VERSION), $(CLANG_FORMAT_DESIRED_VERSION))
-	@echo "${CLANG_FORMAT_EXE} version is not '${CLANG_FORMAT_DESIRED_VERSION}'. Actual version is '${CLANG_FORMAT_VERSION}'"
-	@exit 1
-endif
-
-.PHONY: format-clang
-format-clang: clang-format-install
-	git ls-files --directory ${PROJECT_ROOT_DIR} | grep -E '\.(cpp|h|c)$$' | xargs ${CLANG_FORMAT_EXE} -Werror --style=file:${PROJECT_ROOT_DIR}/.clang-format -i
-
-.PHONY: check-clang
-check-clang: clang-format-install
-	git ls-files --directory ${PROJECT_ROOT_DIR} | grep -E '\.(cpp|h|c)$$' | xargs ${CLANG_FORMAT_EXE} -Werror --style=file:${PROJECT_ROOT_DIR}/.clang-format -n
-
-######################
-#    Cmake-format    #
-######################
-.PHONY: cmake-format-install
-cmake-format-install:
-ifeq (, $(shell ${CMAKE_FORMAT_EXE} --version))
-	@echo "${CMAKE_FORMAT_EXE} is not installed. Please read the 'coding style' doc to get more info."
-	@exit 1
-endif
-
-ifneq ($(CMAKE_FORMAT_VERSION), $(CMAKE_FORMAT_DESIRED_VERSION))
-	@echo "${CMAKE_FORMAT_EXE} version is not '${CMAKE_FORMAT_DESIRED_VERSION}'. Actual version is '${CMAKE_FORMAT_VERSION}'"
-	@exit 1
-endif
-
-.PHONY: format-cmake
-format-cmake: cmake-format-install
-	git ls-files --directory ${PROJECT_ROOT_DIR} | grep -E '\.(cmake)$$|CMakeLists.txt$$' | xargs ${CMAKE_FORMAT_EXE} --config-files ${PROJECT_ROOT_DIR}/.cmake-format.json -i
-
-.PHONY: check-cmake
-check-cmake: cmake-format-install
-	git ls-files --directory ${PROJECT_ROOT_DIR} | grep -E '\.(cmake)$$|CMakeLists.txt$$' | xargs ${CMAKE_FORMAT_EXE} --config-files ${PROJECT_ROOT_DIR}/.cmake-format.json --check
-
-# Add new formatters here...
-
-.PHONY: format-all
-format-all: format-clang format-cmake
-
-.PHONY: check-all
-check-all: check-clang check-cmake
-
--- a/1
+++ b/1
@@ -6,7 +6,6 @@ approvers:
  - andreagit97
  - incertum
  - LucaGuerra
-  - sgaist
 reviewers:
  - kaizhe
 emeritus_approvers:
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![Latest release](https://img.shields.io/github/v/release/falcosecurity/falco?style=for-the-badge)](https://github.com/falcosecurity/falco/releases/latest) [![Supported Architectures](https://img.shields.io/badge/ARCHS-x86__64%7Caarch64-blueviolet?style=for-the-badge)](https://github.com/falcosecurity/falco/releases/latest) [![License](https://img.shields.io/github/license/falcosecurity/falco?style=for-the-badge)](COPYING) [![Docs](https://img.shields.io/badge/docs-latest-green.svg?style=for-the-badge)](https://falco.org/docs)

-[![Falco Core Repository](https://github.com/falcosecurity/evolution/blob/main/repos/badges/falco-core-blue.svg)](https://github.com/falcosecurity/evolution/blob/main/REPOSITORIES.md#core-scope) [![Stable](https://img.shields.io/badge/status-stable-brightgreen?style=for-the-badge)](https://github.com/falcosecurity/evolution/blob/main/REPOSITORIES.md#stable)  [![OpenSSF Scorecard](https://img.shields.io/ossf-scorecard/github.com/falcosecurity/falco?label=openssf%20scorecard&style=for-the-badge)](https://scorecard.dev/viewer/?uri=github.com/falcosecurity/falco)  [![OpenSSF Best Practices](https://img.shields.io/cii/summary/2317?label=OpenSSF%20Best%20Practices&style=for-the-badge)](https://bestpractices.coreinfrastructure.org/projects/2317) <a href="https://actuated.dev/"><img alt="Arm CI sponsored by Actuated" src="https://docs.actuated.dev/images/actuated-badge.png" width="120px"></img></a>
+[![Falco Core Repository](https://github.com/falcosecurity/evolution/blob/main/repos/badges/falco-core-blue.svg)](https://github.com/falcosecurity/evolution/blob/main/REPOSITORIES.md#core-scope) [![Stable](https://img.shields.io/badge/status-stable-brightgreen?style=for-the-badge)](https://github.com/falcosecurity/evolution/blob/main/REPOSITORIES.md#stable)  [![OpenSSF Best Practices](https://img.shields.io/cii/summary/2317?label=OpenSSF%20Best%20Practices&style=for-the-badge)](https://bestpractices.coreinfrastructure.org/projects/2317) <a href="https://actuated.dev/"><img alt="Arm CI sponsored by Actuated" src="https://docs.actuated.dev/images/actuated-badge.png" width="120px"></img></a>

 [![Falco](https://falco.org/img/brand/falco-horizontal-color.svg)](https://falco.org)

@@ -43,9 +43,6 @@ Considerations and guidance for Falco adopters:

 5. Integrate with output destinations: Integrate Falco with SIEM, data lake systems, or other preferred output destinations to establish a robust foundation for comprehensive data analysis and enable effective incident response workflows.

-### Demo Environment
-
-A demo environment is provided via a docker-compose file that can be started on a docker host which includes falco, falcosidekick, falcosidekick-ui and its required redis database. For more information see the [docker-compose section](docker/docker-compose/)

 ## How to Contribute

--- a/cmake/cpack/CMakeCPackOptions.cmake
+++ b/cmake/cpack/CMakeCPackOptions.cmake
@@ -2,53 +2,24 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 if(CPACK_GENERATOR MATCHES "DEB" OR CPACK_GENERATOR MATCHES "RPM")
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"mkdir -p _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"cp scripts/systemd/falco-kmod-inject.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"cp scripts/systemd/falco-kmod.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"cp scripts/systemd/falco-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"cp scripts/systemd/falco-modern-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"cp scripts/systemd/falco-custom.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
-	list(
-		APPEND
-		CPACK_INSTALL_COMMANDS
-		"cp scripts/systemd/falcoctl-artifact-follow.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system"
-	)
+	list(APPEND CPACK_INSTALL_COMMANDS "mkdir -p _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-kmod-inject.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-kmod.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-modern-bpf.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falco-custom.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
+	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/systemd/falcoctl-artifact-follow.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 endif()

 if(CPACK_GENERATOR MATCHES "TGZ")
--- a/cmake/modules/CPackConfig.cmake
+++ b/cmake/modules/CPackConfig.cmake
@@ -2,21 +2,19 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 set(CPACK_PACKAGE_NAME "${PACKAGE_NAME}")
 set(CPACK_PACKAGE_VENDOR "Cloud Native Computing Foundation (CNCF) cncf.io.")
-set(CPACK_PACKAGE_CONTACT "cncf-falco-dev@lists.cncf.io") # todo: change this once we've got
-# @falco.org addresses
+set(CPACK_PACKAGE_CONTACT "cncf-falco-dev@lists.cncf.io") # todo: change this once we've got @falco.org addresses
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Falco - Container Native Runtime Security")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/scripts/description.txt")
 set(CPACK_PACKAGE_VERSION "${FALCO_VERSION}")
@@ -24,41 +22,34 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${FALCO_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${FALCO_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${FALCO_VERSION_PATCH}")
 set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_SOURCE_DIR}/cmake/cpack/CMakeCPackOptions.cmake")
-if(CMAKE_BUILD_TYPE STREQUAL "debug")
-	set(CPACK_STRIP_FILES "OFF")
-else()
-	set(CPACK_STRIP_FILES "ON")
-endif()
+set(CPACK_STRIP_FILES "ON")
 set(CPACK_PACKAGE_RELOCATABLE "OFF")
-if(EMSCRIPTEN)
-	set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-wasm")
+if (EMSCRIPTEN)
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-wasm")
 else()
-	set(CPACK_PACKAGE_FILE_NAME
-		"${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}"
-	)
+  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
 endif()

 if(WIN32)
-	set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+	SET(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
 endif()

 # Built packages will include only the following components
 set(CPACK_INSTALL_CMAKE_PROJECTS
-	"${CMAKE_CURRENT_BINARY_DIR};${FALCO_COMPONENT_NAME};${FALCO_COMPONENT_NAME};/"
+  "${CMAKE_CURRENT_BINARY_DIR};${FALCO_COMPONENT_NAME};${FALCO_COMPONENT_NAME};/" 
 )

 if(CMAKE_SYSTEM_NAME MATCHES "Linux") # only Linux has drivers
-	list(APPEND CPACK_INSTALL_CMAKE_PROJECTS
-		 "${CMAKE_CURRENT_BINARY_DIR};${DRIVER_COMPONENT_NAME};${DRIVER_COMPONENT_NAME};/"
-	)
+  list(APPEND CPACK_INSTALL_CMAKE_PROJECTS
+    "${CMAKE_CURRENT_BINARY_DIR};${DRIVER_COMPONENT_NAME};${DRIVER_COMPONENT_NAME};/")
 endif()

 if(NOT CPACK_GENERATOR)
-	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-		set(CPACK_GENERATOR DEB RPM TGZ)
-	else()
-		set(CPACK_GENERATOR TGZ)
-	endif()
+  if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    set(CPACK_GENERATOR DEB RPM TGZ)
+  else()
+    set(CPACK_GENERATOR TGZ)
+  endif()
 endif()

 message(STATUS "Using package generators: ${CPACK_GENERATOR}")
@@ -66,35 +57,33 @@ message(STATUS "Package architecture: ${CMAKE_SYSTEM_PROCESSOR}")
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")

 if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
+  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
 endif()
 if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
-	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64")
+  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "arm64")
 endif()
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://www.falco.org")
-set(CPACK_DEBIAN_PACKAGE_SUGGESTS "dkms (>= 2.1.0.0)")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "dkms (>= 2.1.0.0)")
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
-	"${CMAKE_BINARY_DIR}/scripts/debian/postinst;${CMAKE_BINARY_DIR}/scripts/debian/prerm;${CMAKE_BINARY_DIR}/scripts/debian/postrm;${PROJECT_SOURCE_DIR}/cmake/cpack/debian/conffiles"
+    "${CMAKE_BINARY_DIR}/scripts/debian/postinst;${CMAKE_BINARY_DIR}/scripts/debian/prerm;${CMAKE_BINARY_DIR}/scripts/debian/postrm;${PROJECT_SOURCE_DIR}/cmake/cpack/debian/conffiles"
 )

 set(CPACK_RPM_PACKAGE_LICENSE "Apache v2.0")
 set(CPACK_RPM_PACKAGE_ARCHITECTURE, "amd64")
 set(CPACK_RPM_PACKAGE_URL "https://www.falco.org")
-set(CPACK_RPM_PACKAGE_REQUIRES "systemd")
-set(CPACK_RPM_PACKAGE_SUGGESTS "dkms, kernel-devel")
+set(CPACK_RPM_PACKAGE_REQUIRES "dkms, kernel-devel, systemd")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/scripts/rpm/postinstall")
 set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/scripts/rpm/preuninstall")
 set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${CMAKE_BINARY_DIR}/scripts/rpm/postuninstall")
 set(CPACK_RPM_PACKAGE_VERSION "${FALCO_VERSION}")
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
-	/usr/src
-	/usr/share/man
-	/usr/share/man/man8
-	/etc
-	/usr
-	/usr/bin
-	/usr/share
-)
+    /usr/src
+    /usr/share/man
+    /usr/share/man/man8
+    /etc
+    /usr
+    /usr/bin
+    /usr/share)
 set(CPACK_RPM_PACKAGE_RELOCATABLE "OFF")

 include(CPack)
--- a/cmake/modules/CompilerFlags.cmake
+++ b/cmake/modules/CompilerFlags.cmake
@@ -2,54 +2,51 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)

 if(NOT FALCO_EXTRA_DEBUG_FLAGS)
-	set(FALCO_EXTRA_DEBUG_FLAGS "-D_DEBUG")
+  set(FALCO_EXTRA_DEBUG_FLAGS "-D_DEBUG")
 endif()

 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
 if(CMAKE_BUILD_TYPE STREQUAL "debug")
-	set(KBUILD_FLAGS "${FALCO_EXTRA_DEBUG_FLAGS} ${FALCO_EXTRA_FEATURE_FLAGS}")
-elseif(CMAKE_BUILD_TYPE STREQUAL "relwithdebinfo")
-	set(KBUILD_FLAGS "${FALCO_EXTRA_FEATURE_FLAGS}")
-	add_definitions(-DBUILD_TYPE_RELWITHDEBINFO)
+  set(KBUILD_FLAGS "${FALCO_EXTRA_DEBUG_FLAGS} ${FALCO_EXTRA_FEATURE_FLAGS}")
 else()
-	set(CMAKE_BUILD_TYPE "release")
-	set(KBUILD_FLAGS "${FALCO_EXTRA_FEATURE_FLAGS}")
-	add_definitions(-DBUILD_TYPE_RELEASE)
+  set(CMAKE_BUILD_TYPE "release")
+  set(KBUILD_FLAGS "${FALCO_EXTRA_FEATURE_FLAGS}")
+  add_definitions(-DBUILD_TYPE_RELEASE)
 endif()
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")

 if(MINIMAL_BUILD)
-	set(MINIMAL_BUILD_FLAGS "-DMINIMAL_BUILD")
+  set(MINIMAL_BUILD_FLAGS "-DMINIMAL_BUILD")
 endif()

 if(MUSL_OPTIMIZED_BUILD)
-	set(MUSL_FLAGS "-static -Os -fPIE -pie")
-	add_definitions(-DMUSL_OPTIMIZED)
+  set(MUSL_FLAGS "-static -Os -fPIE -pie")
+  add_definitions(-DMUSL_OPTIMIZED)
 endif()

 # explicitly set hardening flags
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(FALCO_SECURITY_FLAGS "")
 if(LINUX)
-	set(FALCO_SECURITY_FLAGS "${FALCO_SECURITY_FLAGS} -fstack-protector-strong")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
+  set(FALCO_SECURITY_FLAGS "${FALCO_SECURITY_FLAGS} -fstack-protector-strong")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
 endif()

+
 if(NOT MSVC)

 	if(CMAKE_BUILD_TYPE STREQUAL "release")
@@ -67,9 +64,7 @@ if(NOT MSVC)
 		endif()
 	endif()

-	set(CMAKE_COMMON_FLAGS
-		"${FALCO_SECURITY_FLAGS} -Wall -ggdb ${FALCO_EXTRA_FEATURE_FLAGS} ${MINIMAL_BUILD_FLAGS} ${MUSL_FLAGS}"
-	)
+	set(CMAKE_COMMON_FLAGS "${FALCO_SECURITY_FLAGS} -Wall -ggdb ${FALCO_EXTRA_FEATURE_FLAGS} ${MINIMAL_BUILD_FLAGS} ${MUSL_FLAGS}")

 	if(BUILD_WARNINGS_AS_ERRORS)
 		set(CMAKE_SUPPRESSED_WARNINGS
@@ -88,38 +83,25 @@ if(NOT MSVC)
 	set(CMAKE_C_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG")
 	set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG")

-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g")
-
-	# Add linker flags to generate separate debug files
-	set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
-		"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} -Wl,--build-id"
-	)
-	set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-		"${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} -Wl,--build-id"
-	)
-
 else() # MSVC
 	set(MINIMAL_BUILD ON)
 	set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")

-	# The WIN32_LEAN_AND_MEAN define avoids possible macro pollution when a libsinsp consumer
-	# includes the windows.h header: https://stackoverflow.com/a/28380820 Same goes for NOMINMAX:
-	# https://stackoverflow.com/questions/5004858/why-is-stdmin-failing-when-windows-h-is-included
+	# The WIN32_LEAN_AND_MEAN define avoids possible macro pollution
+	# when a libsinsp consumer includes the windows.h header.
+	# See: https://stackoverflow.com/a/28380820
+
 	add_compile_definitions(
-		_HAS_STD_BYTE=0 _CRT_SECURE_NO_WARNINGS WIN32 MINIMAL_BUILD WIN32_LEAN_AND_MEAN NOMINMAX
+		_HAS_STD_BYTE=0
+		_CRT_SECURE_NO_WARNINGS
+		WIN32
+		MINIMAL_BUILD
+		WIN32_LEAN_AND_MEAN
 	)

 	set(FALCOSECURITY_LIBS_COMMON_FLAGS "/EHsc /W3 /Zi /std:c++17")
 	set(FALCOSECURITY_LIBS_DEBUG_FLAGS "/MTd /Od")
 	set(FALCOSECURITY_LIBS_RELEASE_FLAGS "/MT")
-	set(FALCOSECURITY_LIBS_RELWITHDEBINFO_FLAGS "/MT /Zi")
-
-	# Ensure linker generates PDB files for MSVC
-	set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG")
-	set(CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
-		"${CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG"
-	)

 	set(CMAKE_C_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS}")
 	set(CMAKE_CXX_FLAGS "${FALCOSECURITY_LIBS_COMMON_FLAGS}")
@@ -130,7 +112,4 @@ else() # MSVC
 	set(CMAKE_C_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")
 	set(CMAKE_CXX_FLAGS_RELEASE "${FALCOSECURITY_LIBS_RELEASE_FLAGS}")

-	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${FALCOSECURITY_LIBS_RELWITHDEBINFO_FLAGS}")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${FALCOSECURITY_LIBS_RELWITHDEBINFO_FLAGS}")
-
 endif()
--- a/cmake/modules/Coverage.cmake
+++ b/cmake/modules/Coverage.cmake
@@ -2,28 +2,25 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 # Tests coverage
 option(FALCO_COVERAGE "Build test suite with coverage information" OFF)
 if(FALCO_COVERAGE)
-	if(NOT (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES
-														   "Clang"))
-	)
-		message(FATAL_ERROR "FALCO_COVERAGE requires GCC or Clang.")
-	endif()
+  if(NOT (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")))
+    message(FATAL_ERROR "FALCO_COVERAGE requires GCC or Clang.")
+  endif()

-	message(STATUS "Building with coverage information")
-	add_compile_options(-g --coverage)
-	set(CMAKE_SHARED_LINKER_FLAGS "--coverage ${CMAKE_SHARED_LINKER_FLAGS}")
-	set(CMAKE_EXE_LINKER_FLAGS "--coverage ${CMAKE_EXE_LINKER_FLAGS}")
+  message(STATUS "Building with coverage information")
+  add_compile_options(-g --coverage)
+  set(CMAKE_SHARED_LINKER_FLAGS "--coverage ${CMAKE_SHARED_LINKER_FLAGS}")
+  set(CMAKE_EXE_LINKER_FLAGS "--coverage ${CMAKE_EXE_LINKER_FLAGS}")
 endif()
--- a/cmake/modules/copy_files_to_build_dir.cmake
+++ b/cmake/modules/copy_files_to_build_dir.cmake
@@ -2,32 +2,30 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 function(copy_files_to_build_dir source_files targetsuffix)

-	set(build_files)
+  set(build_files)

-	foreach(file_path ${source_files})
-		get_filename_component(trace_file ${file_path} NAME)
-		list(APPEND build_files ${CMAKE_CURRENT_BINARY_DIR}/${trace_file})
-	endforeach()
+  foreach(file_path ${source_files})
+	  get_filename_component(trace_file ${file_path} NAME)
+	  list(APPEND build_files ${CMAKE_CURRENT_BINARY_DIR}/${trace_file})
+  endforeach()

-	add_custom_target(copy-files-${targetsuffix} ALL DEPENDS ${build_files})
+  add_custom_target(copy-files-${targetsuffix} ALL
+	  DEPENDS ${build_files})

-	add_custom_command(
-		OUTPUT ${build_files}
-		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source_files} ${CMAKE_CURRENT_BINARY_DIR}
-		DEPENDS ${source_files}
-	)
+  add_custom_command(OUTPUT ${build_files}
+	  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${source_files} ${CMAKE_CURRENT_BINARY_DIR}
+	  DEPENDS ${source_files})

 endfunction()
--- a/cmake/modules/cpp-httplib.cmake
+++ b/cmake/modules/cpp-httplib.cmake
@@ -2,31 +2,25 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 option(USE_BUNDLED_CPPHTTPLIB "Enable building of the bundled cpp-httplib" ${USE_BUNDLED_DEPS})

 if(USE_BUNDLED_CPPHTTPLIB)
-	set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)
-	set(HTTPLIB_REQUIRE_BROTLI OFF)
-	set(HTTPLIB_USE_ZLIB_IF_AVAILABLE OFF)
-	set(HTTPLIB_REQUIRE_ZLIB OFF)
-	include(FetchContent)
-	FetchContent_Declare(
-		cpp-httplib
-		URL https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.15.3.tar.gz
-		URL_HASH SHA256=2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e
-	)
-	FetchContent_MakeAvailable(cpp-httplib)
+    include(FetchContent)
+    FetchContent_Declare(cpp-httplib
+        URL https://github.com/yhirose/cpp-httplib/archive/refs/tags/v0.15.3.tar.gz
+        URL_HASH SHA256=2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e
+    )
+    FetchContent_MakeAvailable(cpp-httplib)
 else()
-	find_package(httplib CONFIG REQUIRED)
+    find_package(httplib CONFIG REQUIRED)
 endif()
--- a/cmake/modules/cxxopts.cmake
+++ b/cmake/modules/cxxopts.cmake
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 #
@@ -20,26 +19,25 @@
 option(USE_BUNDLED_CXXOPTS "Enable building of the bundled cxxopts" ${USE_BUNDLED_DEPS})

 if(CXXOPTS_INCLUDE_DIR)
-	# we already have cxxopts
+    # we already have cxxopts
 elseif(NOT USE_BUNDLED_CXXOPTS)
-	find_package(cxxopts CONFIG REQUIRED)
-	get_target_property(CXXOPTS_INCLUDE_DIR cxxopts::cxxopts INTERFACE_INCLUDE_DIRECTORIES)
+    find_package(cxxopts CONFIG REQUIRED)
+    get_target_property(CXXOPTS_INCLUDE_DIR cxxopts::cxxopts INTERFACE_INCLUDE_DIRECTORIES)
 else()
-	set(CXXOPTS_SRC "${PROJECT_BINARY_DIR}/cxxopts-prefix/src/cxxopts/")
-	set(CXXOPTS_INCLUDE_DIR "${CXXOPTS_SRC}/include")
+    set(CXXOPTS_SRC "${PROJECT_BINARY_DIR}/cxxopts-prefix/src/cxxopts/")
+    set(CXXOPTS_INCLUDE_DIR "${CXXOPTS_SRC}/include")

-	message(STATUS "Using bundled cxxopts in ${CXXOPTS_SRC}")
+    message(STATUS "Using bundled cxxopts in ${CXXOPTS_SRC}")

-	ExternalProject_Add(
-		cxxopts
-		URL "https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.0.0.tar.gz"
-		URL_HASH "SHA256=36f41fa2a46b3c1466613b63f3fa73dc24d912bc90d667147f1e43215a8c6d00"
-		CONFIGURE_COMMAND ""
-		BUILD_COMMAND ""
-		INSTALL_COMMAND ""
-	)
+    ExternalProject_Add(
+        cxxopts
+        URL "https://github.com/jarro2783/cxxopts/archive/refs/tags/v3.0.0.tar.gz"
+        URL_HASH "SHA256=36f41fa2a46b3c1466613b63f3fa73dc24d912bc90d667147f1e43215a8c6d00"
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND "")
 endif()

 if(NOT TARGET cxxopts)
-	add_custom_target(cxxopts)
+    add_custom_target(cxxopts)
 endif()
--- a/cmake/modules/driver-repo/CMakeLists.txt
+++ b/cmake/modules/driver-repo/CMakeLists.txt
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #
 cmake_minimum_required(VERSION 3.5.1)

@@ -21,12 +20,12 @@ message(STATUS "Driver repository: ${DRIVER_REPO}")
 message(STATUS "Driver version: ${DRIVER_VERSION}")

 ExternalProject_Add(
-	driver
-	URL "https://github.com/${DRIVER_REPO}/archive/${DRIVER_VERSION}.tar.gz"
-	URL_HASH "${DRIVER_CHECKSUM}"
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
-	PATCH_COMMAND sh -c "mv ./driver ../driver.tmp && rm -rf ./* && mv ../driver.tmp/* ."
+  driver
+  URL "https://github.com/${DRIVER_REPO}/archive/${DRIVER_VERSION}.tar.gz"
+  URL_HASH "${DRIVER_CHECKSUM}"
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  TEST_COMMAND ""
+  PATCH_COMMAND sh -c "mv ./driver ../driver.tmp && rm -rf ./* && mv ../driver.tmp/* ."
 )
--- a/cmake/modules/driver.cmake
+++ b/cmake/modules/driver.cmake
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 set(DRIVER_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/driver-repo")
@@ -19,42 +18,37 @@ set(DRIVER_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/driver-repo")
 file(MAKE_DIRECTORY ${DRIVER_CMAKE_WORKING_DIR})

 if(DRIVER_SOURCE_DIR)
-	set(DRIVER_VERSION "0.0.0-local")
-	message(STATUS "Using local version for driver: '${DRIVER_SOURCE_DIR}'")
+  set(DRIVER_VERSION "0.0.0-local")
+  message(STATUS "Using local version for driver: '${DRIVER_SOURCE_DIR}'")
 else()
-	# DRIVER_REPO accepts a repository name (<org name>/<repo name>) alternative to the
-	# falcosecurity/libs repository. In case you want to test against a fork of falcosecurity/libs
-	# just pass the variable - ie., `cmake -DDRIVER_REPO=<your-gh-handle>/libs ..`
-	if(NOT DRIVER_REPO)
-		set(DRIVER_REPO "falcosecurity/libs")
-	endif()
+  # DRIVER_REPO accepts a repository name (<org name>/<repo name>) alternative to the falcosecurity/libs repository.
+  # In case you want to test against a fork of falcosecurity/libs just pass the variable -
+  # ie., `cmake -DDRIVER_REPO=<your-gh-handle>/libs ..` 
+  if (NOT DRIVER_REPO)
+    set(DRIVER_REPO "falcosecurity/libs")
+  endif()

-	# DRIVER_VERSION accepts a git reference (branch name, commit hash, or tag) to the
-	# falcosecurity/libs repository which contains the driver source code under the `/driver`
-	# directory. The chosen driver version must be compatible with the given
-	# FALCOSECURITY_LIBS_VERSION. 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 "8.0.0+driver")
-		set(DRIVER_CHECKSUM
-			"SHA256=f35990d6a1087a908fe94e1390027b9580d4636032c0f2b80bf945219474fd6b"
-		)
-	endif()
+  # DRIVER_VERSION accepts a git reference (branch name, commit hash, or tag) to the falcosecurity/libs repository
+  # which contains the driver source code under the `/driver` directory.
+  # The chosen driver version must be compatible with the given FALCOSECURITY_LIBS_VERSION.
+  # 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.2.0+driver")
+    set(DRIVER_CHECKSUM "SHA256=82424189620010092d0eaabbfa59d904510771e293fd03f67a01b099691b4c4b")
+  endif()

-	# cd /path/to/build && cmake /path/to/source
-	execute_process(
-		COMMAND
-			"${CMAKE_COMMAND}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" -DDRIVER_REPO=${DRIVER_REPO}
-			-DDRIVER_VERSION=${DRIVER_VERSION} -DDRIVER_CHECKSUM=${DRIVER_CHECKSUM}
-			${DRIVER_CMAKE_SOURCE_DIR}
-		WORKING_DIRECTORY ${DRIVER_CMAKE_WORKING_DIR}
-	)
+  # cd /path/to/build && cmake /path/to/source
+  execute_process(COMMAND "${CMAKE_COMMAND}"
+      -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
+      -DDRIVER_REPO=${DRIVER_REPO}
+      -DDRIVER_VERSION=${DRIVER_VERSION}
+      -DDRIVER_CHECKSUM=${DRIVER_CHECKSUM}
+    ${DRIVER_CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${DRIVER_CMAKE_WORKING_DIR})

-	# cmake --build .
-	execute_process(
-		COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${DRIVER_CMAKE_WORKING_DIR}"
-	)
-	set(DRIVER_SOURCE_DIR "${DRIVER_CMAKE_WORKING_DIR}/driver-prefix/src/driver")
+  # cmake --build .
+  execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${DRIVER_CMAKE_WORKING_DIR}")
+  set(DRIVER_SOURCE_DIR "${DRIVER_CMAKE_WORKING_DIR}/driver-prefix/src/driver")
 endif()

 add_definitions(-D_GNU_SOURCE)
--- a/cmake/modules/falco-version.cmake
+++ b/cmake/modules/falco-version.cmake
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 # Retrieve git ref and commit hash
@@ -18,39 +17,33 @@ include(GetVersionFromGit)

 # Get Falco version variable according to git index
 if(NOT FALCO_VERSION)
-	set(FALCO_VERSION "0.0.0")
-	get_version_from_git(FALCO_VERSION "" "")
+  set(FALCO_VERSION "0.0.0")
+  get_version_from_git(FALCO_VERSION "" "")
 endif()

 # Remove the starting "v" in case there is one
 string(REGEX REPLACE "^v(.*)" "\\1" FALCO_VERSION "${FALCO_VERSION}")

 string(REGEX MATCH "^(0|[1-9][0-9]*)" FALCO_VERSION_MAJOR "${FALCO_VERSION}")
-string(REGEX REPLACE "^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\..*" "\\2" FALCO_VERSION_MINOR
-					 "${FALCO_VERSION}"
-)
-string(REGEX REPLACE "^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*).*" "\\3"
-					 FALCO_VERSION_PATCH "${FALCO_VERSION}"
-)
+string(REGEX REPLACE "^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\..*" "\\2" FALCO_VERSION_MINOR "${FALCO_VERSION}")
+string(REGEX REPLACE "^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*).*" "\\3" FALCO_VERSION_PATCH
+                     "${FALCO_VERSION}")
 string(
-	REGEX
-	REPLACE
-		"^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*).*"
-		"\\5"
-		FALCO_VERSION_PRERELEASE
-		"${FALCO_VERSION}"
-)
+  REGEX
+  REPLACE
+    "^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)-((0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*)(\\.(0|[1-9][0-9]*|[0-9]*[a-zA-Z-][0-9a-zA-Z-]*))*).*"
+    "\\5"
+    FALCO_VERSION_PRERELEASE
+    "${FALCO_VERSION}")

 if(FALCO_VERSION_PRERELEASE STREQUAL "${FALCO_VERSION}")
-	set(FALCO_VERSION_PRERELEASE "")
+  set(FALCO_VERSION_PRERELEASE "")
 endif()
 if(NOT FALCO_VERSION_BUILD)
-	string(REGEX REPLACE ".*\\+([0-9a-zA-Z-]+(\\.[0-9a-zA-Z-]+)*)" "\\1" FALCO_VERSION_BUILD
-						 "${FALCO_VERSION}"
-	)
+  string(REGEX REPLACE ".*\\+([0-9a-zA-Z-]+(\\.[0-9a-zA-Z-]+)*)" "\\1" FALCO_VERSION_BUILD "${FALCO_VERSION}")
 endif()
 if(FALCO_VERSION_BUILD STREQUAL "${FALCO_VERSION}")
-	set(FALCO_VERSION_BUILD "")
+  set(FALCO_VERSION_BUILD "")
 endif()

 message(STATUS "Falco version: ${FALCO_VERSION}")
--- a/cmake/modules/falcoctl.cmake
+++ b/cmake/modules/falcoctl.cmake
@@ -2,55 +2,37 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 include(ExternalProject)

-option(ADD_FALCOCTL_DEPENDENCY "Add falcoctl dependency while building falco" ON)
+string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} FALCOCTL_SYSTEM_NAME)

-if(ADD_FALCOCTL_DEPENDENCY)
-	string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} FALCOCTL_SYSTEM_NAME)
+set(FALCOCTL_VERSION "0.8.0")

-	set(FALCOCTL_VERSION "0.11.0")
-
-	message(STATUS "Building with falcoctl: ${FALCOCTL_VERSION}")
-
-	if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-		set(FALCOCTL_SYSTEM_PROC_GO "amd64")
-		set(FALCOCTL_HASH "b9d0e0f50813e7172a945f36f70c5c3c16a677ab4c85b35b6f7a155bc92768fc")
-	else() # aarch64
-		set(FALCOCTL_SYSTEM_PROC_GO "arm64")
-		set(FALCOCTL_HASH "689c625d1d414cbf53d39ef94083a53dda3ea4ac4908799fb85f4519e21442e0")
-	endif()
-
-	ExternalProject_Add(
-		falcoctl
-		URL "https://github.com/falcosecurity/falcoctl/releases/download/v${FALCOCTL_VERSION}/falcoctl_${FALCOCTL_VERSION}_${FALCOCTL_SYSTEM_NAME}_${FALCOCTL_SYSTEM_PROC_GO}.tar.gz"
-		URL_HASH "SHA256=${FALCOCTL_HASH}"
-		CONFIGURE_COMMAND ""
-		BUILD_COMMAND ""
-		INSTALL_COMMAND ""
-	)
-
-	install(
-		PROGRAMS "${PROJECT_BINARY_DIR}/falcoctl-prefix/src/falcoctl/falcoctl"
-		DESTINATION "${FALCO_BIN_DIR}"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
-	install(
-		DIRECTORY
-		DESTINATION "${FALCO_ABSOLUTE_SHARE_DIR}/plugins"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
-else()
-	message(STATUS "Won't build with falcoctl")
+if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+    set(FALCOCTL_SYSTEM_PROC_GO "amd64")
+    set(FALCOCTL_HASH "7b763bfaf38faf582840af22750dca7150d03958a5dc47f6118748713d661589")
+else() # aarch64
+    set(FALCOCTL_SYSTEM_PROC_GO "arm64")
+    set(FALCOCTL_HASH "7f826de7a8a84e65c46a160e7e59d1deca874f39b79a8251721a2669905baf14")
 endif()
+
+ExternalProject_Add(
+        falcoctl
+        URL "https://github.com/falcosecurity/falcoctl/releases/download/v${FALCOCTL_VERSION}/falcoctl_${FALCOCTL_VERSION}_${FALCOCTL_SYSTEM_NAME}_${FALCOCTL_SYSTEM_PROC_GO}.tar.gz"
+        URL_HASH "SHA256=${FALCOCTL_HASH}"
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND "")
+
+install(PROGRAMS "${PROJECT_BINARY_DIR}/falcoctl-prefix/src/falcoctl/falcoctl" DESTINATION "${FALCO_BIN_DIR}" COMPONENT "${FALCO_COMPONENT_NAME}")
+install(DIRECTORY DESTINATION "${FALCO_ABSOLUTE_SHARE_DIR}/plugins" COMPONENT "${FALCO_COMPONENT_NAME}")
--- a/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
+++ b/cmake/modules/falcosecurity-libs-repo/CMakeLists.txt
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #
 cmake_minimum_required(VERSION 3.5.1)

@@ -21,11 +20,11 @@ message(STATUS "Libs repository: ${FALCOSECURITY_LIBS_REPO}")
 message(STATUS "Libs version: ${FALCOSECURITY_LIBS_VERSION}")

 ExternalProject_Add(
-	falcosecurity-libs
-	URL "https://github.com/${FALCOSECURITY_LIBS_REPO}/archive/${FALCOSECURITY_LIBS_VERSION}.tar.gz"
-	URL_HASH "${FALCOSECURITY_LIBS_CHECKSUM}"
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	INSTALL_COMMAND ""
-	TEST_COMMAND ""
+  falcosecurity-libs
+  URL "https://github.com/${FALCOSECURITY_LIBS_REPO}/archive/${FALCOSECURITY_LIBS_VERSION}.tar.gz"
+  URL_HASH "${FALCOSECURITY_LIBS_CHECKSUM}"
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  TEST_COMMAND ""
 )
--- a/cmake/modules/falcosecurity-libs.cmake
+++ b/cmake/modules/falcosecurity-libs.cmake
@@ -2,81 +2,65 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

-set(FALCOSECURITY_LIBS_CMAKE_SOURCE_DIR
-	"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/falcosecurity-libs-repo"
-)
+set(FALCOSECURITY_LIBS_CMAKE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/falcosecurity-libs-repo")
 set(FALCOSECURITY_LIBS_CMAKE_WORKING_DIR "${CMAKE_BINARY_DIR}/falcosecurity-libs-repo")

 file(MAKE_DIRECTORY ${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR})

 # explicitly disable the bundled driver, since we pull it separately
-set(USE_BUNDLED_DRIVER
-	OFF
-	CACHE BOOL ""
-)
+set(USE_BUNDLED_DRIVER OFF CACHE BOOL "")

 if(FALCOSECURITY_LIBS_SOURCE_DIR)
-	set(FALCOSECURITY_LIBS_VERSION "0.0.0-local")
-	message(STATUS "Using local version of falcosecurity/libs: '${FALCOSECURITY_LIBS_SOURCE_DIR}'")
+  set(FALCOSECURITY_LIBS_VERSION "0.0.0-local")
+  message(STATUS "Using local version of falcosecurity/libs: '${FALCOSECURITY_LIBS_SOURCE_DIR}'")
 else()
-	# FALCOSECURITY_LIBS_REPO accepts a repository name (<org name>/<repo name>) alternative to the
-	# falcosecurity/libs repository. In case you want to test against a fork of falcosecurity/libs
-	# just pass the variable - ie., `cmake -DFALCOSECURITY_LIBS_REPO=<your-gh-handle>/libs ..`
-	if(NOT FALCOSECURITY_LIBS_REPO)
-		set(FALCOSECURITY_LIBS_REPO "falcosecurity/libs")
-	endif()
+  # FALCOSECURITY_LIBS_REPO accepts a repository name (<org name>/<repo name>) alternative to the falcosecurity/libs repository.
+  # In case you want to test against a fork of falcosecurity/libs just pass the variable -
+  # ie., `cmake -DFALCOSECURITY_LIBS_REPO=<your-gh-handle>/libs ..`
+  if (NOT FALCOSECURITY_LIBS_REPO)
+    set(FALCOSECURITY_LIBS_REPO "falcosecurity/libs")
+  endif()

-	# FALCOSECURITY_LIBS_VERSION accepts a git reference (branch name, commit hash, or tag) to the
-	# falcosecurity/libs repository. 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.20.0")
-		set(FALCOSECURITY_LIBS_CHECKSUM
-			"SHA256=4ae6ddb42a1012bacd88c63abdaa7bd27ca0143c4721338a22c45597e63bc99d"
-		)
-	endif()
+  # FALCOSECURITY_LIBS_VERSION accepts a git reference (branch name, commit hash, or tag) to the falcosecurity/libs repository.
+  # 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.17.2")
+    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=5c4f0c987272b7d5236f6ab2bbe3906ffdaf76b59817b63cf90cc8c387ab5b15")
+  endif()

-	# cd /path/to/build && cmake /path/to/source
-	execute_process(
-		COMMAND
-			"${CMAKE_COMMAND}" -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
-			-DFALCOSECURITY_LIBS_REPO=${FALCOSECURITY_LIBS_REPO}
-			-DFALCOSECURITY_LIBS_VERSION=${FALCOSECURITY_LIBS_VERSION}
-			-DFALCOSECURITY_LIBS_CHECKSUM=${FALCOSECURITY_LIBS_CHECKSUM}
-			${FALCOSECURITY_LIBS_CMAKE_SOURCE_DIR}
-		WORKING_DIRECTORY ${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR}
-	)
+  # cd /path/to/build && cmake /path/to/source
+  execute_process(COMMAND "${CMAKE_COMMAND}"
+      -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}"
+      -DFALCOSECURITY_LIBS_REPO=${FALCOSECURITY_LIBS_REPO}
+      -DFALCOSECURITY_LIBS_VERSION=${FALCOSECURITY_LIBS_VERSION}
+      -DFALCOSECURITY_LIBS_CHECKSUM=${FALCOSECURITY_LIBS_CHECKSUM}
+    ${FALCOSECURITY_LIBS_CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR})

-	# cmake --build .
-	execute_process(
-		COMMAND "${CMAKE_COMMAND}" --build .
-		WORKING_DIRECTORY "${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR}"
-	)
-	set(FALCOSECURITY_LIBS_SOURCE_DIR
-		"${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR}/falcosecurity-libs-prefix/src/falcosecurity-libs"
-	)
+  # cmake --build .
+  execute_process(COMMAND "${CMAKE_COMMAND}" --build . WORKING_DIRECTORY "${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR}")
+  set(FALCOSECURITY_LIBS_SOURCE_DIR "${FALCOSECURITY_LIBS_CMAKE_WORKING_DIR}/falcosecurity-libs-prefix/src/falcosecurity-libs")
 endif()

 set(LIBS_PACKAGE_NAME "falcosecurity")

 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	add_definitions(-D_GNU_SOURCE)
+  add_definitions(-D_GNU_SOURCE)
+  add_definitions(-DHAS_CAPTURE)
 endif()

 if(MUSL_OPTIMIZED_BUILD)
-	add_definitions(-DMUSL_OPTIMIZED)
+  add_definitions(-DMUSL_OPTIMIZED)
 endif()

 set(SCAP_HOST_ROOT_ENV_VAR_NAME "HOST_ROOT")
@@ -84,60 +68,27 @@ set(SCAP_HOSTNAME_ENV_VAR "FALCO_HOSTNAME")
 set(SINSP_AGENT_CGROUP_MEM_PATH_ENV_VAR "FALCO_CGROUP_MEM_PATH")

 if(NOT LIBS_DIR)
-	set(LIBS_DIR "${FALCOSECURITY_LIBS_SOURCE_DIR}")
+  set(LIBS_DIR "${FALCOSECURITY_LIBS_SOURCE_DIR}")
 endif()

 # configure gVisor support
-set(BUILD_LIBSCAP_GVISOR
-	${BUILD_FALCO_GVISOR}
-	CACHE BOOL ""
-)
+set(BUILD_LIBSCAP_GVISOR ${BUILD_FALCO_GVISOR} CACHE BOOL "")

 # configure modern BPF support
-set(BUILD_LIBSCAP_MODERN_BPF
-	${BUILD_FALCO_MODERN_BPF}
-	CACHE BOOL ""
-)
+set(BUILD_LIBSCAP_MODERN_BPF ${BUILD_FALCO_MODERN_BPF} CACHE BOOL "")

 # explicitly disable the tests/examples of this dependency
-set(CREATE_TEST_TARGETS
-	OFF
-	CACHE BOOL ""
-)
-set(BUILD_LIBSCAP_EXAMPLES
-	OFF
-	CACHE BOOL ""
-)
+set(CREATE_TEST_TARGETS OFF CACHE BOOL "")
+set(BUILD_LIBSCAP_EXAMPLES OFF CACHE BOOL "")

-set(USE_BUNDLED_TBB
-	ON
-	CACHE BOOL ""
-)
-set(USE_BUNDLED_JSONCPP
-	ON
-	CACHE BOOL ""
-)
-set(USE_BUNDLED_VALIJSON
-	ON
-	CACHE BOOL ""
-)
-set(USE_BUNDLED_RE2
-	ON
-	CACHE BOOL ""
-)
-set(USE_BUNDLED_UTHASH
-	ON
-	CACHE BOOL ""
-)
+set(USE_BUNDLED_TBB ON CACHE BOOL "")
+set(USE_BUNDLED_JSONCPP ON CACHE BOOL "")
+set(USE_BUNDLED_VALIJSON ON CACHE BOOL "")
+set(USE_BUNDLED_RE2 ON CACHE BOOL "")
+set(USE_BUNDLED_UTHASH ON CACHE BOOL "")
 if(USE_DYNAMIC_LIBELF)
-	set(USE_BUNDLED_LIBELF
-		OFF
-		CACHE BOOL ""
-	)
-	set(USE_SHARED_LIBELF
-		ON
-		CACHE BOOL ""
-	)
+  set(USE_BUNDLED_LIBELF OFF CACHE BOOL "")
+  set(USE_SHARED_LIBELF ON CACHE BOOL "")
 endif()

 list(APPEND CMAKE_MODULE_PATH "${FALCOSECURITY_LIBS_SOURCE_DIR}/cmake/modules")
@@ -146,18 +97,15 @@ include(CheckSymbolExists)
 check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)

 if(HAVE_STRLCPY)
-	message(
-		STATUS
-			"Existing strlcpy and strlcat found, will *not* use local definition by setting -DHAVE_STRLCPY and -DHAVE_STRLCAT."
-	)
-	add_definitions(-DHAVE_STRLCPY)
-	add_definitions(-DHAVE_STRLCAT)
+  message(STATUS "Existing strlcpy and strlcat found, will *not* use local definition by setting -DHAVE_STRLCPY and -DHAVE_STRLCAT.")
+  add_definitions(-DHAVE_STRLCPY)
+  add_definitions(-DHAVE_STRLCAT)
 else()
-	message(STATUS "No strlcpy and strlcat found, will use local definition")
+  message(STATUS "No strlcpy and strlcat found, will use local definition")
 endif()

 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	include(driver)
+  include(driver)
 endif()
 include(libscap)
 include(libsinsp)
--- a/cmake/modules/jemalloc.cmake
+++ b/cmake/modules/jemalloc.cmake
@@ -1,70 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-#
-# Copyright (C) 2024 The Falco Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
-#
-
-option(USE_BUNDLED_JEMALLOC "Use bundled jemalloc allocator" ${USE_BUNDLED_DEPS})
-
-if(JEMALLOC_INCLUDE)
-	# we already have JEMALLOC
-elseif(NOT USE_BUNDLED_JEMALLOC)
-	find_path(JEMALLOC_INCLUDE jemalloc/jemalloc.h)
-	set(JEMALLOC_INCLUDE ${JEMALLOC_INCLUDE}/jemalloc)
-	if(BUILD_SHARED_LIBS)
-		set(JEMALLOC_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
-	else()
-		set(JEMALLOC_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
-	endif()
-	find_library(JEMALLOC_LIB NAMES libjemalloc${JEMALLOC_LIB_SUFFIX})
-	if(JEMALLOC_LIB)
-		message(STATUS "Found JEMALLOC: include: ${JEMALLOC_INCLUDE}, lib: ${JEMALLOC_LIB}")
-	else()
-		message(FATAL_ERROR "Couldn't find system jemalloc")
-	endif()
-else()
-	if(BUILD_SHARED_LIBS)
-		set(JEMALLOC_LIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
-	else()
-		set(JEMALLOC_LIB_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX})
-	endif()
-	set(JEMALLOC_SRC "${PROJECT_BINARY_DIR}/jemalloc-prefix/src")
-	set(JEMALLOC_LIB "${JEMALLOC_SRC}/jemalloc/lib/libjemalloc${JEMALLOC_LIB_SUFFIX}")
-	set(JEMALLOC_INCLUDE "${JEMALLOC_SRC}/jemalloc/include/jemalloc")
-	ExternalProject_Add(
-		jemalloc
-		PREFIX "${PROJECT_BINARY_DIR}/jemalloc-prefix"
-		URL "https://github.com/jemalloc/jemalloc/archive/refs/tags/5.3.0.tar.gz"
-		URL_HASH "SHA256=ef6f74fd45e95ee4ef7f9e19ebe5b075ca6b7fbe0140612b2a161abafb7ee179"
-		CONFIGURE_COMMAND ./autogen.sh --enable-prof --disable-libdl
-		BUILD_IN_SOURCE 1
-		BUILD_COMMAND make build_lib_static
-		INSTALL_COMMAND ""
-		UPDATE_COMMAND ""
-		BUILD_BYPRODUCTS ${JEMALLOC_LIB}
-	)
-	message(STATUS "Using bundled jemalloc: include: ${JEMALLOC_INCLUDE}, lib: ${JEMALLOC_LIB}")
-	install(
-		FILES "${JEMALLOC_LIB}"
-		DESTINATION "${CMAKE_INSTALL_LIBDIR}/${LIBS_PACKAGE_NAME}"
-		COMPONENT "libs-deps"
-	)
-endif()
-
-# We add a custom target, in this way we can always depend on `jemalloc` without distinguishing
-# between "bundled" and "not-bundled" case
-if(NOT TARGET jemalloc)
-	add_custom_target(jemalloc)
-endif()
-
-include_directories(${JEMALLOC_INCLUDE})
-add_compile_definitions(HAS_JEMALLOC)
--- a/cmake/modules/njson.cmake
+++ b/cmake/modules/njson.cmake
@@ -2,27 +2,25 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 option(USE_BUNDLED_NLOHMANN_JSON "Enable building of the bundled nlohmann-json" ${USE_BUNDLED_DEPS})

 if(USE_BUNDLED_NLOHMANN_JSON)
-	include(FetchContent)
-	FetchContent_Declare(
-		nlohmann_json
-		URL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz
-		URL_HASH SHA256=0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406
-	)
-	FetchContent_MakeAvailable(nlohmann_json)
+    include(FetchContent)
+    FetchContent_Declare(nlohmann_json
+        URL https://github.com/nlohmann/json/archive/v3.11.3.tar.gz
+        URL_HASH SHA256=0d8ef5af7f9794e3263480193c491549b2ba6cc74bb018906202ada498a79406
+    )
+    FetchContent_MakeAvailable(nlohmann_json)
 else()
-	find_package(nlohmann_json CONFIG REQUIRED)
+    find_package(nlohmann_json CONFIG REQUIRED)
 endif()
--- a/cmake/modules/rules.cmake
+++ b/cmake/modules/rules.cmake
@@ -2,47 +2,36 @@
 #
 # Copyright (C) 2024 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 include(GNUInstallDirs)
 include(ExternalProject)

-if(NOT DEFINED FALCOSECURITY_RULES_FALCO_PATH)
-	# falco_rules.yaml
-	set(FALCOSECURITY_RULES_FALCO_VERSION "falco-rules-3.2.0")
-	set(FALCOSECURITY_RULES_FALCO_CHECKSUM
-		"SHA256=b3990bf0209cfbf6a903b361e458a1f5851a9a5aeee808ad26a5ddbe1377157d"
-	)
-	set(FALCOSECURITY_RULES_FALCO_PATH
-		"${PROJECT_BINARY_DIR}/falcosecurity-rules-falco-prefix/src/falcosecurity-rules-falco/falco_rules.yaml"
-	)
-	ExternalProject_Add(
-		falcosecurity-rules-falco
-		URL "https://download.falco.org/rules/${FALCOSECURITY_RULES_FALCO_VERSION}.tar.gz"
-		URL_HASH "${FALCOSECURITY_RULES_FALCO_CHECKSUM}"
-		CONFIGURE_COMMAND ""
-		BUILD_COMMAND ""
-		INSTALL_COMMAND ""
-		TEST_COMMAND ""
-	)
-endif()
+# falco_rules.yaml
+set(FALCOSECURITY_RULES_FALCO_VERSION "falco-rules-3.1.0")
+set(FALCOSECURITY_RULES_FALCO_CHECKSUM "SHA256=3b617920c0b66128627613e591a954eb9572747a4c287bc13b53b38786250162")
+set(FALCOSECURITY_RULES_FALCO_PATH "${PROJECT_BINARY_DIR}/falcosecurity-rules-falco-prefix/src/falcosecurity-rules-falco/falco_rules.yaml")
+ExternalProject_Add(
+  falcosecurity-rules-falco
+  URL "https://download.falco.org/rules/${FALCOSECURITY_RULES_FALCO_VERSION}.tar.gz"
+  URL_HASH "${FALCOSECURITY_RULES_FALCO_CHECKSUM}"
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  INSTALL_COMMAND ""
+  TEST_COMMAND ""
+)

-if(NOT DEFINED FALCOSECURITY_RULES_LOCAL_PATH)
-	# falco_rules.local.yaml
-	set(FALCOSECURITY_RULES_LOCAL_PATH
-		"${PROJECT_BINARY_DIR}/falcosecurity-rules-local-prefix/falco_rules.local.yaml"
-	)
-	file(WRITE "${FALCOSECURITY_RULES_LOCAL_PATH}" "# Your custom rules!\n")
-endif()
+# falco_rules.local.yaml
+set(FALCOSECURITY_RULES_LOCAL_PATH "${PROJECT_BINARY_DIR}/falcosecurity-rules-local-prefix/falco_rules.local.yaml")
+file(WRITE "${FALCOSECURITY_RULES_LOCAL_PATH}" "# Your custom rules!\n")

 if(NOT DEFINED FALCO_ETC_DIR)
 	set(FALCO_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falco")
@@ -53,43 +42,34 @@ if(WIN32 OR APPLE)
 endif()

 if(NOT DEFINED FALCO_RULES_DEST_FILENAME)
-	set(FALCO_RULES_DEST_FILENAME "falco_rules.yaml")
-	set(FALCO_LOCAL_RULES_DEST_FILENAME "falco_rules.local.yaml")
+  set(FALCO_RULES_DEST_FILENAME "falco_rules.yaml")
+  set(FALCO_LOCAL_RULES_DEST_FILENAME "falco_rules.local.yaml")
 endif()

-if(DEFINED FALCO_COMPONENT) # Allow a slim version of Falco to be embedded in other projects,
-	# intentionally *not* installing all rulesets.
-	install(
-		FILES "${FALCOSECURITY_RULES_FALCO_PATH}"
-		COMPONENT "${FALCO_COMPONENT}"
-		DESTINATION "${FALCO_ETC_DIR}"
-		RENAME "${FALCO_RULES_DEST_FILENAME}"
-	)
+if(DEFINED FALCO_COMPONENT) # Allow a slim version of Falco to be embedded in other projects, intentionally *not* installing all rulesets.
+  install(
+    FILES "${FALCOSECURITY_RULES_FALCO_PATH}"
+    COMPONENT "${FALCO_COMPONENT}"
+    DESTINATION "${FALCO_ETC_DIR}"
+    RENAME "${FALCO_RULES_DEST_FILENAME}")

-	install(
-		FILES "${FALCOSECURITY_RULES_LOCAL_PATH}"
-		COMPONENT "${FALCO_COMPONENT}"
-		DESTINATION "${FALCO_ETC_DIR}"
-		RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}"
-	)
+  install(
+    FILES "${FALCOSECURITY_RULES_LOCAL_PATH}"
+    COMPONENT "${FALCO_COMPONENT}"
+    DESTINATION "${FALCO_ETC_DIR}"
+    RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}")
 else() # Default Falco installation
-	install(
-		FILES "${FALCOSECURITY_RULES_FALCO_PATH}"
-		DESTINATION "${FALCO_ETC_DIR}"
-		RENAME "${FALCO_RULES_DEST_FILENAME}"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+  install(
+    FILES "${FALCOSECURITY_RULES_FALCO_PATH}"
+    DESTINATION "${FALCO_ETC_DIR}"
+    RENAME "${FALCO_RULES_DEST_FILENAME}"
+    COMPONENT "${FALCO_COMPONENT_NAME}")

-	install(
-		FILES "${FALCOSECURITY_RULES_LOCAL_PATH}"
-		DESTINATION "${FALCO_ETC_DIR}"
-		RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+  install(
+    FILES "${FALCOSECURITY_RULES_LOCAL_PATH}"
+    DESTINATION "${FALCO_ETC_DIR}"
+    RENAME "${FALCO_LOCAL_RULES_DEST_FILENAME}"
+    COMPONENT "${FALCO_COMPONENT_NAME}")

-	install(
-		DIRECTORY
-		DESTINATION "${FALCO_ETC_DIR}/rules.d"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+  install(DIRECTORY DESTINATION "${FALCO_ETC_DIR}/rules.d" COMPONENT "${FALCO_COMPONENT_NAME}")
 endif()
--- a/cmake/modules/static-analysis.cmake
+++ b/cmake/modules/static-analysis.cmake
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 # create the reports folder
@@ -23,42 +22,35 @@ find_program(CPPCHECK cppcheck)
 find_program(CPPCHECK_HTMLREPORT cppcheck-htmlreport)

 if(NOT CPPCHECK)
-	message(
-		STATUS
-			"cppcheck command not found, static code analysis using cppcheck will not be available."
-	)
+  message(STATUS "cppcheck command not found, static code analysis using cppcheck will not be available.")
 else()
-	message(STATUS "cppcheck found at: ${CPPCHECK}")
-	# we are aware that cppcheck can be run along with the software compilation in a single step
-	# using the CMAKE_CXX_CPPCHECK variables. However, for practical needs we want to keep the two
-	# things separated and have a specific target for it. Our cppcheck target reads the compilation
-	# database produced by CMake
-	set(CMAKE_EXPORT_COMPILE_COMMANDS On)
-	add_custom_target(
-		cppcheck
-		COMMAND
-			${CPPCHECK} "--enable=all" "--force" "--inconclusive" "--inline-suppr" # allows to
-			# specify suppressions directly in source code
-			"--xml" # we want to generate a report
-			"--output-file=${CMAKE_CURRENT_BINARY_DIR}/static-analysis-reports/cppcheck/cppcheck.xml" # generate
-			# the report under the reports folder in the build folder
-			"-i${CMAKE_CURRENT_BINARY_DIR}" # exclude the build folder
-			"${CMAKE_SOURCE_DIR}"
-	)
+  message(STATUS "cppcheck found at: ${CPPCHECK}")
+  # we are aware that cppcheck can be run
+  # along with the software compilation in a single step
+  # using the CMAKE_CXX_CPPCHECK variables.
+  # However, for practical needs we want to keep the
+  # two things separated and have a specific target for it.
+  # Our cppcheck target reads the compilation database produced by CMake
+  set(CMAKE_EXPORT_COMPILE_COMMANDS On)
+  add_custom_target(
+      cppcheck
+      COMMAND ${CPPCHECK}
+      "--enable=all"
+      "--force"
+      "--inconclusive"
+      "--inline-suppr" # allows to specify suppressions directly in source code
+      "--xml" # we want to generate a report
+      "--output-file=${CMAKE_CURRENT_BINARY_DIR}/static-analysis-reports/cppcheck/cppcheck.xml" # generate the report under the reports folder in the build folder
+      "-i${CMAKE_CURRENT_BINARY_DIR}"# exclude the build folder
+      "${CMAKE_SOURCE_DIR}"
+  )
 endif() # CPPCHECK

 if(NOT CPPCHECK_HTMLREPORT)
-	message(
-		STATUS
-			"cppcheck-htmlreport command not found, will not be able to produce html reports for cppcheck results"
-	)
+  message(STATUS "cppcheck-htmlreport command not found, will not be able to produce html reports for cppcheck results")
 else()
-	message(STATUS "cppcheck-htmlreport found at: ${CPPCHECK_HTMLREPORT}")
-	add_custom_target(
-		cppcheck_htmlreport
-		COMMAND
-			${CPPCHECK_HTMLREPORT} --title=${CMAKE_PROJECT_NAME}
-			--report-dir=${CMAKE_CURRENT_BINARY_DIR}/static-analysis-reports/cppcheck
-			--file=static-analysis-reports/cppcheck/cppcheck.xml
-	)
+  message(STATUS "cppcheck-htmlreport found at: ${CPPCHECK_HTMLREPORT}")
+  add_custom_target(
+    cppcheck_htmlreport
+    COMMAND ${CPPCHECK_HTMLREPORT} --title=${CMAKE_PROJECT_NAME} --report-dir=${CMAKE_CURRENT_BINARY_DIR}/static-analysis-reports/cppcheck --file=static-analysis-reports/cppcheck/cppcheck.xml)
 endif() # CPPCHECK_HTMLREPORT
--- a/cmake/modules/yaml-cpp.cmake
+++ b/cmake/modules/yaml-cpp.cmake
@@ -2,27 +2,25 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 option(USE_BUNDLED_YAMLCPP "Enable building of the bundled yamlcpp" ${USE_BUNDLED_DEPS})

 if(USE_BUNDLED_YAMLCPP)
-	include(FetchContent)
-	FetchContent_Declare(
-		yamlcpp
-		URL https://github.com/jbeder/yaml-cpp/archive/c2bec4c755c67ad86185a2a264996137904fb712.tar.gz
-		URL_HASH SHA256=faea1ffdbad81b958b3b45a63ba667f4db53a3fffb983ca5df4745cf90044797
-	)
-	FetchContent_MakeAvailable(yamlcpp)
+    include(FetchContent)
+    FetchContent_Declare(yamlcpp
+        URL https://github.com/jbeder/yaml-cpp/archive/refs/tags/0.8.0.tar.gz
+        URL_HASH SHA256=fbe74bbdcee21d656715688706da3c8becfd946d92cd44705cc6098bb23b3a16
+    )
+    FetchContent_MakeAvailable(yamlcpp)
 else()
-	find_package(yaml-cpp CONFIG REQUIRED)
+    find_package(yaml-cpp CONFIG REQUIRED)
 endif()
--- a/docker/README.md
+++ b/docker/README.md
@@ -4,9 +4,15 @@ This directory contains various ways to package Falco as a container and related

 ## Currently Supported Images

-| Name                                                                                                                                                                                                                                                                                                                                                                                       | Directory                   | Description                                                                                                                                                                                                                |
-|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [falcosecurity/falco:latest](https://hub.docker.com/repository/docker/falcosecurity/falco), [falcosecurity/falco:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco), [falcosecurity/falco:master](https://hub.docker.com/repository/docker/falcosecurity/falco)                                                                                                          | docker/falco                | Distroless image based on the latest released tar.gz of Falco. No tools are included in the image.                                                                              |
-| [falcosecurity/falco:latest-debian](https://hub.docker.com/repository/docker/falcosecurity/falco), [falcosecurity/falco:_tag_-debian](https://hub.docker.com/repository/docker/falcosecurity/falco), [falcosecurity/falco:master-debian](https://hub.docker.com/repository/docker/falcosecurity/falco)                                                                                     | docker/falco-debian         | Debian-based image. Include some tools (i.e. jq, curl). No driver-building toolchain support. |
-| [falcosecurity/falco-driver-loader:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader), [falcosecurity/falco-driver-loader:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader), [falcosecurity/falco-driver-loader:master](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader)                      | docker/driver-loader        | Based on falcosecurity/falco:x.y.z-debian (see above) plus the driver building toolchain support and falcoctl. This is intended to be used as an installer or an init container when modern eBPF cannot be used.                     |
-| [falcosecurity/falco-driver-loader:latest-buster](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader), [falcosecurity/falco-driver-loader:_tag_-buster](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader), [falcosecurity/falco-driver-loader:master-debian](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader) | docker/driver-loader-buster | Similar to falcosecurity/falco-driver-loader (see above) but based on a legacy Debian image (i.e. buster ). Recommended only for old kernel versions.                                                                      |
+| Name | Directory | Description |
+|---|---|---|
+| [falcosecurity/falco:latest](https://hub.docker.com/repository/docker/falcosecurity/falco), [falcosecurity/falco:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco), [falcosecurity/falco:master](https://hub.docker.com/repository/docker/falcosecurity/falco) | docker/falco | Falco (DEB built from git tag or from the master) with all the building toolchain. |
+| [falcosecurity/falco-driver-loader:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader), [falcosecurity/falco-driver-loader:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader), [falcosecurity/falco-driver-loader:master](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader) | docker/driver-loader | `falco-driver-loader` as entrypoint with the building toolchain. |
+| [falcosecurity/falco-no-driver:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-no-driver), [falcosecurity/falco-no-driver:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco-no-driver),[falcosecurity/falco-no-driver:master](https://hub.docker.com/repository/docker/falcosecurity/falco-no-driver) | docker/no-driver | Falco (TGZ built from git tag or from the master) without the building toolchain. |
+| [falcosecurity/falco-driver-loader-legacy:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader-legacy), [falcosecurity/falco-driver-loader-legacy:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco-driver-loader-legacy) | docker/driver-loader-legacy | `falco-driver-loader` as entrypoint with the legacy building toolchain. Recommended for kernels < 4.0 |
+
+## Experimental Images
+
+| Name | Directory | Description |
+|---|---|---|
+| [falcosecurity/falco-distroless:latest](https://hub.docker.com/repository/docker/falcosecurity/falco-distroless), [falcosecurity/falco-distroless:_tag_](https://hub.docker.com/repository/docker/falcosecurity/falco-distroless),[falcosecurity/falco-distroless:master](https://hub.docker.com/repository/docker/falcosecurity/falco-distroless) | docker/no-driver/Dockerfile.distroless | Falco without the building toolchain built from a distroless base image. This results in a smaller image that has less potentially vulnerable components. |
--- a/docker/docker-compose/README.md
+++ b/docker/docker-compose/README.md
@@ -1,17 +0,0 @@
-# Warning
-
-This environment is provided for demonstration purposes only and does not represent a production ready deployment of Falco.
-
-# Components
-The components that this docker-compose file spins up are [Falco](https://falco.org/), [falcosidekick](https://github.com/falcosecurity/falcosidekick), [falcosidekick-ui](https://github.com/falcosecurity/falcosidekick-ui) and a [redis](https://redis.io/) database.
-
-# Running
-To start this environment run `docker-compose up`.
-Note: You may need to use sudo for Falco to start correctly.
-
-# Cleaning up
-
-To clean up run `docker-compose rm`.
-
-# Generating events
-If you'd like to generate events that will trigger rules and show up in the UI you can run `docker run -it --rm falcosecurity/event-generator run syscall --loop`
--- a/docker/docker-compose/config/http_output.yml
+++ b/docker/docker-compose/config/http_output.yml
@@ -1,11 +0,0 @@
-# [Stable] `http_output`
-#
-# Send logs to an HTTP endpoint or webhook.
-#
-# When using falcosidekick, it is necessary to set `json_output` to true.
-json_output: true
-json_include_output_property: true
-http_output:
-  enabled: true
-  url: "http://falco-sidekick:2801/"
-  
--- a/docker/docker-compose/docker-compose.yaml
+++ b/docker/docker-compose/docker-compose.yaml
@@ -1,34 +0,0 @@
-version: "3"
-services:
-  falco:
-    container_name: falco
-    cap_drop:
-      - all
-    cap_add:
-      - sys_admin
-      - sys_resource
-      - sys_ptrace
-    volumes:
-      - /var/run/docker.sock:/host/var/run/docker.sock
-      - /proc:/host/proc:ro
-      - /etc:/host/etc:ro
-      - ./config/http_output.yml:/etc/falco/config.d/http_output.yml
-    image: falcosecurity/falco:latest
-
-  sidekick:
-    container_name: falco-sidekick
-    image: falcosecurity/falcosidekick
-    environment:
-      WEBUI_URL: http://falco-webui:2802
-
-  webui:
-    container_name: falco-webui
-    image: falcosecurity/falcosidekick-ui:2.2.0
-    ports:
-      - 2802:2802
-    depends_on:
-      - redis
-    command: ['-r', 'redis:6379', '-d']
-
-  redis:
-    image: redis/redis-stack:7.2.0-v11
--- a/docker/driver-loader-legacy/Dockerfile
+++ b/docker/driver-loader-legacy/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:buster
 LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 LABEL org.opencontainers.image.source="https://github.com/falcosecurity/falco"

-LABEL usage="docker run -i -t --privileged -v /root/.falco:/root/.falco -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro falcosecurity/falco-driver-loader:latest-buster [driver] [options]"
+LABEL usage="docker run -i -t --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc --name NAME IMAGE"

 ARG TARGETARCH

@@ -31,6 +31,7 @@ RUN apt-get update \
 	gcc \
 	jq \
 	libc6-dev \
+	libelf-dev \
 	libssl-dev \
 	llvm-7 \
 	netcat \
@@ -40,8 +41,8 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*

 RUN if [ "$TARGETARCH" = "amd64" ]; \
-	then apt-get install -y --no-install-recommends libmpx2; \
-	fi
+    then apt-get install -y --no-install-recommends libmpx2; \
+    fi

 # gcc 6 is no longer included in debian stable, but we need it to
 # build kernel modules on the default debian-based ami used by
@@ -50,7 +51,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; \
 # or so.

 RUN if [ "$TARGETARCH" = "amd64" ]; then curl -L -o libcilkrts5_6.3.0-18_${TARGETARCH}.deb https://download.falco.org/dependencies/libcilkrts5_6.3.0-18_${TARGETARCH}.deb; fi; \
-	curl -L -o cpp-6_6.3.0-18_${TARGETARCH}.deb https://download.falco.org/dependencies/cpp-6_6.3.0-18_${TARGETARCH}.deb \
+    curl -L -o cpp-6_6.3.0-18_${TARGETARCH}.deb https://download.falco.org/dependencies/cpp-6_6.3.0-18_${TARGETARCH}.deb \
 	&& curl -L -o gcc-6-base_6.3.0-18_${TARGETARCH}.deb https://download.falco.org/dependencies/gcc-6-base_6.3.0-18_${TARGETARCH}.deb \
 	&& curl -L -o gcc-6_6.3.0-18_${TARGETARCH}.deb https://download.falco.org/dependencies/gcc-6_6.3.0-18_${TARGETARCH}.deb \
 	&& curl -L -o libasan3_6.3.0-18_${TARGETARCH}.deb https://download.falco.org/dependencies/libasan3_6.3.0-18_${TARGETARCH}.deb \
@@ -59,8 +60,8 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then curl -L -o libcilkrts5_6.3.0-18_${TARGE
 	&& curl -L -o libmpfr4_3.1.3-2_${TARGETARCH}.deb https://download.falco.org/dependencies/libmpfr4_3.1.3-2_${TARGETARCH}.deb \
 	&& curl -L -o libisl15_0.18-1_${TARGETARCH}.deb https://download.falco.org/dependencies/libisl15_0.18-1_${TARGETARCH}.deb \
 	&& dpkg -i cpp-6_6.3.0-18_${TARGETARCH}.deb gcc-6-base_6.3.0-18_${TARGETARCH}.deb gcc-6_6.3.0-18_${TARGETARCH}.deb libasan3_6.3.0-18_${TARGETARCH}.deb; \
-	if [ "$TARGETARCH" = "amd64" ]; then dpkg -i libcilkrts5_6.3.0-18_${TARGETARCH}.deb; fi; \
-	dpkg -i libgcc-6-dev_6.3.0-18_${TARGETARCH}.deb libubsan0_6.3.0-18_${TARGETARCH}.deb libmpfr4_3.1.3-2_${TARGETARCH}.deb libisl15_0.18-1_${TARGETARCH}.deb \
+    if [ "$TARGETARCH" = "amd64" ]; then dpkg -i libcilkrts5_6.3.0-18_${TARGETARCH}.deb; fi; \
+    dpkg -i libgcc-6-dev_6.3.0-18_${TARGETARCH}.deb libubsan0_6.3.0-18_${TARGETARCH}.deb libmpfr4_3.1.3-2_${TARGETARCH}.deb libisl15_0.18-1_${TARGETARCH}.deb \
 	&& rm -f cpp-6_6.3.0-18_${TARGETARCH}.deb gcc-6-base_6.3.0-18_${TARGETARCH}.deb gcc-6_6.3.0-18_${TARGETARCH}.deb libasan3_6.3.0-18_${TARGETARCH}.deb libcilkrts5_6.3.0-18_${TARGETARCH}.deb libgcc-6-dev_6.3.0-18_${TARGETARCH}.deb libubsan0_6.3.0-18_${TARGETARCH}.deb libmpfr4_3.1.3-2_${TARGETARCH}.deb libisl15_0.18-1_${TARGETARCH}.deb

 # gcc 5 is no longer included in debian stable, but we need it to
@@ -69,15 +70,15 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then curl -L -o libcilkrts5_6.3.0-18_${TARGE
 # snapshots with the prefix https://snapshot.debian.org/archive/debian/20190122T000000Z.

 RUN if [ "$TARGETARCH" = "amd64" ]; then curl -L -o libmpx0_5.5.0-12_${TARGETARCH}.deb https://download.falco.org/dependencies/libmpx0_5.5.0-12_${TARGETARCH}.deb; fi; \
-	curl -L -o cpp-5_5.5.0-12_${TARGETARCH}.deb https://download.falco.org/dependencies/cpp-5_5.5.0-12_${TARGETARCH}.deb \
+    curl -L -o cpp-5_5.5.0-12_${TARGETARCH}.deb https://download.falco.org/dependencies/cpp-5_5.5.0-12_${TARGETARCH}.deb \
 	&& curl -L -o gcc-5-base_5.5.0-12_${TARGETARCH}.deb https://download.falco.org/dependencies/gcc-5-base_5.5.0-12_${TARGETARCH}.deb \
 	&& curl -L -o gcc-5_5.5.0-12_${TARGETARCH}.deb https://download.falco.org/dependencies/gcc-5_5.5.0-12_${TARGETARCH}.deb \
 	&& curl -L -o libasan2_5.5.0-12_${TARGETARCH}.deb	https://download.falco.org/dependencies/libasan2_5.5.0-12_${TARGETARCH}.deb \
 	&& curl -L -o libgcc-5-dev_5.5.0-12_${TARGETARCH}.deb https://download.falco.org/dependencies/libgcc-5-dev_5.5.0-12_${TARGETARCH}.deb \
 	&& curl -L -o libisl15_0.18-4_${TARGETARCH}.deb https://download.falco.org/dependencies/libisl15_0.18-4_${TARGETARCH}.deb \
 	&& dpkg -i cpp-5_5.5.0-12_${TARGETARCH}.deb gcc-5-base_5.5.0-12_${TARGETARCH}.deb gcc-5_5.5.0-12_${TARGETARCH}.deb libasan2_5.5.0-12_${TARGETARCH}.deb; \
-	if [ "$TARGETARCH" = "amd64" ]; then dpkg -i libmpx0_5.5.0-12_${TARGETARCH}.deb; fi; \
-	dpkg -i libgcc-5-dev_5.5.0-12_${TARGETARCH}.deb libisl15_0.18-4_${TARGETARCH}.deb \
+    if [ "$TARGETARCH" = "amd64" ]; then dpkg -i libmpx0_5.5.0-12_${TARGETARCH}.deb; fi; \
+    dpkg -i libgcc-5-dev_5.5.0-12_${TARGETARCH}.deb libisl15_0.18-4_${TARGETARCH}.deb \
 	&& rm -f cpp-5_5.5.0-12_${TARGETARCH}.deb gcc-5-base_5.5.0-12_${TARGETARCH}.deb gcc-5_5.5.0-12_${TARGETARCH}.deb libasan2_5.5.0-12_${TARGETARCH}.deb libgcc-5-dev_5.5.0-12_${TARGETARCH}.deb libisl15_0.18-4_${TARGETARCH}.deb libmpx0_5.5.0-12_${TARGETARCH}.deb

 # Since our base Debian image ships with GCC 7 which breaks older kernels, revert the
@@ -112,10 +113,10 @@ RUN rm -df /lib/modules \
 # forcibly install binutils 2.30-22 instead.

 RUN if [ "$TARGETARCH" = "amd64" ] ; then \
-	curl -L -o binutils-x86-64-linux-gnu_2.30-22_${TARGETARCH}.deb https://download.falco.org/dependencies/binutils-x86-64-linux-gnu_2.30-22_${TARGETARCH}.deb; \
-	else  \
-	curl -L -o  binutils-aarch64-linux-gnu_2.30-22_${TARGETARCH}.deb https://download.falco.org/dependencies/binutils-aarch64-linux-gnu_2.30-22_${TARGETARCH}.deb; \
-	fi
+    curl -L -o binutils-x86-64-linux-gnu_2.30-22_${TARGETARCH}.deb https://download.falco.org/dependencies/binutils-x86-64-linux-gnu_2.30-22_${TARGETARCH}.deb; \
+    else  \
+    curl -L -o  binutils-aarch64-linux-gnu_2.30-22_${TARGETARCH}.deb https://download.falco.org/dependencies/binutils-aarch64-linux-gnu_2.30-22_${TARGETARCH}.deb; \
+    fi

 RUN curl -L -o binutils_2.30-22_${TARGETARCH}.deb https://download.falco.org/dependencies/binutils_2.30-22_${TARGETARCH}.deb \
 	&& curl -L -o libbinutils_2.30-22_${TARGETARCH}.deb https://download.falco.org/dependencies/libbinutils_2.30-22_${TARGETARCH}.deb \
--- a/docker/driver-loader-legacy/docker-entrypoint.sh
+++ b/docker/driver-loader-legacy/docker-entrypoint.sh
@@ -21,7 +21,7 @@
 print_usage() {
 	echo ""
 	echo "Usage:"
-	echo "  docker run -i -t --privileged -v /root/.falco:/root/.falco -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro falcosecurity/falco-driver-loader:latest-buster [driver] [options]"
+	echo "  docker run -i -t --privileged -v /root/.falco:/root/.falco -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro falcosecurity/falco-driver-loader-legacy:latest [driver] [options]"
 	echo ""
 	echo "Available drivers:"
 	echo "  auto	       leverage automatic driver selection logic (default)"
--- a/docker/driver-loader/Dockerfile
+++ b/docker/driver-loader/Dockerfile
@@ -1,46 +1,14 @@
 ARG FALCO_IMAGE_TAG=latest
-FROM docker.io/falcosecurity/falco:${FALCO_IMAGE_TAG}-debian
+FROM docker.io/falcosecurity/falco:${FALCO_IMAGE_TAG}

 LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 LABEL org.opencontainers.image.source="https://github.com/falcosecurity/falco"

-LABEL usage="docker run -i -t --privileged -v /root/.falco:/root/.falco -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro falcosecurity/falco-driver-loader:latest [driver] [options]"
+LABEL usage="docker run -i -t --privileged -v /root/.falco:/root/.falco -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro --name NAME IMAGE"

 ENV HOST_ROOT /host
 ENV HOME /root

-RUN cp /etc/skel/.bashrc /root && cp /etc/skel/.profile /root
-
-RUN apt-get update \
-	&& apt-get install -y --no-install-recommends \
-	bc \
-	bison \
-	ca-certificates \
-	clang \
-	curl \
-	dkms \
-	dwarves \
-	flex \
-	gcc \
-	gcc-11 \
-	gnupg2 \
-	jq \
-	libc6-dev \
-	libssl-dev \
-	llvm \
-	make \
-	netcat-openbsd \
-	patchelf \
-	xz-utils \
-	zstd \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Some base images have an empty /lib/modules by default
-# If it's not empty, docker build will fail instead of
-# silently overwriting the existing directory
-RUN rm -df /lib/modules \
-	&& ln -s $HOST_ROOT/lib/modules /lib/modules
-
 COPY ./docker-entrypoint.sh /

 ENTRYPOINT ["/docker-entrypoint.sh"]
--- a/docker/driver-loader/docker-entrypoint.sh
+++ b/docker/driver-loader/docker-entrypoint.sh
@@ -50,7 +50,6 @@ echo "* Setting up /usr/src links from host"

 for i in "$HOST_ROOT/usr/src"/*
 do
-    [[ -e $i ]] || continue
    base=$(basename "$i")
    ln -s "$i" "/usr/src/$base"
 done
--- a/docker/falco-debian/Dockerfile
+++ b/docker/falco-debian/Dockerfile
@@ -1,31 +0,0 @@
-FROM debian:12-slim
-
-LABEL maintainer="cncf-falco-dev@lists.cncf.io"
-LABEL org.opencontainers.image.source="https://github.com/falcosecurity/falco/docker/falco-debian"
-
-LABEL usage="docker run -i -t --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /proc:/host/proc:ro -v /etc:/host/etc:ro falcosecurity/falco:latest-debian"
-
-ARG FALCO_VERSION
-ARG VERSION_BUCKET=deb
-
-ENV FALCO_VERSION=${FALCO_VERSION}
-ENV VERSION_BUCKET=${VERSION_BUCKET}
-
-ENV HOST_ROOT /host
-ENV HOME /root
-
-RUN apt-get -y update && apt-get -y install ca-certificates curl jq ca-certificates gnupg2 \
-	&& apt clean -y && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /
-
-RUN curl -s https://falco.org/repo/falcosecurity-packages.asc | apt-key add - \
-	&& echo "deb https://download.falco.org/packages/${VERSION_BUCKET} stable main" | tee -a /etc/apt/sources.list.d/falcosecurity.list \
-	&& apt-get update -y \
-	&& if [ "$FALCO_VERSION" = "latest" ]; then FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco; else FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco=${FALCO_VERSION}; fi \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN sed -i -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' /etc/falco/falco.yaml
-
-CMD ["/usr/bin/falco"]
--- a/docker/falco/Dockerfile
+++ b/docker/falco/Dockerfile
@@ -1,36 +1,67 @@
-FROM cgr.dev/chainguard/wolfi-base
+FROM debian:bookworm

 LABEL maintainer="cncf-falco-dev@lists.cncf.io"
 LABEL org.opencontainers.image.source="https://github.com/falcosecurity/falco"

-LABEL usage="docker run -i -t --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /proc:/host/proc:ro  -v /etc:/host/etc:ro falcosecurity/falco:latest"
-# NOTE: for the "least privileged" use case, please refer to the official documentation
+LABEL usage="docker run -i -t --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc --name NAME IMAGE"

-ARG FALCO_VERSION
-ARG VERSION_BUCKET=bin
+ARG TARGETARCH
+
+ARG FALCO_VERSION=latest
+ARG VERSION_BUCKET=deb
+ENV VERSION_BUCKET=${VERSION_BUCKET}

 ENV FALCO_VERSION=${FALCO_VERSION}
-ENV VERSION_BUCKET=${VERSION_BUCKET}
 ENV HOST_ROOT /host
 ENV HOME /root

-RUN apk update && apk add curl ca-certificates jq libstdc++
+RUN cp /etc/skel/.bashrc /root && cp /etc/skel/.profile /root

-WORKDIR /
+RUN apt-get update \
+	&& apt-get install -y --no-install-recommends \
+	bc \
+	bison \
+	ca-certificates \
+	clang \
+	curl \
+	dkms \
+	dwarves \
+	flex \
+	gcc \
+	gcc-11 \
+	gnupg2 \
+	jq \
+	libc6-dev \
+	libelf-dev \
+	libssl-dev \
+	llvm \
+	make \
+	netcat-openbsd \
+	patchelf \
+	xz-utils \
+	zstd \
+	&& rm -rf /var/lib/apt/lists/*

-RUN FALCO_VERSION_URLENCODED=$(echo -n ${FALCO_VERSION}|jq -sRr @uri) && \
-    curl -L -o falco.tar.gz \
-    https://download.falco.org/packages/${VERSION_BUCKET}/$(uname -m)/falco-${FALCO_VERSION_URLENCODED}-$(uname -m).tar.gz && \
-    tar -xvf falco.tar.gz && \
-    rm -f falco.tar.gz && \
-    mv falco-${FALCO_VERSION}-$(uname -m) falco && \
-    rm -rf /falco/usr/src/falco-* && \
-    cp -r /falco/* / && \
-    rm -rf /falco
+RUN curl -s https://falco.org/repo/falcosecurity-packages.asc | apt-key add - \
+	&& echo "deb https://download.falco.org/packages/${VERSION_BUCKET} stable main" | tee -a /etc/apt/sources.list.d/falcosecurity.list \
+	&& apt-get update -y \
+	&& if [ "$FALCO_VERSION" = "latest" ]; then FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco; else FALCO_DRIVER_CHOICE=none apt-get install -y --no-install-recommends falco=${FALCO_VERSION}; fi \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*

-RUN sed -i -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' /etc/falco/falco.yaml
+# Change the falco config within the container to enable ISO 8601
+# output.
+RUN sed -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' < /etc/falco/falco.yaml > /etc/falco/falco.yaml.new \
+	&& mv /etc/falco/falco.yaml.new /etc/falco/falco.yaml

-# Falcoctl is not included here.
-RUN rm -rf /usr/bin/falcoctl /etc/falcoctl/
+# Some base images have an empty /lib/modules by default
+# If it's not empty, docker build will fail instead of
+# silently overwriting the existing directory
+RUN rm -df /lib/modules \
+	&& ln -s $HOST_ROOT/lib/modules /lib/modules
+
+COPY ./docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]

 CMD ["/usr/bin/falco"]
--- a/docker/falco/docker-entrypoint.sh
+++ b/docker/falco/docker-entrypoint.sh
@@ -0,0 +1,136 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright (C) 2023 The Falco Authors.
+#
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+print_usage() {
+	echo ""
+	echo "Usage:"
+	echo "  docker run -i -t --privileged -v /root/.falco:/root/.falco -v /proc:/host/proc:ro -v /boot:/host/boot:ro -v /lib/modules:/host/lib/modules:ro -v /usr:/host/usr:ro -v /etc:/host/etc:ro -e 'FALCO_DRIVER_LOADER_OPTIONS=[driver] [options]' falcosecurity/falco:latest"
+	echo ""
+	echo "Available FALCO_DRIVER_LOADER_OPTIONS drivers:"
+	echo "  auto	       leverage automatic driver selection logic (default)"
+	echo "  modern_ebpf    modern eBPF CORE probe"
+	echo "  kmod           kernel module"
+	echo "  ebpf           eBPF probe"
+	echo ""
+	echo "FALCO_DRIVER_LOADER_OPTIONS options:"
+	echo "  --help           show this help message"
+	echo "  --clean          try to remove an already present driver installation"
+	echo "  --compile        try to compile the driver locally (default true)"
+	echo "  --download       try to download a prebuilt driver (default true)"
+ 	echo "  --http-insecure	 enable insecure downloads"
+	echo "  --print-env      skip execution and print env variables for other tools to consume"
+	echo ""
+	echo "Environment variables:"
+	echo "  FALCOCTL_DRIVER_REPOS         specify different URL(s) where to look for prebuilt Falco drivers (comma separated)"
+	echo "  FALCOCTL_DRIVER_NAME          specify a different name for the driver"
+	echo "  FALCOCTL_DRIVER_HTTP_HEADERS  specify comma separated list of http headers for driver download (e.g. 'x-emc-namespace: default,Proxy-Authenticate: Basic')"
+	echo ""
+}
+
+# Set the SKIP_DRIVER_LOADER variable to skip loading the driver
+
+if [[ -z "${SKIP_DRIVER_LOADER}" ]]; then
+    echo "* Setting up /usr/src links from host"
+
+    for i in "$HOST_ROOT/usr/src"/*
+    do
+        base=$(basename "$i")
+        ln -s "$i" "/usr/src/$base"
+    done
+
+    # convert the optional space-separated env variable FALCO_DRIVER_LOADER_OPTIONS to array, prevent 
+    # shell expansion and use it as argument list for falcoctl
+    read -a falco_driver_loader_option_arr <<< $FALCO_DRIVER_LOADER_OPTIONS
+
+    ENABLE_COMPILE="false"
+    ENABLE_DOWNLOAD="false"
+    HTTP_INSECURE="false"
+    driver=
+    has_opts=
+    for opt in "${falco_driver_loader_option_arr[@]}"
+    do
+        case "$opt" in
+            auto|kmod|ebpf|modern_ebpf)
+                if [ -n "$driver" ]; then
+                    >&2 echo "Only one driver per invocation"
+                    print_usage
+                    exit 1
+                else
+                    driver=$opt
+                fi
+                ;;
+            -h|--help)
+                print_usage
+                exit 0
+                ;;    
+            --clean)
+                /usr/bin/falcoctl driver cleanup
+                exit 0
+                ;;
+            --compile)
+                ENABLE_COMPILE="true"
+                has_opts="true"
+                ;;
+            --download)
+                ENABLE_DOWNLOAD="true"
+                has_opts="true"
+                ;;
+            --http-insecure)
+                HTTP_INSECURE="true"
+                ;;
+            --print-env)
+                /usr/bin/falcoctl driver printenv
+                exit 0
+                ;;
+            --*)
+                >&2 echo "Unknown option: $opt"
+                print_usage
+                exit 1
+                ;;
+            *)
+                >&2 echo "Unknown driver: $opt"
+                print_usage
+                exit 1
+                ;;
+        esac
+    done
+
+    # No opts passed, enable both compile and download
+    if [ -z "$has_opts" ]; then
+        ENABLE_COMPILE="true"
+        ENABLE_DOWNLOAD="true"
+    fi
+
+    # Default value: auto
+    if [ -z "$driver" ]; then
+      driver="auto"
+    fi
+
+    if [ "$driver" != "auto" ]; then
+      /usr/bin/falcoctl driver config --type $driver
+    else
+      # Needed because we need to configure Falco to start with correct driver
+      /usr/bin/falcoctl driver config --type modern_ebpf --type kmod --type ebpf
+    fi
+    /usr/bin/falcoctl driver install --compile=$ENABLE_COMPILE --download=$ENABLE_DOWNLOAD --http-insecure=$HTTP_INSECURE --http-headers="$FALCOCTL_DRIVER_HTTP_HEADERS"
+
+fi
+
+exec "$@"
--- a/docker/no-driver/Dockerfile
+++ b/docker/no-driver/Dockerfile
@@ -0,0 +1,39 @@
+FROM debian:12 as builder
+
+ARG FALCO_VERSION
+ARG VERSION_BUCKET=bin
+
+ENV FALCO_VERSION=${FALCO_VERSION}
+ENV VERSION_BUCKET=${VERSION_BUCKET}
+
+RUN apt-get -y update && apt-get -y install gridsite-clients curl ca-certificates
+
+WORKDIR /
+
+RUN curl -L -o falco.tar.gz \
+    https://download.falco.org/packages/${VERSION_BUCKET}/$(uname -m)/falco-$(urlencode ${FALCO_VERSION})-$(uname -m).tar.gz && \
+    tar -xvf falco.tar.gz && \
+    rm -f falco.tar.gz && \
+    mv falco-${FALCO_VERSION}-$(uname -m) falco && \
+    rm -rf /falco/usr/src/falco-*
+
+RUN sed -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' < /falco/etc/falco/falco.yaml > /falco/etc/falco/falco.yaml.new \
+    && mv /falco/etc/falco/falco.yaml.new /falco/etc/falco/falco.yaml
+
+FROM debian:12-slim
+
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
+LABEL org.opencontainers.image.source="https://github.com/falcosecurity/falco"
+
+LABEL usage="docker run -i -t --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro --name NAME IMAGE"
+# NOTE: for the "least privileged" use case, please refer to the official documentation
+
+RUN apt-get -y update && apt-get -y install ca-certificates curl jq libelf1 \
+    && apt clean -y && rm -rf /var/lib/apt/lists/*
+
+ENV HOST_ROOT /host
+ENV HOME /root
+
+COPY --from=builder /falco /
+
+CMD ["/usr/bin/falco", "-o", "time_format_iso_8601=true"]
--- a/docker/no-driver/Dockerfile.distroless
+++ b/docker/no-driver/Dockerfile.distroless
@@ -0,0 +1,40 @@
+FROM cgr.dev/chainguard/wolfi-base as builder
+
+ARG FALCO_VERSION
+ARG VERSION_BUCKET=bin
+
+ENV FALCO_VERSION=${FALCO_VERSION}
+ENV VERSION_BUCKET=${VERSION_BUCKET}
+
+RUN apk update && apk add build-base gcc curl ca-certificates jq elfutils
+
+WORKDIR /
+
+RUN FALCO_VERSION_URLENCODED=$(echo -n ${FALCO_VERSION}|jq -sRr @uri) && \
+    curl -L -o falco.tar.gz \
+    https://download.falco.org/packages/${VERSION_BUCKET}/$(uname -m)/falco-${FALCO_VERSION_URLENCODED}-$(uname -m).tar.gz && \
+    tar -xvf falco.tar.gz && \
+    rm -f falco.tar.gz && \
+    mv falco-${FALCO_VERSION}-$(uname -m) falco && \
+    rm -rf /falco/usr/src/falco-*
+
+RUN sed -e 's/time_format_iso_8601: false/time_format_iso_8601: true/' < /falco/etc/falco/falco.yaml > /falco/etc/falco/falco.yaml.new \
+    && mv /falco/etc/falco/falco.yaml.new /falco/etc/falco/falco.yaml
+
+FROM cgr.dev/chainguard/wolfi-base
+
+LABEL maintainer="cncf-falco-dev@lists.cncf.io"
+LABEL org.opencontainers.image.source="https://github.com/falcosecurity/falco"
+
+LABEL usage="docker run -i -t --privileged -v /var/run/docker.sock:/host/var/run/docker.sock -v /dev:/host/dev -v /proc:/host/proc:ro --name NAME IMAGE"
+# NOTE: for the "least privileged" use case, please refer to the official documentation
+
+RUN apk update && apk add libelf libstdc++
+
+ENV HOST_ROOT /host
+ENV HOME /root
+
+USER root
+COPY --from=builder /falco /
+
+CMD ["/usr/bin/falco", "-o", "time_format_iso_8601=true"]
--- a/falco.yaml
+++ b/falco.yaml
@@ -468,7 +468,7 @@ load_plugins: []
 plugins:
  - name: k8saudit
    library_path: libk8saudit.so
-    init_config: ""
+    init_config:
    #   maxEventSize: 262144
    #   webhookMaxBatchSize: 12582912
    #   sslCertificate: /etc/falco/falco.pem
@@ -480,14 +480,6 @@ plugins:
  - name: json
    library_path: libjson.so

-# [Sandbox] `plugins_hostinfo`
-#
-# Uncomment to disable host info support for source plugins
-# that DO NOT generate raw events from the libscap event table
-# or for plugins that DO NOT parse raw events generated by drivers,
-# effectively dropping the `proc-fs` hostPath volume requirement for them:
-# https://github.com/falcosecurity/charts/blob/bd57711e7c8e00919ea288716e0d9d5fdad8867e/charts/falco/templates/pod-template.tpl#L302-L304
-# plugins_hostinfo: false

 ##########################
 # Falco outputs settings #
@@ -500,13 +492,6 @@ plugins:
 # the /etc/localtime configuration.
 time_format_iso_8601: false

-# [Incubating] `buffer_format_base64`
-#
-# When enabled, Falco will output data buffer with base64 encoding. This is useful
-# for encoding binary data that needs to be used over media designed to consume
-# this format.
-buffer_format_base64: false
-
 # [Stable] `priority`
 #
 # Any rule with a priority level more severe than or equal to the specified
@@ -533,15 +518,6 @@ json_output: false
 # case.
 json_include_output_property: true

-# [Incubating] `json_include_message_property`
-#
-# When using JSON output in Falco, you have the option to include the formatted
-# rule output without timestamp or priority. For instance, if a rule specifies
-# an "output" property like "Opened process %proc.name" the "message" field will
-# only contain "Opened process bash" whereas the "output" field will contain more
-# information.
-json_include_message_property: false
-
 # [Stable] `json_include_tags_property`
 #
 # When using JSON output in Falco, you have the option to include the "tags"
@@ -553,14 +529,9 @@ json_include_tags_property: true

 # [Stable] `buffered_outputs`
 #
-# Global buffering option for output channels. When disabled, the output channel
-# that supports buffering flushes the output buffer on every alert. This can lead to 
-# increased CPU usage but is useful when piping outputs to another process or script. 
-# Buffering is currently supported by `file_output`, `program_output`, and `std_output`. 
-# Some output channels may implement buffering strategies you cannot control. 
-# Additionally, this setting is separate from the `output_queue` option. The output queue 
-# sits between the rule engine and the output channels, while output buffering occurs 
-# afterward once the specific channel implementation outputs the formatted message.
+# Enabling buffering for the output queue can offer performance optimization,
+# efficient resource usage, and smoother data flow, resulting in a more reliable
+# output mechanism. By default, buffering is disabled (false).
 buffered_outputs: false

 # [Incubating] `rule_matching`
@@ -588,7 +559,7 @@ rule_matching: first
 #
 # Falco utilizes tbb::concurrent_bounded_queue for handling outputs, and this parameter
 # allows you to customize the queue capacity. Please refer to the official documentation:
-# https://uxlfoundation.github.io/oneTBB/main/tbb_userguide/Concurrent_Queue_Classes.html.
+# https://oneapi-src.github.io/oneTBB/main/tbb_userguide/Concurrent_Queue_Classes.html.
 # On a healthy system with optimized Falco rules, the queue should not fill up.
 # If it does, it is most likely happening due to the entire event flow being too slow,
 # indicating that the server is under heavy load.
@@ -605,56 +576,6 @@ rule_matching: first
 outputs_queue:
  capacity: 0

-# [Sandbox] `append_output`
-#
-# Add information to the Falco output.
-# With this setting you can add more information to the Falco output message, customizable by
-# rule, tag or source.
-# You can also add additional data that will appear in the output_fields property
-# of JSON formatted messages or gRPC output but will not be part of the regular output message.
-# This allows you to add custom fields that can help you filter your Falco events without
-# polluting the message text.
-#
-# Each append_output entry has an optional `match` map which specifies which rules will be
-# affected.
-# `match`:
-#   `rule`: append output only to a specific rule
-#   `source`: append output only to a specific source
-#   `tags`: append output only to rules that have all of the specified tags
-# If none of the above are specified (or `match` is omitted)
-# output is appended to all events.
-# If more than one match condition is specified output will be appended to events 
-# that match all conditions.
-# And several options to add output:
-#   `extra_output`: add output to the Falco message
-#   `extra_fields`: add new fields to the JSON output and structured output, which will not
-#             affect the regular Falco message in any way. These can be specified as a
-#             custom name with a custom format or as any supported field
-#             (see: https://falco.org/docs/reference/rules/supported-fields/)
-#   `suggested_output`: enable the use of extractor plugins suggested fields for the matching source output.
-#
-# Example:
-# 
-# append_output:
-#   - match:
-#       source: syscall
-#     extra_output: "on CPU %evt.cpu"
-#     extra_fields:
-#       - home_directory: "${HOME}"
-#       - evt.hostname
-#
-# In the example above every event coming from the syscall source will get an extra message
-# at the end telling the CPU number. In addition, if `json_output` is true, in the "output_fields"
-# property you will find three new ones: "evt.cpu", "home_directory" which will contain the value of the
-# environment variable $HOME, and "evt.hostname" which will contain the hostname.
-
-# By default, we enable suggested_output for any source.
-# This means that any extractor plugin that indicates some of its fields
-# as suggested output formats, will see these fields in the output
-# in the form "foo_bar=$foo.bar"
-append_output:
-  - suggested_output: true
-

 ##########################
 # Falco outputs channels #
@@ -1100,9 +1021,6 @@ syscall_event_drops:
 # counters reflect monotonic values since Falco's start and are exported at a
 # constant stats interval.
 #
-# `kernel_event_counters_per_cpu_enabled`: Detailed kernel event and drop counters
-# per CPU. Typically used when debugging and not in production.
-#
 # `libbpf_stats_enabled`: Exposes statistics similar to `bpftool prog show`,
 # providing information such as the number of invocations of each BPF program
 # attached by Falco and the time spent in each program measured in nanoseconds.
@@ -1124,8 +1042,6 @@ syscall_event_drops:
 # there will be no metrics available. In other words, there are no default or 
 # generic plugin metrics at this time. This may be subject to change.
 #
-# `jemalloc_stats_enabled`: Falco can now expose jemalloc related stats.
-#
 # If metrics are enabled, the web server can be configured to activate the
 # corresponding Prometheus endpoint using `webserver.prometheus_metrics_enabled`.
 # Prometheus output can be used in combination with the other output options.
@@ -1143,11 +1059,8 @@ metrics:
  resource_utilization_enabled: true
  state_counters_enabled: true
  kernel_event_counters_enabled: true
-  # Enabling `kernel_event_counters_per_cpu_enabled` automatically enables `kernel_event_counters_enabled`
-  kernel_event_counters_per_cpu_enabled: false
  libbpf_stats_enabled: true
  plugins_metrics_enabled: true
-  jemalloc_stats_enabled: false
  convert_memory_to_mb: true
  include_empty_values: false

@@ -1186,14 +1099,6 @@ metrics:
 # Falco, the `base_syscalls` option allows for finer end-user control of
 # syscalls traced by Falco.
 #
-# --- [base_syscalls.all]
-#
-# `base_syscalls.all` enables monitoring of all events supported by Falco and
-# defined in rules and configs.
-# By default some events, such as `write`, are ignored (run `falco -i` to get
-# the full list) unless base_syscalls.all is true.
-# This option may negatively impact performance.
-#
 # --- [base_syscalls.custom_set]
 #
 # CAUTION: Misconfiguration of this setting may result in incomplete Falco event
@@ -1298,51 +1203,36 @@ base_syscalls:
 # `metrics.state_counters_enabled` to measure how the internal state handling is performing, 
 # and the fields called `n_drops_full_threadtable` or `n_store_evts_drops` will inform you
 # if you should increase this value for optimal performance.
-#
-# `snaplen`
-#
-# Set how many bytes are collected of each I/O buffer for 'syscall' events.
-# Use this option with caution since it can have a strong performance impact.
-#
 falco_libs:
  thread_table_size: 262144
-  snaplen: 80

-# [Incubating] `container_engines`
+# [Stable] Guidance for Kubernetes container engine command-line args settings
 #
-# This option allows you to explicitly enable or disable API lookups against container 
-# runtime sockets for each supported container runtime. 
-# Access to these sockets enables Falco to retrieve container and Kubernetes fields, 
-# helping identify workload owners in modern containerized environments. 
-# Refer to the fields docs:
-# 
-# - [Kubernetes fields](https://falco.org/docs/reference/rules/supported-fields/#field-class-k8s)
-# - [Container fields](https://falco.org/docs/reference/rules/supported-fields/#container)
-# 
-# Additionally, Falco can use container events as a data source for alerting (evt.type = container).
-# 
-# For most container engines, you can solely enable or disable them, and Falco will search the 
-# default (hard-coded) container runtime socket paths, such as `/var/run/docker.sock` for Docker.
+# Modern cloud environments, particularly Kubernetes, heavily rely on
+# containerized workload deployments. When capturing events with Falco, it
+# becomes essential to identify the owner of the workload for which events are
+# being captured, such as syscall events. Falco integrates with the container
+# runtime to enrich its events with container information, including fields like
+# `container.image.repository`, `container.image.tag`, ... , `k8s.ns.name`,
+# `k8s.pod.name`, `k8s.pod.*` in the Falco output (Falco retrieves Kubernetes
+# namespace and pod name directly from the container runtime, see
+# https://falco.org/docs/reference/rules/supported-fields/#field-class-container).
 #
-# However, for Kubernetes settings, you can customize the CRI socket paths:
-# 
-# - `container_engines.cri.sockets`: Pass a list of container runtime sockets.
-# - `container_engines.cri.disable_async`: Since API lookups may not always be quick or 
-# perfect, resulting in empty fields for container metadata, you can use this option option 
-# to disable asynchronous fetching. Note that missing fields may still occasionally occur.
-
-container_engines:
-  docker:
-    enabled: true
-  cri:
-    enabled: true
-    sockets: ["/run/containerd/containerd.sock", "/run/crio/crio.sock", "/run/k3s/containerd/containerd.sock"]
-    disable_async: false
-  podman:
-    enabled: true
-  lxc:
-    enabled: true
-  libvirt_lxc:
-    enabled: true
-  bpm:
-    enabled: true
+# Furthermore, Falco exposes container events themselves as a data source for
+# alerting. To achieve this integration with the container runtime, Falco
+# requires access to the runtime socket. By default, for Kubernetes, Falco
+# attempts to connect to the following sockets:
+# "/run/containerd/containerd.sock", "/run/crio/crio.sock",
+# "/run/k3s/containerd/containerd.sock". If you have a custom path, you can use
+# the `--cri` option to specify the correct location.
+#
+# In some cases, you may encounter empty fields for container metadata. To
+# address this, you can explore the `--disable-cri-async` option, which disables
+# asynchronous fetching if the fetch operation is not completing quickly enough.
+#
+# To get more information on these command-line arguments, you can run `falco
+# --help` in your terminal to view their current descriptions.
+#
+# !!! The options mentioned here are not available in the falco.yaml
+# configuration file. Instead, they can can be used as a command-line argument
+# when running the Falco command.
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -2,44 +2,35 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
 #
-# http://www.apache.org/licenses/LICENSE-2.0
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #

 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 	# Systemd
 	file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/scripts/systemd)
-	configure_file(
-		"${PROJECT_SOURCE_DIR}/scripts/systemd/falco-kmod-inject.service"
-		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY
-	)
-	configure_file(
-		"${PROJECT_SOURCE_DIR}/scripts/systemd/falco-kmod.service"
-		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY
-	)
-	configure_file(
-		"${PROJECT_SOURCE_DIR}/scripts/systemd/falco-bpf.service"
-		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY
-	)
-	configure_file(
-		"${PROJECT_SOURCE_DIR}/scripts/systemd/falco-modern-bpf.service"
-		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY
-	)
-	configure_file(
-		"${PROJECT_SOURCE_DIR}/scripts/systemd/falco-custom.service"
-		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY
-	)
-	configure_file(
-		"${PROJECT_SOURCE_DIR}/scripts/systemd/falcoctl-artifact-follow.service"
-		"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY
-	)
+	configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-kmod-inject.service"
+			"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
+	configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-kmod.service"
+			"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
+	configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-bpf.service"
+			"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
+	configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-modern-bpf.service"
+			"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
+	configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falco-custom.service"
+			"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)
+	configure_file("${PROJECT_SOURCE_DIR}/scripts/systemd/falcoctl-artifact-follow.service"
+			"${PROJECT_BINARY_DIR}/scripts/systemd" COPYONLY)

 	# Debian
 	configure_file(debian/postinst.in debian/postinst COPYONLY)
@@ -53,32 +44,21 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 endif()

 # Install Falcoctl config file
-if(NOT WIN32
-   AND NOT APPLE
-   AND NOT EMSCRIPTEN
-   AND NOT MUSL_OPTIMIZED_BUILD
-)
+if (NOT WIN32 AND NOT APPLE AND NOT EMSCRIPTEN AND NOT MUSL_OPTIMIZED_BUILD)
 	if(NOT DEFINED FALCOCTL_ETC_DIR)
 		set(FALCOCTL_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falcoctl")
-	endif()
-	set(FALCOCTL_DRIVER_TYPES_LIST "")
-	if(BUILD_FALCO_MODERN_BPF)
+    endif()
+    set(FALCOCTL_DRIVER_TYPES_LIST "")
+	if (BUILD_FALCO_MODERN_BPF)
 		list(APPEND FALCOCTL_DRIVER_TYPES_LIST "modern_ebpf")
 	endif()
-	if(BUILD_DRIVER)
+	if (BUILD_DRIVER)
 		list(APPEND FALCOCTL_DRIVER_TYPES_LIST "kmod")
 	endif()
-	if(BUILD_BPF)
+	if (BUILD_BPF)
 		list(APPEND FALCOCTL_DRIVER_TYPES_LIST "ebpf")
 	endif()
 	string(REPLACE ";" ", " FALCOCTL_DRIVER_TYPES "${FALCOCTL_DRIVER_TYPES_LIST}")
-	configure_file(
-		${CMAKE_CURRENT_SOURCE_DIR}/falcoctl/falcoctl.yaml.in
-		${PROJECT_BINARY_DIR}/scripts/falcoctl/falcoctl.yaml
-	)
-	install(
-		FILES ${PROJECT_BINARY_DIR}/scripts/falcoctl/falcoctl.yaml
-		DESTINATION "${FALCOCTL_ETC_DIR}"
-		COMPONENT "${FALCO_COMPONENT_NAME}"
-	)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/falcoctl/falcoctl.yaml.in ${PROJECT_BINARY_DIR}/scripts/falcoctl/falcoctl.yaml)
+	install(FILES ${PROJECT_BINARY_DIR}/scripts/falcoctl/falcoctl.yaml DESTINATION "${FALCOCTL_ETC_DIR}" COMPONENT "${FALCO_COMPONENT_NAME}")
 endif()
--- a/scripts/systemd/falco-bpf.service
+++ b/scripts/systemd/falco-bpf.service
@@ -24,4 +24,3 @@ StandardOutput=null

 [Install]
 WantedBy=multi-user.target
-Alias=falco.service
--- a/scripts/systemd/falco-custom.service
+++ b/scripts/systemd/falco-custom.service
@@ -24,4 +24,3 @@ StandardOutput=null

 [Install]
 WantedBy=multi-user.target
-Alias=falco.service
--- a/scripts/systemd/falco-modern-bpf.service
+++ b/scripts/systemd/falco-modern-bpf.service
@@ -24,4 +24,3 @@ StandardOutput=null

 [Install]
 WantedBy=multi-user.target
-Alias=falco.service
--- a/submodules/falcosecurity-rules
+++ b/submodules/falcosecurity-rules
--- a/tools/local_hooks/dco-pre-commit-msg.sh
+++ b/tools/local_hooks/dco-pre-commit-msg.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This is a git pre-commit-msg hook which automatically add a 
-# DCO signed-off message if one is missing.
-#
-
-MESSAGE_FILE="$1"
-GIT_AUTHOR=$(git var GIT_AUTHOR_IDENT)
-SIGNOFF_BY=$(echo $GIT_AUTHOR | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-
-# Verify if a DCO signoff message exists.
-# Append a DCO signoff message if one doesn't exist.
-if ! $(grep -qs "^$SIGNOFF_BY" "$MESSAGE_FILE") ; then
-  echo -e "\n$SIGNOFF_BY" >> "$MESSAGE_FILE"
-fi
-exit 0
--- a/unit_tests/CMakeLists.txt
+++ b/unit_tests/CMakeLists.txt
@@ -2,15 +2,14 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
 #

 message(STATUS "Falco unit tests build enabled")
@@ -18,72 +17,67 @@ message(STATUS "Falco unit tests build enabled")
 include(FetchContent)

 FetchContent_Declare(
-	googletest
-	GIT_REPOSITORY https://github.com/google/googletest.git
-	GIT_TAG v1.14.0
+  googletest
+  GIT_REPOSITORY https://github.com/google/googletest.git
+  GIT_TAG        v1.14.0
 )

 FetchContent_MakeAvailable(googletest)

-# Create a libscap_test_var.h file with some variables used by our tests for example the kmod path
-# or the bpf path.
-configure_file(
-	${CMAKE_CURRENT_SOURCE_DIR}/falco_test_var.h.in ${CMAKE_CURRENT_BINARY_DIR}/falco_test_var.h
+# Create a libscap_test_var.h file with some variables used by our tests
+# for example the kmod path or the bpf path.
+configure_file (
+    ${CMAKE_CURRENT_SOURCE_DIR}/falco_test_var.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/falco_test_var.h
 )

-add_executable(
-	falco_unit_tests
-	test_falco_engine.cpp
-	engine/test_add_source.cpp
-	engine/test_alt_rule_loader.cpp
-	engine/test_enable_rule.cpp
-	engine/test_extra_output.cpp
-	engine/test_falco_utils.cpp
-	engine/test_filter_details_resolver.cpp
-	engine/test_filter_macro_resolver.cpp
-	engine/test_filter_warning_resolver.cpp
-	engine/test_plugin_requirements.cpp
-	engine/test_rule_loader.cpp
-	engine/test_rulesets.cpp
-	falco/test_configuration.cpp
-	falco/test_configuration_rule_selection.cpp
-	falco/test_configuration_config_files.cpp
-	falco/test_configuration_env_vars.cpp
-	falco/test_configuration_output_options.cpp
-	falco/test_configuration_schema.cpp
-	falco/app/actions/test_select_event_sources.cpp
-	falco/app/actions/test_load_config.cpp
+add_executable(falco_unit_tests
+    test_falco_engine.cpp
+    engine/test_add_source.cpp
+    engine/test_alt_rule_loader.cpp
+    engine/test_enable_rule.cpp
+    engine/test_falco_utils.cpp
+    engine/test_filter_details_resolver.cpp
+    engine/test_filter_macro_resolver.cpp
+    engine/test_filter_warning_resolver.cpp
+    engine/test_plugin_requirements.cpp
+    engine/test_rule_loader.cpp
+    engine/test_rulesets.cpp
+    falco/test_configuration.cpp
+    falco/test_configuration_rule_selection.cpp
+    falco/app/actions/test_select_event_sources.cpp
+    falco/app/actions/test_load_config.cpp
 )

-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	target_sources(
-		falco_unit_tests
-		PRIVATE falco/test_atomic_signal_handler.cpp
-				falco/app/actions/test_configure_interesting_sets.cpp
-				falco/app/actions/test_configure_syscall_buffer_num.cpp
-	)
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
+    target_sources(falco_unit_tests
+    PRIVATE
+        falco/test_atomic_signal_handler.cpp
+        falco/app/actions/test_configure_interesting_sets.cpp
+        falco/app/actions/test_configure_syscall_buffer_num.cpp
+    )
 endif()

-target_include_directories(
-	falco_unit_tests
-	PRIVATE ${CMAKE_SOURCE_DIR}/userspace
-			${CMAKE_BINARY_DIR}/userspace/falco # we need it to include indirectly `config_falco.h`
-			# file
-			${CMAKE_SOURCE_DIR}/userspace/engine # we need it to include indirectly `falco_common.h`
-			# file
-			${CMAKE_CURRENT_BINARY_DIR} # we need it to include `falco_test_var.h`
+target_include_directories(falco_unit_tests
+PRIVATE
+    ${CMAKE_SOURCE_DIR}/userspace
+    ${CMAKE_BINARY_DIR}/userspace/falco # we need it to include indirectly `config_falco.h` file
+    ${CMAKE_SOURCE_DIR}/userspace/engine # we need it to include indirectly `falco_common.h` file
+    ${CMAKE_CURRENT_BINARY_DIR} # we need it to include `falco_test_var.h`
 )

 get_target_property(FALCO_APPLICATION_LIBRARIES falco_application LINK_LIBRARIES)

-target_link_libraries(
-	falco_unit_tests falco_application GTest::gtest GTest::gtest_main
-	${FALCO_APPLICATION_LIBRARIES}
+target_link_libraries(falco_unit_tests
+    falco_application
+    GTest::gtest
+    GTest::gtest_main
+    ${FALCO_APPLICATION_LIBRARIES}
 )

-if(EMSCRIPTEN)
+if (EMSCRIPTEN)
 	target_compile_options(falco_unit_tests PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
 	target_link_options(falco_unit_tests PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
-	target_link_options(falco_unit_tests PRIVATE "-sALLOW_MEMORY_GROWTH=1")
+  target_link_options(falco_unit_tests PRIVATE "-sALLOW_MEMORY_GROWTH=1")
 	target_link_options(falco_unit_tests PRIVATE "-sEXPORTED_FUNCTIONS=['_main','_htons','_ntohs']")
 endif()
--- a/unit_tests/engine/test_add_source.cpp
+++ b/unit_tests/engine/test_add_source.cpp
@@ -26,30 +26,36 @@ static std::string syscall_source_name = "syscall";
 // for the underlying ruleset. This allows testing of
 // ruleset_for_source

-namespace {
-class test_ruleset_factory : public evttype_index_ruleset_factory {
+namespace
+{
+class test_ruleset_factory : public evttype_index_ruleset_factory
+{
 public:
 	explicit test_ruleset_factory(std::shared_ptr<sinsp_filter_factory> factory):
-	        evttype_index_ruleset_factory(factory) {
+		evttype_index_ruleset_factory(factory)
+	{
 		ruleset = evttype_index_ruleset_factory::new_ruleset();
 	}

 	virtual ~test_ruleset_factory() = default;

-	inline std::shared_ptr<filter_ruleset> new_ruleset() override { return ruleset; }
+	inline std::shared_ptr<filter_ruleset> new_ruleset() override
+	{
+		return ruleset;
+	}

 	std::shared_ptr<filter_ruleset> ruleset;
 };
-};  // namespace
+}; // namespace

-TEST(AddSource, basic) {
+TEST(AddSource, basic)
+{
 	falco_engine engine;
 	sinsp inspector;
 	sinsp_filter_check_list filterchecks;

 	auto filter_factory = std::make_shared<sinsp_filter_factory>(&inspector, filterchecks);
-	auto formatter_factory =
-	        std::make_shared<sinsp_evt_formatter_factory>(&inspector, filterchecks);
+	auto formatter_factory = std::make_shared<sinsp_evt_formatter_factory>(&inspector, filterchecks);
 	auto ruleset_factory = std::make_shared<test_ruleset_factory>(filter_factory);

 	falco_source syscall_source;
@@ -60,9 +66,9 @@ TEST(AddSource, basic) {
 	syscall_source.formatter_factory = formatter_factory;

 	size_t source_idx = engine.add_source(syscall_source_name,
-	                                      filter_factory,
-	                                      formatter_factory,
-	                                      ruleset_factory);
+					      filter_factory,
+					      formatter_factory,
+					      ruleset_factory);

 	ASSERT_TRUE(engine.is_source_valid(syscall_source_name));

--- a/unit_tests/engine/test_alt_rule_loader.cpp
+++ b/unit_tests/engine/test_alt_rule_loader.cpp
@@ -15,7 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-#include <memory>
 #include <string>

 #include <gtest/gtest.h>
@@ -33,38 +32,42 @@ limitations under the License.
 #include "rule_loader_collector.h"
 #include "rule_loader_compiler.h"

-namespace {
+namespace
+{

-struct test_object_info {
+struct test_object_info
+{
 	std::string name;
 	std::string property;
 };

-struct test_compile_output : public rule_loader::compile_output {
+struct test_compile_output : public rule_loader::compile_output
+{
 	test_compile_output() = default;
-	virtual ~test_compile_output() = default;
-	virtual std::unique_ptr<compile_output> clone() const override {
-		return std::make_unique<test_compile_output>(*this);
-	}
+	~test_compile_output() = default;

 	std::set<std::string> defined_test_properties;
 };

-class test_compiler : public rule_loader::compiler {
+class test_compiler : public rule_loader::compiler
+{
 public:
 	test_compiler() = default;
 	virtual ~test_compiler() = default;

-	std::unique_ptr<rule_loader::compile_output> new_compile_output() override {
+	std::unique_ptr<rule_loader::compile_output> new_compile_output() override
+	{
 		return std::make_unique<test_compile_output>();
 	}

-	void compile(rule_loader::configuration& cfg,
-	             const rule_loader::collector& col,
-	             rule_loader::compile_output& out) const override;
+	void compile(
+		rule_loader::configuration& cfg,
+		const rule_loader::collector& col,
+		rule_loader::compile_output& out) const override;
 };

-class test_collector : public rule_loader::collector {
+class test_collector : public rule_loader::collector
+{
 public:
 	test_collector() = default;
 	virtual ~test_collector() = default;
@@ -72,27 +75,32 @@ public:
 	indexed_vector<test_object_info> test_object_infos;
 };

-class test_reader : public rule_loader::reader {
+class test_reader : public rule_loader::reader
+{
 public:
 	test_reader() = default;
 	virtual ~test_reader() = default;

 protected:
 	rule_loader::context create_context(const YAML::Node& item,
-	                                    const rule_loader::context& parent) {
+					    const rule_loader::context& parent)
+	{
 		return rule_loader::context(item,
-		                            rule_loader::context::EXTENSION_ITEM,
-		                            "test object",
-		                            parent);
+					    rule_loader::context::EXTENSION_ITEM,
+					    "test object",
+					    parent);
 	};

 	void read_item(rule_loader::configuration& cfg,
-	               rule_loader::collector& collector,
-	               const YAML::Node& item,
-	               const rule_loader::context& parent) override {
-		test_collector& test_col = dynamic_cast<test_collector&>(collector);
+		       rule_loader::collector& collector,
+		       const YAML::Node& item,
+		       const rule_loader::context& parent) override
+	{
+		test_collector& test_col =
+			dynamic_cast<test_collector&>(collector);

-		if(item["test_object"].IsDefined()) {
+		if(item["test_object"].IsDefined())
+		{
 			rule_loader::context tmp = create_context(item, parent);
 			test_object_info obj;
 			std::string name;
@@ -105,29 +113,37 @@ protected:
 			obj.property = property;

 			test_col.test_object_infos.insert(obj, obj.name);
-		} else {
+		}
+		else
+		{
 			rule_loader::reader::read_item(cfg, collector, item, parent);
 		}
 	};
 };

-class test_ruleset : public evttype_index_ruleset {
+class test_ruleset : public evttype_index_ruleset
+{
 public:
 	explicit test_ruleset(std::shared_ptr<sinsp_filter_factory> factory):
-	        evttype_index_ruleset(factory) {};
+		evttype_index_ruleset(factory){};
 	virtual ~test_ruleset() = default;

-	void add_compile_output(const rule_loader::compile_output& compile_output,
-	                        falco_common::priority_type min_priority,
-	                        const std::string& source) {
-		evttype_index_ruleset::add_compile_output(compile_output, min_priority, source);
+	void add_compile_output(
+		const rule_loader::compile_output& compile_output,
+		falco_common::priority_type min_priority,
+		const std::string& source)
+	{
+
+		evttype_index_ruleset::add_compile_output(compile_output,
+							  min_priority,
+							  source);

 		std::shared_ptr<filter_ruleset> ruleset;
 		get_engine_state().get_ruleset(source, ruleset);
 		EXPECT_EQ(this, ruleset.get());

 		const test_compile_output& test_output =
-		        dynamic_cast<const test_compile_output&>(compile_output);
+			dynamic_cast<const test_compile_output&>(compile_output);

 		defined_properties = test_output.defined_test_properties;
 	};
@@ -135,31 +151,40 @@ public:
 	std::set<std::string> defined_properties;
 };

-class test_ruleset_factory : public filter_ruleset_factory {
+class test_ruleset_factory : public filter_ruleset_factory
+{
 public:
 	explicit test_ruleset_factory(std::shared_ptr<sinsp_filter_factory> factory):
-	        m_filter_factory(factory) {}
+		m_filter_factory(factory)
+	{
+	}

 	virtual ~test_ruleset_factory() = default;

-	inline std::shared_ptr<filter_ruleset> new_ruleset() override {
+	inline std::shared_ptr<filter_ruleset> new_ruleset() override
+	{
 		return std::make_shared<test_ruleset>(m_filter_factory);
 	}

 	std::shared_ptr<sinsp_filter_factory> m_filter_factory;
 };
-};  // namespace
+}; // namespace

-void test_compiler::compile(rule_loader::configuration& cfg,
-                            const rule_loader::collector& col,
-                            rule_loader::compile_output& out) const {
+void test_compiler::compile(
+	rule_loader::configuration& cfg,
+	const rule_loader::collector& col,
+	rule_loader::compile_output& out) const
+{
 	rule_loader::compiler::compile(cfg, col, out);

-	const test_collector& test_col = dynamic_cast<const test_collector&>(col);
+	const test_collector& test_col =
+		dynamic_cast<const test_collector&>(col);

-	test_compile_output& test_output = dynamic_cast<test_compile_output&>(out);
+	test_compile_output& test_output =
+		dynamic_cast<test_compile_output&>(out);

-	for(auto& test_obj : test_col.test_object_infos) {
+	for(auto& test_obj : test_col.test_object_infos)
+	{
 		test_output.defined_test_properties.insert(test_obj.property);
 	}
 }
@@ -205,13 +230,12 @@ static std::string content = R"END(

 static std::string syscall_source_name = "syscall";

-static std::shared_ptr<rule_loader::configuration> create_configuration(
-        sinsp& inspector,
-        sinsp_filter_check_list& filterchecks,
-        indexed_vector<falco_source>& sources) {
+static std::shared_ptr<rule_loader::configuration> create_configuration(sinsp& inspector,
+									sinsp_filter_check_list& filterchecks,
+									indexed_vector<falco_source>& sources)
+{
 	auto filter_factory = std::make_shared<sinsp_filter_factory>(&inspector, filterchecks);
-	auto formatter_factory =
-	        std::make_shared<sinsp_evt_formatter_factory>(&inspector, filterchecks);
+	auto formatter_factory = std::make_shared<sinsp_evt_formatter_factory>(&inspector, filterchecks);
 	auto ruleset_factory = std::make_shared<evttype_index_ruleset_factory>(filter_factory);

 	falco_source syscall_source;
@@ -223,15 +247,17 @@ static std::shared_ptr<rule_loader::configuration> create_configuration(

 	sources.insert(syscall_source, syscall_source_name);

-	return std::make_shared<rule_loader::configuration>(content, sources, "test configuration");
+	return std::make_shared<rule_loader::configuration>(content,
+	                                                    sources,
+	                                                    "test configuration");
 }

 static void load_rules(sinsp& inspector,
-                       sinsp_filter_check_list& filterchecks,
-                       std::unique_ptr<rule_loader::compile_output>& compile_output,
-                       indexed_vector<falco_source>& sources) {
-	std::shared_ptr<rule_loader::configuration> cfg =
-	        create_configuration(inspector, filterchecks, sources);
+		       sinsp_filter_check_list& filterchecks,
+		       std::unique_ptr<rule_loader::compile_output>& compile_output,
+		       indexed_vector<falco_source>& sources)
+{
+	std::shared_ptr<rule_loader::configuration> cfg = create_configuration(inspector, filterchecks, sources);

 	rule_loader::reader reader;
 	rule_loader::collector collector;
@@ -244,7 +270,8 @@ static void load_rules(sinsp& inspector,
 	compiler.compile(*cfg, collector, *compile_output);
 }

-TEST(engine_loader_alt_loader, load_rules) {
+TEST(engine_loader_alt_loader, load_rules)
+{
 	sinsp inspector;
 	sinsp_filter_check_list filterchecks;
 	std::unique_ptr<rule_loader::compile_output> compile_output;
@@ -265,7 +292,8 @@ TEST(engine_loader_alt_loader, load_rules) {
 	EXPECT_TRUE(compile_output->rules.at("test debug rule") != nullptr);
 }

-TEST(engine_loader_alt_loader, pass_compile_output_to_ruleset) {
+TEST(engine_loader_alt_loader, pass_compile_output_to_ruleset)
+{
 	sinsp inspector;
 	sinsp_filter_check_list filterchecks;
 	std::unique_ptr<rule_loader::compile_output> compile_output;
@@ -276,8 +304,8 @@ TEST(engine_loader_alt_loader, pass_compile_output_to_ruleset) {
 	std::shared_ptr<filter_ruleset> ruleset = sources.at(syscall_source_name)->ruleset;

 	ruleset->add_compile_output(*compile_output,
-	                            falco_common::PRIORITY_INFORMATIONAL,
-	                            syscall_source_name);
+				    falco_common::PRIORITY_INFORMATIONAL,
+				    syscall_source_name);

 	// Enable all rules for a ruleset id. Because the compile
 	// output contained one rule with priority >= INFO, that rule
@@ -288,14 +316,14 @@ TEST(engine_loader_alt_loader, pass_compile_output_to_ruleset) {
 	EXPECT_EQ(ruleset->enabled_count(ruleset_id), 1);
 }

-TEST(engine_loader_alt_loader, falco_engine_alternate_loader) {
+TEST(engine_loader_alt_loader, falco_engine_alternate_loader)
+{
 	falco_engine engine;
 	sinsp inspector;
 	sinsp_filter_check_list filterchecks;

 	auto filter_factory = std::make_shared<sinsp_filter_factory>(&inspector, filterchecks);
-	auto formatter_factory =
-	        std::make_shared<sinsp_evt_formatter_factory>(&inspector, filterchecks);
+	auto formatter_factory = std::make_shared<sinsp_evt_formatter_factory>(&inspector, filterchecks);
 	auto ruleset_factory = std::make_shared<test_ruleset_factory>(filter_factory);

 	engine.add_source(syscall_source_name, filter_factory, formatter_factory, ruleset_factory);
@@ -317,40 +345,9 @@ TEST(engine_loader_alt_loader, falco_engine_alternate_loader) {
 	EXPECT_EQ(collector->test_object_infos.size(), 2);

 	std::shared_ptr<filter_ruleset> ruleset = engine.ruleset_for_source(syscall_source_name);
-	std::set<std::string>& defined_properties =
-	        std::dynamic_pointer_cast<test_ruleset>(ruleset)->defined_properties;
+	std::set<std::string>& defined_properties = std::dynamic_pointer_cast<test_ruleset>(ruleset)->defined_properties;

 	EXPECT_TRUE(defined_properties.find("my-value") != defined_properties.end());
 	EXPECT_TRUE(defined_properties.find("other-value") != defined_properties.end());
 	EXPECT_TRUE(defined_properties.find("not-exists-value") == defined_properties.end());
 };
-
-TEST(engine_loader_alt_loader, clone_compile_output) {
-	sinsp inspector;
-	sinsp_filter_check_list filterchecks;
-	indexed_vector<falco_source> sources;
-
-	std::shared_ptr<rule_loader::configuration> cfg =
-	        create_configuration(inspector, filterchecks, sources);
-
-	test_reader reader;
-	test_collector collector;
-	test_compiler compiler;
-
-	EXPECT_TRUE(reader.read(*cfg, collector));
-
-	std::unique_ptr<rule_loader::compile_output> compile_output = compiler.new_compile_output();
-
-	compiler.compile(*cfg, collector, *compile_output);
-
-	const test_compile_output& original_ref =
-	        dynamic_cast<const test_compile_output&>(*(compile_output.get()));
-
-	std::unique_ptr<rule_loader::compile_output> copy = compile_output->clone();
-	const test_compile_output& copy_ref = dynamic_cast<const test_compile_output&>(*(copy.get()));
-
-	EXPECT_EQ(copy_ref.lists, original_ref.lists);
-	EXPECT_EQ(copy_ref.macros, original_ref.macros);
-	EXPECT_EQ(copy_ref.rules, original_ref.rules);
-	EXPECT_EQ(copy_ref.defined_test_properties, original_ref.defined_test_properties);
-}
--- a/unit_tests/engine/test_enable_rule.cpp
+++ b/unit_tests/engine/test_enable_rule.cpp
@@ -72,6 +72,8 @@ static std::string multi_rule = R"END(
  tags: [exec]
 )END";

+
+
 // This must be kept in line with the (private) falco_engine::s_default_ruleset
 static const std::string default_ruleset = "falco-default-ruleset";

@@ -80,7 +82,8 @@ static const std::string ruleset_2 = "ruleset-2";
 static const std::string ruleset_3 = "ruleset-3";
 static const std::string ruleset_4 = "ruleset-4";

-TEST_F(test_falco_engine, enable_rule_name) {
+TEST_F(test_falco_engine, enable_rule_name)
+{
 	load_rules(single_rule, "single_rule.yaml");

 	// No rules should be enabled yet for any custom rulesets
@@ -116,7 +119,8 @@ TEST_F(test_falco_engine, enable_rule_name) {
 	EXPECT_EQ(2, m_engine->num_rules_for_ruleset(ruleset_3));
 }

-TEST_F(test_falco_engine, enable_rule_tags) {
+TEST_F(test_falco_engine, enable_rule_tags)
+{
 	std::set<std::string> process_tags = {"process"};

 	load_rules(single_rule, "single_rule.yaml");
@@ -143,7 +147,8 @@ TEST_F(test_falco_engine, enable_rule_tags) {
 	EXPECT_EQ(0, m_engine->num_rules_for_ruleset(ruleset_2));
 }

-TEST_F(test_falco_engine, enable_disabled_rule_by_tag) {
+TEST_F(test_falco_engine, enable_disabled_rule_by_tag)
+{
 	std::set<std::string> exec_process_tags = {"exec process"};

 	load_rules(single_rule, "single_rule.yaml");
@@ -158,7 +163,8 @@ TEST_F(test_falco_engine, enable_disabled_rule_by_tag) {
 	EXPECT_EQ(2, m_engine->num_rules_for_ruleset(default_ruleset));
 }

-TEST_F(test_falco_engine, enable_rule_id) {
+TEST_F(test_falco_engine, enable_rule_id)
+{
 	uint16_t ruleset_1_id;
 	uint16_t ruleset_2_id;
 	uint16_t ruleset_3_id;
@@ -198,7 +204,8 @@ TEST_F(test_falco_engine, enable_rule_id) {
 	EXPECT_EQ(2, m_engine->num_rules_for_ruleset(ruleset_3));
 }

-TEST_F(test_falco_engine, enable_rule_name_exact) {
+TEST_F(test_falco_engine, enable_rule_name_exact)
+{
 	load_rules(single_rule, "single_rule.yaml");

 	EXPECT_EQ(1, m_engine->num_rules_for_ruleset(default_ruleset));
@@ -240,7 +247,8 @@ TEST_F(test_falco_engine, enable_rule_name_exact) {
 	EXPECT_EQ(2, m_engine->num_rules_for_ruleset(ruleset_4));
 }

-TEST_F(test_falco_engine, enable_rule_name_wildcard) {
+TEST_F(test_falco_engine, enable_rule_name_wildcard)
+{
 	load_rules(multi_rule, "multi_rule.yaml");

 	EXPECT_EQ(1, m_engine->num_rules_for_ruleset(default_ruleset));
@@ -275,3 +283,4 @@ TEST_F(test_falco_engine, enable_rule_name_wildcard) {
 	EXPECT_EQ(1, m_engine->num_rules_for_ruleset(ruleset_3));
 	EXPECT_EQ(3, m_engine->num_rules_for_ruleset(ruleset_4));
 }
+
--- a/unit_tests/engine/test_extra_output.cpp
+++ b/unit_tests/engine/test_extra_output.cpp
@@ -1,154 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-Copyright (C) 2024 The Falco Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <gtest/gtest.h>
-
-#include "../test_falco_engine.h"
-
-TEST_F(test_falco_engine, extra_format_all) {
-	std::string rules_content = R"END(
- rule: legit_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: user=%user.name command=%proc.cmdline file=%fd.name
-  priority: INFO
-)END";
-
-	m_engine->add_extra_output_format("evt.type=%evt.type", "", {}, "", false);
-	ASSERT_TRUE(load_rules(rules_content, "legit_rules.yaml")) << m_load_result_string;
-
-	EXPECT_EQ(get_compiled_rule_output("legit_rule"),
-	          "user=%user.name command=%proc.cmdline file=%fd.name evt.type=%evt.type");
-}
-
-TEST_F(test_falco_engine, extra_format_by_rule) {
-	std::string rules_content = R"END(
- rule: legit_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 1
-  priority: INFO
-
- rule: another_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 2
-  priority: INFO
-)END";
-
-	m_engine->add_extra_output_format("evt.type=%evt.type", "", {}, "legit_rule", false);
-	ASSERT_TRUE(load_rules(rules_content, "legit_rules.yaml")) << m_load_result_string;
-
-	EXPECT_EQ(get_compiled_rule_output("legit_rule"), "out 1 evt.type=%evt.type");
-	EXPECT_EQ(get_compiled_rule_output("another_rule"), "out 2");
-}
-
-TEST_F(test_falco_engine, extra_format_by_tag_rule) {
-	std::string rules_content = R"END(
- rule: legit_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 1
-  priority: INFO
-  tags: [tag1]
-
- rule: another_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 2
-  priority: INFO
-  tags: [tag1]
-
- rule: a_third_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 3
-  priority: INFO
-  tags: [tag1, tag2]
-)END";
-
-	m_engine->add_extra_output_format("extra 1", "", {"tag1"}, "", false);
-	m_engine->add_extra_output_format("extra 2", "", {}, "another_rule", false);
-	m_engine->add_extra_output_format("extra 3", "", {"tag1", "tag2"}, "", false);
-
-	ASSERT_TRUE(load_rules(rules_content, "legit_rules.yaml")) << m_load_result_string;
-
-	EXPECT_EQ(get_compiled_rule_output("legit_rule"), "out 1 extra 1");
-	EXPECT_EQ(get_compiled_rule_output("another_rule"), "out 2 extra 1 extra 2");
-	EXPECT_EQ(get_compiled_rule_output("a_third_rule"), "out 3 extra 1 extra 3");
-}
-
-TEST_F(test_falco_engine, extra_format_replace_container_info) {
-	std::string rules_content = R"END(
- rule: legit_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 1 (%container.info)
-  priority: INFO
-  tags: [tag1]
-
- rule: another_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 2
-  priority: INFO
-  tags: [tag1]
-)END";
-
-	m_engine->add_extra_output_format("extra 1", "", {}, "", true);
-
-	ASSERT_TRUE(load_rules(rules_content, "legit_rules.yaml")) << m_load_result_string;
-
-	EXPECT_EQ(get_compiled_rule_output("legit_rule"), "out 1 (extra 1)");
-	EXPECT_EQ(get_compiled_rule_output("another_rule"), "out 2 extra 1");
-}
-
-TEST_F(test_falco_engine, extra_format_do_not_replace_container_info) {
-	std::string rules_content = R"END(
- rule: legit_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: out 1 (%container.info)
-  priority: INFO
-  tags: [tag1]
-)END";
-
-	ASSERT_TRUE(load_rules(rules_content, "legit_rules.yaml")) << m_load_result_string;
-
-	auto output = get_compiled_rule_output("legit_rule");
-	EXPECT_TRUE(output.find("%container.info") == output.npos);
-}
-
-TEST_F(test_falco_engine, extra_fields_all) {
-	std::string rules_content = R"END(
- rule: legit_rule
-  desc: legit rule description
-  condition: evt.type=open
-  output: user=%user.name command=%proc.cmdline file=%fd.name
-  priority: INFO
-)END";
-
-	std::unordered_map<std::string, std::string> extra_formatted_fields = {
-	        {"my_field", "hello %evt.num"}};
-	for(auto const& f : extra_formatted_fields) {
-		m_engine->add_extra_output_formatted_field(f.first, f.second, "", {}, "");
-	}
-
-	ASSERT_TRUE(load_rules(rules_content, "legit_rules.yaml")) << m_load_result_string;
-
-	EXPECT_EQ(get_compiled_rule_formatted_fields("legit_rule"), extra_formatted_fields);
-}
--- a/unit_tests/engine/test_falco_utils.cpp
+++ b/unit_tests/engine/test_falco_utils.cpp
@@ -18,7 +18,8 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include <engine/falco_utils.h>

-TEST(FalcoUtils, is_unix_scheme) {
+TEST(FalcoUtils, is_unix_scheme)
+{
 	/* Wrong prefix */
 	ASSERT_EQ(falco::utils::network::is_unix_scheme("something:///run/falco/falco.sock"), false);

@@ -37,14 +38,15 @@ TEST(FalcoUtils, is_unix_scheme) {
 	ASSERT_EQ(falco::utils::network::is_unix_scheme(url_char), true);
 }

-TEST(FalcoUtils, parse_prometheus_interval) {
+TEST(FalcoUtils, parse_prometheus_interval)
+{
 	/* Test matrix around correct time conversions. */
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1ms"), 1UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1s"), 1000UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1m"), 60000UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1h"), 3600000UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1d"), 86400000UL);
-	ASSERT_EQ(falco::utils::parse_prometheus_interval("1w"), 604800000UL);
+	ASSERT_EQ(falco::utils::parse_prometheus_interval("1w"), 604800000UL);	
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("1y"), (unsigned long)31536000000UL);

 	ASSERT_EQ(falco::utils::parse_prometheus_interval("300ms"), 300UL);
@@ -55,11 +57,8 @@ TEST(FalcoUtils, parse_prometheus_interval) {
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("60m"), 3600000UL);

 	/* Test matrix for concatenated time interval examples. */
-	ASSERT_EQ(falco::utils::parse_prometheus_interval("1h3m2s1ms"),
-	          3600000UL + 3 * 60000UL + 2 * 1000UL + 1UL);
-	ASSERT_EQ(falco::utils::parse_prometheus_interval("1y1w1d1h1m1s1ms"),
-	          (unsigned long)31536000000UL + 604800000UL + 86400000UL + 3600000UL + 60000UL +
-	                  1000UL + 1UL);
+	ASSERT_EQ(falco::utils::parse_prometheus_interval("1h3m2s1ms"), 3600000UL + 3 * 60000UL + 2 * 1000UL + 1UL);
+	ASSERT_EQ(falco::utils::parse_prometheus_interval("1y1w1d1h1m1s1ms"),(unsigned long) 31536000000UL + 604800000UL + 86400000UL + 3600000UL + 60000UL + 1000UL + 1UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("2h5m"), 2 * 3600000UL + 5 * 60000UL);
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("2h 5m"), 2 * 3600000UL + 5 * 60000UL);

@@ -74,16 +73,16 @@ TEST(FalcoUtils, parse_prometheus_interval) {
 	ASSERT_EQ(falco::utils::parse_prometheus_interval("200"), 0UL);
 }

-TEST(FalcoUtils, sanitize_rule_name) {
-	ASSERT_EQ(falco::utils::sanitize_rule_name("Testing rule   2 (CVE-2244)"),
-	          "Testing_rule_2_CVE_2244");
-	ASSERT_EQ(falco::utils::sanitize_rule_name("Testing rule__:2)"), "Testing_rule_:2");
-	ASSERT_EQ(falco::utils::sanitize_rule_name("This@is_a$test rule123"), "This_is_a_test_rule123");
-	ASSERT_EQ(falco::utils::sanitize_rule_name("RULEwith:special#characters"),
-	          "RULEwith:special_characters");
+TEST(FalcoUtils, sanitize_metric_name)
+{
+	ASSERT_EQ(falco::utils::sanitize_metric_name("Testing rule   2 (CVE-2244)"), "Testing_rule_2_CVE_2244");
+	ASSERT_EQ(falco::utils::sanitize_metric_name("Testing rule__:2)"), "Testing_rule_:2");
+	ASSERT_EQ(falco::utils::sanitize_metric_name("This@is_a$test rule123"), "This_is_a_test_rule123");
+	ASSERT_EQ(falco::utils::sanitize_metric_name("RULEwith:special#characters"), "RULEwith:special_characters");
 }

-TEST(FalcoUtils, matches_wildcard) {
+TEST(FalcoUtils, matches_wildcard)
+{
 	ASSERT_TRUE(falco::utils::matches_wildcard("*", "anything"));
 	ASSERT_TRUE(falco::utils::matches_wildcard("**", "anything"));
 	ASSERT_TRUE(falco::utils::matches_wildcard("*", ""));
--- a/unit_tests/engine/test_filter_details_resolver.cpp
+++ b/unit_tests/engine/test_filter_details_resolver.cpp
@@ -18,33 +18,33 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include <engine/filter_details_resolver.h>

-TEST(DetailsResolver, resolve_ast) {
-	std::string cond =
-	        "(spawned_process or evt.type = open) and (proc.name icontains cat or proc.name in "
-	        "(known_procs, ps))";
-	auto ast = libsinsp::filter::parser(cond).parse();
-	filter_details details;
-	details.known_macros.insert("spawned_process");
-	details.known_lists.insert("known_procs");
-	filter_details_resolver resolver;
-	resolver.run(ast.get(), details);

-	// Assert fields
-	ASSERT_EQ(details.fields.size(), 2);
-	ASSERT_NE(details.fields.find("evt.type"), details.fields.end());
-	ASSERT_NE(details.fields.find("proc.name"), details.fields.end());
+TEST(DetailsResolver, resolve_ast)
+{
+    std::string cond = "(spawned_process or evt.type = open) and (proc.name icontains cat or proc.name in (known_procs, ps))";
+    auto ast = libsinsp::filter::parser(cond).parse();
+    filter_details details;
+    details.known_macros.insert("spawned_process");
+    details.known_lists.insert("known_procs");
+    filter_details_resolver resolver;
+    resolver.run(ast.get(), details);

-	// Assert macros
-	ASSERT_EQ(details.macros.size(), 1);
-	ASSERT_NE(details.macros.find("spawned_process"), details.macros.end());
+    // Assert fields
+    ASSERT_EQ(details.fields.size(), 2);
+    ASSERT_NE(details.fields.find("evt.type"), details.fields.end());
+    ASSERT_NE(details.fields.find("proc.name"), details.fields.end());

-	// Assert operators
-	ASSERT_EQ(details.operators.size(), 3);
-	ASSERT_NE(details.operators.find("="), details.operators.end());
-	ASSERT_NE(details.operators.find("icontains"), details.operators.end());
-	ASSERT_NE(details.operators.find("in"), details.operators.end());
+    // Assert macros
+    ASSERT_EQ(details.macros.size(), 1);
+    ASSERT_NE(details.macros.find("spawned_process"), details.macros.end());
+    
+    // Assert operators
+    ASSERT_EQ(details.operators.size(), 3);
+    ASSERT_NE(details.operators.find("="), details.operators.end());
+    ASSERT_NE(details.operators.find("icontains"), details.operators.end());
+    ASSERT_NE(details.operators.find("in"), details.operators.end());

-	// Assert lists
-	ASSERT_EQ(details.lists.size(), 1);
-	ASSERT_NE(details.lists.find("known_procs"), details.lists.end());
+    // Assert lists
+    ASSERT_EQ(details.lists.size(), 1);
+    ASSERT_NE(details.lists.find("known_procs"), details.lists.end());
 }
--- a/unit_tests/engine/test_filter_macro_resolver.cpp
+++ b/unit_tests/engine/test_filter_macro_resolver.cpp
@@ -21,37 +21,33 @@ limitations under the License.
 namespace filter_ast = libsinsp::filter::ast;

 static std::vector<filter_macro_resolver::value_info>::const_iterator find_value(
-        const std::vector<filter_macro_resolver::value_info>& values,
-        const std::string& ref) {
+	const std::vector<filter_macro_resolver::value_info>& values,
+	const std::string& ref)
+{
 	return std::find_if(
-	        values.begin(),
-	        values.end(),
-	        [&ref](const filter_macro_resolver::value_info& v) { return v.first == ref; });
+		values.begin(),
+		values.end(),
+		[&ref](const filter_macro_resolver::value_info& v)
+		{ return v.first == ref; });
 }

 #define MACRO_NAME "test_macro"
 #define MACRO_A_NAME "test_macro_1"
 #define MACRO_B_NAME "test_macro_2"

-TEST(MacroResolver, should_resolve_macros_on_a_filter_AST) {
+TEST(MacroResolver, should_resolve_macros_on_a_filter_AST)
+{
 	filter_ast::pos_info macro_pos(12, 85, 27);

-	std::shared_ptr<filter_ast::expr> macro =
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""),
-	                                             "exists");
+	std::shared_ptr<filter_ast::expr> macro = filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""), "exists");

 	std::vector<std::unique_ptr<filter_ast::expr>> filter_and;
-	filter_and.push_back(
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("evt.name", ""),
-	                                             "exists"));
-	filter_and.push_back(filter_ast::not_expr::create(
-	        filter_ast::identifier_expr::create(MACRO_NAME, macro_pos)));
+	filter_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("evt.name", ""), "exists"));
+	filter_and.push_back(filter_ast::not_expr::create(filter_ast::identifier_expr::create(MACRO_NAME, macro_pos)));
 	std::shared_ptr<filter_ast::expr> filter = filter_ast::and_expr::create(filter_and);

 	std::vector<std::unique_ptr<filter_ast::expr>> expected_and;
-	expected_and.push_back(
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("evt.name", ""),
-	                                             "exists"));
+	expected_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("evt.name", ""), "exists"));
 	expected_and.push_back(filter_ast::not_expr::create(clone(macro.get())));
 	std::shared_ptr<filter_ast::expr> expected = filter_ast::and_expr::create(expected_and);

@@ -73,15 +69,13 @@ TEST(MacroResolver, should_resolve_macros_on_a_filter_AST) {
 	ASSERT_TRUE(filter->is_equal(expected.get()));
 }

-TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_single_node) {
+TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_single_node)
+{
 	filter_ast::pos_info macro_pos(12, 85, 27);

-	std::shared_ptr<filter_ast::expr> macro =
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""),
-	                                             "exists");
+	std::shared_ptr<filter_ast::expr> macro = filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""), "exists");

-	std::shared_ptr<filter_ast::expr> filter =
-	        filter_ast::identifier_expr::create(MACRO_NAME, macro_pos);
+	std::shared_ptr<filter_ast::expr> filter = filter_ast::identifier_expr::create(MACRO_NAME, macro_pos);

 	filter_macro_resolver resolver;
 	resolver.set_macro(MACRO_NAME, macro);
@@ -105,16 +99,13 @@ TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_single_node) {
 	ASSERT_TRUE(filter->is_equal(macro.get()));
 }

-TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_multiple_macros) {
+TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_multiple_macros)
+{
 	filter_ast::pos_info a_macro_pos(11, 75, 43);
 	filter_ast::pos_info b_macro_pos(91, 21, 9);

-	std::shared_ptr<filter_ast::expr> a_macro =
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""),
-	                                             "exists");
-	std::shared_ptr<filter_ast::expr> b_macro = filter_ast::unary_check_expr::create(
-	        filter_ast::field_expr::create("another.field", ""),
-	        "exists");
+	std::shared_ptr<filter_ast::expr> a_macro = filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""), "exists");
+	std::shared_ptr<filter_ast::expr> b_macro = filter_ast::unary_check_expr::create(filter_ast::field_expr::create("another.field", ""), "exists");

 	std::vector<std::unique_ptr<filter_ast::expr>> filter_or;
 	filter_or.push_back(filter_ast::identifier_expr::create(MACRO_A_NAME, a_macro_pos));
@@ -152,31 +143,24 @@ TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_multiple_macros) {
 	ASSERT_TRUE(filter->is_equal(expected_filter.get()));
 }

-TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_nested_macros) {
+TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_nested_macros)
+{
 	filter_ast::pos_info a_macro_pos(47, 1, 76);
 	filter_ast::pos_info b_macro_pos(111, 65, 2);

 	std::vector<std::unique_ptr<filter_ast::expr>> a_macro_and;
-	a_macro_and.push_back(
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""),
-	                                             "exists"));
+	a_macro_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""), "exists"));
 	a_macro_and.push_back(filter_ast::identifier_expr::create(MACRO_B_NAME, b_macro_pos));
 	std::shared_ptr<filter_ast::expr> a_macro = filter_ast::and_expr::create(a_macro_and);

-	std::shared_ptr<filter_ast::expr> b_macro = filter_ast::unary_check_expr::create(
-	        filter_ast::field_expr::create("another.field", ""),
-	        "exists");
+	std::shared_ptr<filter_ast::expr> b_macro =
+		filter_ast::unary_check_expr::create(filter_ast::field_expr::create("another.field", ""), "exists");

-	std::shared_ptr<filter_ast::expr> filter =
-	        filter_ast::identifier_expr::create(MACRO_A_NAME, a_macro_pos);
+	std::shared_ptr<filter_ast::expr> filter = filter_ast::identifier_expr::create(MACRO_A_NAME, a_macro_pos);

 	std::vector<std::unique_ptr<filter_ast::expr>> expected_and;
-	expected_and.push_back(
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""),
-	                                             "exists"));
-	expected_and.push_back(filter_ast::unary_check_expr::create(
-	        filter_ast::field_expr::create("another.field", ""),
-	        "exists"));
+	expected_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""), "exists"));
+	expected_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("another.field", ""), "exists"));
 	std::shared_ptr<filter_ast::expr> expected_filter = filter_ast::and_expr::create(expected_and);

 	filter_macro_resolver resolver;
@@ -207,15 +191,13 @@ TEST(MacroResolver, should_resolve_macros_on_a_filter_AST_nested_macros) {
 	ASSERT_TRUE(filter->is_equal(expected_filter.get()));
 }

-TEST(MacroResolver, should_find_unknown_macros) {
+TEST(MacroResolver, should_find_unknown_macros)
+{
 	filter_ast::pos_info macro_pos(9, 4, 2);

 	std::vector<std::unique_ptr<filter_ast::expr>> filter_and;
-	filter_and.push_back(
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("evt.name", ""),
-	                                             "exists"));
-	filter_and.push_back(filter_ast::not_expr::create(
-	        filter_ast::identifier_expr::create(MACRO_NAME, macro_pos)));
+	filter_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("evt.name", ""), "exists"));
+	filter_and.push_back(filter_ast::not_expr::create(filter_ast::identifier_expr::create(MACRO_NAME, macro_pos)));
 	std::shared_ptr<filter_ast::expr> filter = filter_ast::and_expr::create(filter_and);

 	filter_macro_resolver resolver;
@@ -226,19 +208,17 @@ TEST(MacroResolver, should_find_unknown_macros) {
 	ASSERT_TRUE(resolver.get_resolved_macros().empty());
 }

-TEST(MacroResolver, should_find_unknown_nested_macros) {
+TEST(MacroResolver, should_find_unknown_nested_macros)
+{
 	filter_ast::pos_info a_macro_pos(32, 84, 9);
 	filter_ast::pos_info b_macro_pos(1, 0, 5);

 	std::vector<std::unique_ptr<filter_ast::expr>> a_macro_and;
-	a_macro_and.push_back(
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""),
-	                                             "exists"));
+	a_macro_and.push_back(filter_ast::unary_check_expr::create(filter_ast::field_expr::create("one.field", ""), "exists"));
 	a_macro_and.push_back(filter_ast::identifier_expr::create(MACRO_B_NAME, b_macro_pos));
 	std::shared_ptr<filter_ast::expr> a_macro = filter_ast::and_expr::create(a_macro_and);

-	std::shared_ptr<filter_ast::expr> filter =
-	        filter_ast::identifier_expr::create(MACRO_A_NAME, a_macro_pos);
+	std::shared_ptr<filter_ast::expr> filter = filter_ast::identifier_expr::create(MACRO_A_NAME, a_macro_pos);
 	auto expected_filter = clone(a_macro.get());

 	filter_macro_resolver resolver;
@@ -254,17 +234,14 @@ TEST(MacroResolver, should_find_unknown_nested_macros) {
 	ASSERT_TRUE(filter->is_equal(expected_filter.get()));
 }

-TEST(MacroResolver, should_undefine_macro) {
+TEST(MacroResolver, should_undefine_macro)
+{
 	filter_ast::pos_info macro_pos_1(12, 9, 3);
 	filter_ast::pos_info macro_pos_2(9, 6, 3);

-	std::shared_ptr<filter_ast::expr> macro =
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""),
-	                                             "exists");
-	std::shared_ptr<filter_ast::expr> a_filter =
-	        filter_ast::identifier_expr::create(MACRO_NAME, macro_pos_1);
-	std::shared_ptr<filter_ast::expr> b_filter =
-	        filter_ast::identifier_expr::create(MACRO_NAME, macro_pos_2);
+	std::shared_ptr<filter_ast::expr> macro = filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""), "exists");
+	std::shared_ptr<filter_ast::expr> a_filter = filter_ast::identifier_expr::create(MACRO_NAME, macro_pos_1);
+	std::shared_ptr<filter_ast::expr> b_filter = filter_ast::identifier_expr::create(MACRO_NAME, macro_pos_2);
 	filter_macro_resolver resolver;

 	resolver.set_macro(MACRO_NAME, macro);
@@ -284,13 +261,11 @@ TEST(MacroResolver, should_undefine_macro) {
 }

 /* checks that the macro AST is cloned and not shared across resolved filters */
-TEST(MacroResolver, should_clone_macro_AST) {
+TEST(MacroResolver, should_clone_macro_AST)
+{
 	filter_ast::pos_info macro_pos(5, 2, 8888);
-	std::shared_ptr<filter_ast::unary_check_expr> macro =
-	        filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""),
-	                                             "exists");
-	std::shared_ptr<filter_ast::expr> filter =
-	        filter_ast::identifier_expr::create(MACRO_NAME, macro_pos);
+	std::shared_ptr<filter_ast::unary_check_expr> macro = filter_ast::unary_check_expr::create(filter_ast::field_expr::create("test.field", ""), "exists");
+	std::shared_ptr<filter_ast::expr> filter = filter_ast::identifier_expr::create(MACRO_NAME, macro_pos);
 	filter_macro_resolver resolver;

 	resolver.set_macro(MACRO_NAME, macro);
--- a/unit_tests/engine/test_filter_warning_resolver.cpp
+++ b/unit_tests/engine/test_filter_warning_resolver.cpp
@@ -18,14 +18,16 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include <engine/filter_warning_resolver.h>

-static bool warns(const std::string& condition) {
+static bool warns(const std::string& condition)
+{
 	std::set<falco::load_result::warning_code> w;
 	auto ast = libsinsp::filter::parser(condition).parse();
 	filter_warning_resolver().run(ast.get(), w);
 	return !w.empty();
 }

-TEST(WarningResolver, warnings_in_filtering_conditions) {
+TEST(WarningResolver, warnings_in_filtering_conditions)
+{
 	ASSERT_FALSE(warns("ka.field exists"));
 	ASSERT_FALSE(warns("some.field = <NA>"));
 	ASSERT_TRUE(warns("jevt.field = <NA>"));
--- a/unit_tests/engine/test_plugin_requirements.cpp
+++ b/unit_tests/engine/test_plugin_requirements.cpp
@@ -20,19 +20,22 @@ limitations under the License.
 #include <gtest/gtest.h>

 static bool check_requirements(std::string& err,
-                               const std::vector<falco_engine::plugin_version_requirement>& plugins,
-                               const std::string& ruleset_content) {
+			       const std::vector<falco_engine::plugin_version_requirement>& plugins,
+			       const std::string& ruleset_content)
+{
 	falco_engine e;
 	falco::load_result::rules_contents_t c = {{"test", ruleset_content}};

 	auto res = e.load_rules(c.begin()->second, c.begin()->first);
-	if(!res->successful()) {
+	if(!res->successful())
+	{
 		return false;
 	}
 	return e.check_plugin_requirements(plugins, err);
 }

-TEST(PluginRequirements, check_plugin_requirements_success) {
+TEST(PluginRequirements, check_plugin_requirements_success)
+{
 	std::string error;

 	/* No requirement */
@@ -44,7 +47,7 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
  - name: k8saudit
    version: 0.1.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin newer version */
 	ASSERT_TRUE(check_requirements(error, {{"k8saudit", "0.2.0"}}, R"(
@@ -52,7 +55,7 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
  - name: k8saudit
    version: 0.1.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Multiple plugins */
 	ASSERT_TRUE(check_requirements(error, {{"k8saudit", "0.1.0"}, {"json", "0.3.0"}}, R"(
@@ -62,7 +65,7 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
  - name: json
    version: 0.3.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin multiple versions */
 	ASSERT_TRUE(check_requirements(error, {{"k8saudit", "0.2.0"}}, R"(
@@ -73,7 +76,7 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
  - name: k8saudit
    version: 0.2.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin with alternatives */
 	ASSERT_TRUE(check_requirements(error, {{"k8saudit-other", "0.5.0"}}, R"(
@@ -84,7 +87,7 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
      - name: k8saudit-other
        version: 0.4.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Multiple plugins with alternatives */
 	ASSERT_TRUE(check_requirements(error, {{"k8saudit-other", "0.5.0"}, {"json2", "0.5.0"}}, R"(
@@ -100,7 +103,7 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
      - name: json2
        version: 0.1.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Multiple plugins with alternatives with multiple versions */
 	ASSERT_TRUE(check_requirements(error, {{"k8saudit-other", "0.7.0"}, {"json2", "0.5.0"}}, R"(
@@ -122,10 +125,11 @@ TEST(PluginRequirements, check_plugin_requirements_success) {
      - name: k8saudit-other
        version: 0.7.0
        )")) << error
-	         << std::endl;
+	     << std::endl;
 }

-TEST(PluginRequirements, check_plugin_requirements_reject) {
+TEST(PluginRequirements, check_plugin_requirements_reject)
+{
 	std::string error;

 	/* No plugin loaded */
@@ -134,7 +138,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
  - name: k8saudit
    version: 0.1.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin wrong name */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit", "0.1.0"}}, R"(
@@ -142,7 +146,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
  - name: k8saudit2
    version: 0.1.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin wrong version */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit", "0.1.0"}}, R"(
@@ -150,7 +154,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
  - name: k8saudit
    version: 0.2.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Multiple plugins */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit", "0.1.0"}}, R"(
@@ -160,7 +164,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
  - name: json
    version: 0.3.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin multiple versions */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit", "0.1.0"}}, R"(
@@ -171,7 +175,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
  - name: k8saudit
    version: 0.2.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin with alternatives */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit2", "0.5.0"}}, R"(
@@ -182,7 +186,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
      - name: k8saudit-other
        version: 0.4.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Single plugin with overlapping alternatives */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit", "0.5.0"}}, R"(
@@ -193,7 +197,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
      - name: k8saudit
        version: 0.4.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Multiple plugins with alternatives */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit-other", "0.5.0"}, {"json3", "0.5.0"}}, R"(
@@ -209,7 +213,7 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
      - name: json2
        version: 0.1.0
        )")) << error
-	         << std::endl;
+	     << std::endl;

 	/* Multiple plugins with alternatives with multiple versions */
 	ASSERT_FALSE(check_requirements(error, {{"k8saudit", "0.7.0"}, {"json2", "0.5.0"}}, R"(
@@ -231,5 +235,5 @@ TEST(PluginRequirements, check_plugin_requirements_reject) {
      - name: k8saudit-other
        version: 0.7.0
        )")) << error
-	         << std::endl;
+	     << std::endl;
 }
--- a/unit_tests/engine/test_rule_loader.cpp
+++ b/unit_tests/engine/test_rule_loader.cpp
--- a/unit_tests/engine/test_rulesets.cpp
+++ b/unit_tests/engine/test_rulesets.cpp
@@ -23,28 +23,32 @@ limitations under the License.
 #define RULESET_2 2

 /* Helpers methods */
-static std::shared_ptr<sinsp_filter_factory> create_factory(sinsp* inspector,
-                                                            filter_check_list& list) {
+static std::shared_ptr<sinsp_filter_factory> create_factory(sinsp* inspector, filter_check_list& list)
+{
 	return std::make_shared<sinsp_filter_factory>(inspector, list);
 }

-static std::shared_ptr<filter_ruleset> create_ruleset(std::shared_ptr<sinsp_filter_factory> f) {
+static std::shared_ptr<filter_ruleset> create_ruleset(std::shared_ptr<sinsp_filter_factory> f)
+{
 	return std::make_shared<evttype_index_ruleset>(f);
 }

-static std::shared_ptr<libsinsp::filter::ast::expr> create_ast(
-        std::shared_ptr<sinsp_filter_factory> f) {
+static std::shared_ptr<libsinsp::filter::ast::expr> create_ast(std::shared_ptr<sinsp_filter_factory> f)
+{
 	libsinsp::filter::parser parser("evt.type=open");
 	return parser.parse();
 }

-static std::shared_ptr<sinsp_filter> create_filter(std::shared_ptr<sinsp_filter_factory> f,
-                                                   libsinsp::filter::ast::expr* ast) {
+static std::shared_ptr<sinsp_filter> create_filter(
+	std::shared_ptr<sinsp_filter_factory> f,
+	libsinsp::filter::ast::expr* ast)
+{
 	sinsp_filter_compiler compiler(f, ast);
 	return std::shared_ptr<sinsp_filter>(compiler.compile());
 }

-TEST(Ruleset, enable_disable_rules_using_names) {
+TEST(Ruleset, enable_disable_rules_using_names)
+{
 	sinsp inspector;

 	sinsp_filter_check_list filterlist;
@@ -136,7 +140,8 @@ TEST(Ruleset, enable_disable_rules_using_names) {
 	ASSERT_EQ(r->enabled_count(RULESET_2), 0);
 }

-TEST(Ruleset, enable_disable_rules_using_tags) {
+TEST(Ruleset, enable_disable_rules_using_tags)
+{
 	sinsp inspector;

 	sinsp_filter_check_list filterlist;
--- a/unit_tests/falco/app/actions/app_action_helpers.h
+++ b/unit_tests/falco/app/actions/app_action_helpers.h
@@ -19,17 +19,5 @@ limitations under the License.
 #include <falco/app/state.h>
 #include <falco/app/actions/actions.h>

-#define EXPECT_ACTION_OK(r)           \
-	{                                 \
-		auto result = r;              \
-		EXPECT_TRUE(result.success);  \
-		EXPECT_TRUE(result.proceed);  \
-		EXPECT_EQ(result.errstr, ""); \
-	}
-#define EXPECT_ACTION_FAIL(r)         \
-	{                                 \
-		auto result = r;              \
-		EXPECT_FALSE(result.success); \
-		EXPECT_FALSE(result.proceed); \
-		EXPECT_NE(result.errstr, ""); \
-	}
+#define EXPECT_ACTION_OK(r)     { auto result = r; EXPECT_TRUE(result.success); EXPECT_TRUE(result.proceed); EXPECT_EQ(result.errstr, ""); }
+#define EXPECT_ACTION_FAIL(r)   { auto result = r; EXPECT_FALSE(result.success); EXPECT_FALSE(result.proceed); EXPECT_NE(result.errstr, ""); }
--- a/unit_tests/falco/app/actions/test_configure_interesting_sets.cpp
+++ b/unit_tests/falco/app/actions/test_configure_interesting_sets.cpp
@@ -23,21 +23,23 @@ limitations under the License.
 #include <falco/app/app.h>
 #include "app_action_helpers.h"

-#define ASSERT_NAMES_EQ(a, b)                          \
-	{                                                  \
-		EXPECT_EQ(_order(a).size(), _order(b).size()); \
-		ASSERT_EQ(_order(a), _order(b));               \
-	}
+#define ASSERT_NAMES_EQ(a, b) { \
+	EXPECT_EQ(_order(a).size(), _order(b).size()); \
+	ASSERT_EQ(_order(a), _order(b)); \
+}

-#define ASSERT_NAMES_CONTAIN(a, b) \
-	{ ASSERT_NAMES_EQ(unordered_set_intersection(a, b), b); }
+#define ASSERT_NAMES_CONTAIN(a, b) { \
+	ASSERT_NAMES_EQ(unordered_set_intersection(a, b), b); \
+}

-#define ASSERT_NAMES_NOCONTAIN(a, b) \
-	{ ASSERT_NAMES_EQ(unordered_set_intersection(a, b), strset_t({})); }
+#define ASSERT_NAMES_NOCONTAIN(a, b) { \
+	ASSERT_NAMES_EQ(unordered_set_intersection(a, b), strset_t({})); \
+}

 using strset_t = std::unordered_set<std::string>;

-static std::set<std::string> _order(const strset_t& s) {
+static std::set<std::string> _order(const strset_t& s) 
+{
 	return std::set<std::string>(s.begin(), s.end());
 }

@@ -46,31 +48,38 @@ static std::string s_sample_ruleset = "sample-ruleset";
 static std::string s_sample_source = falco_common::syscall_source;

 static strset_t s_sample_filters = {
-        "evt.type=connect or evt.type=accept or evt.type=accept4 or evt.type=umount2",
-        "evt.type in (open, ptrace, mmap, execve, read, container)",
-        "evt.type in (open, execve, mprotect) and not evt.type=mprotect"};
+	"evt.type=connect or evt.type=accept or evt.type=accept4 or evt.type=umount2",
+	"evt.type in (open, ptrace, mmap, execve, read, container)",
+	"evt.type in (open, execve, mprotect) and not evt.type=mprotect"};

-static strset_t s_sample_generic_filters = {"evt.type=syncfs or evt.type=fanotify_init"};
+static strset_t s_sample_generic_filters = {
+	"evt.type=syncfs or evt.type=fanotify_init"};

 static strset_t s_sample_nonsyscall_filters = {
-        "evt.type in (procexit, switch, pluginevent, container)"};
+	"evt.type in (procexit, switch, pluginevent, container)"};

-static std::string ruleset_from_filters(const strset_t& filters) {
+
+static std::string ruleset_from_filters(const strset_t& filters)
+{
 	std::string dummy_rules;
 	falco::load_result::rules_contents_t content = {{"dummy_rules.yaml", dummy_rules}};
 	int n_rules = 0;
-	for(const auto& f : filters) {
+	for (const auto& f : filters)
+	{
 		n_rules++;
-		dummy_rules += "- rule: Dummy Rule " + std::to_string(n_rules) + "\n" +
-		               "  output: Dummy Output " + std::to_string(n_rules) + "\n" +
-		               "  condition: " + f + "\n" + "  desc: Dummy Desc " +
-		               std::to_string(n_rules) + "\n" + "  priority: CRITICAL\n\n";
+		dummy_rules +=
+			"- rule: Dummy Rule " + std::to_string(n_rules) + "\n"
+			+ "  output: Dummy Output " + std::to_string(n_rules) + "\n"
+			+ "  condition: " + f + "\n"
+			+ "  desc: Dummy Desc " + std::to_string(n_rules) + "\n"
+			+ "  priority: CRITICAL\n\n";
 	}

 	return dummy_rules;
 }

-TEST_F(test_falco_engine, engine_codes_syscalls_set) {
+TEST_F(test_falco_engine, engine_codes_syscalls_set)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	auto enabled_count = m_engine->num_rules_for_ruleset(s_sample_ruleset);
@@ -79,37 +88,20 @@ TEST_F(test_falco_engine, engine_codes_syscalls_set) {
 	// test if event code names were extracted from each rule in test ruleset.
 	auto rules_event_set = m_engine->event_codes_for_ruleset(s_sample_source);
 	auto rules_event_names = libsinsp::events::event_set_to_names(rules_event_set);
-	ASSERT_NAMES_EQ(rules_event_names,
-	                strset_t({"connect",
-	                          "accept",
-	                          "accept4",
-	                          "umount2",
-	                          "open",
-	                          "ptrace",
-	                          "mmap",
-	                          "execve",
-	                          "read",
-	                          "container",
-	                          "asyncevent"}));
+	ASSERT_NAMES_EQ(rules_event_names, strset_t({
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "read", "container", "asyncevent"}));

 	// test if sc code names were extracted from each rule in test ruleset.
 	// note, this is not supposed to contain "container", as that's an event
 	// not mapped through the ppm_sc_code enumerative.
 	auto rules_sc_set = m_engine->sc_codes_for_ruleset(s_sample_source);
 	auto rules_sc_names = libsinsp::events::sc_set_to_event_names(rules_sc_set);
-	ASSERT_NAMES_EQ(rules_sc_names,
-	                strset_t({"connect",
-	                          "accept",
-	                          "accept4",
-	                          "umount2",
-	                          "open",
-	                          "ptrace",
-	                          "mmap",
-	                          "execve",
-	                          "read"}));
+	ASSERT_NAMES_EQ(rules_sc_names, strset_t({
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "read"}));
 }

-TEST_F(test_falco_engine, preconditions_postconditions) {
+TEST_F(test_falco_engine, preconditions_postconditions)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	falco::app::state s1;
@@ -139,7 +131,8 @@ TEST_F(test_falco_engine, preconditions_postconditions) {
 	ASSERT_EQ(prev_selection_size, s1.selected_sc_set.size());
 }

-TEST_F(test_falco_engine, engine_codes_nonsyscalls_set) {
+TEST_F(test_falco_engine, engine_codes_nonsyscalls_set)
+{
 	auto filters = s_sample_filters;
 	filters.insert(s_sample_generic_filters.begin(), s_sample_generic_filters.end());
 	filters.insert(s_sample_nonsyscall_filters.begin(), s_sample_nonsyscall_filters.end());
@@ -156,44 +149,22 @@ TEST_F(test_falco_engine, engine_codes_nonsyscalls_set) {
 	// PPME_GENERIC_E will cause all names of generic events to be added!
 	// This is a good example of information loss from ppm_event_code <-> ppm_sc_code.
 	auto generic_names = libsinsp::events::event_set_to_names({ppm_event_code::PPME_GENERIC_E});
-	auto expected_names = strset_t({"connect",
-	                                "accept",
-	                                "accept4",
-	                                "umount2",
-	                                "open",
-	                                "ptrace",
-	                                "mmap",
-	                                "execve",
-	                                "read",
-	                                "container",  // ruleset
-	                                "procexit",
-	                                "switch",
-	                                "pluginevent",
-	                                "asyncevent"});  // from non-syscall event filters
+	auto expected_names = strset_t({
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "read", "container", // ruleset
+		"procexit", "switch", "pluginevent", "asyncevent"}); // from non-syscall event filters
 	expected_names.insert(generic_names.begin(), generic_names.end());
 	ASSERT_NAMES_EQ(rules_event_names, expected_names);

 	auto rules_sc_set = m_engine->sc_codes_for_ruleset(s_sample_source);
 	auto rules_sc_names = libsinsp::events::sc_set_to_event_names(rules_sc_set);
-	ASSERT_NAMES_EQ(rules_sc_names,
-	                strset_t({
-	                        "connect",
-	                        "accept",
-	                        "accept4",
-	                        "umount2",
-	                        "open",
-	                        "ptrace",
-	                        "mmap",
-	                        "execve",
-	                        "read",
-	                        "procexit",
-	                        "switch",
-	                        "syncfs",
-	                        "fanotify_init",  // from generic event filters
-	                }));
+	ASSERT_NAMES_EQ(rules_sc_names, strset_t({
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "read",
+		"procexit", "switch", "syncfs", "fanotify_init", // from generic event filters
+	}));
 }

-TEST_F(test_falco_engine, selection_not_allevents) {
+TEST_F(test_falco_engine, selection_not_allevents)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	falco::app::state s2;
@@ -213,22 +184,10 @@ TEST_F(test_falco_engine, selection_not_allevents) {
 	ASSERT_GT(s2.selected_sc_set.size(), 1);
 	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s2.selected_sc_set);
 	auto expected_sc_names = strset_t({
-	        // note: we expect the "read" syscall to have been erased
-	        "connect",
-	        "accept",
-	        "accept4",
-	        "umount2",
-	        "open",
-	        "ptrace",
-	        "mmap",
-	        "execve",  // from ruleset
-	        "clone",
-	        "clone3",
-	        "fork",
-	        "vfork",  // from sinsp state set (spawned_process)
-	        "socket",
-	        "bind",
-	        "close"  // from sinsp state set (network, files)
+		// note: we expect the "read" syscall to have been erased
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", // from ruleset
+		"clone", "clone3", "fork", "vfork", // from sinsp state set (spawned_process)
+		"socket", "bind", "close" // from sinsp state set (network, files)
 	});
 	ASSERT_NAMES_CONTAIN(selected_sc_names, expected_sc_names);

@@ -240,7 +199,8 @@ TEST_F(test_falco_engine, selection_not_allevents) {
 	// check that final selected set is exactly sinsp state + ruleset
 	auto rule_set = s2.engine->sc_codes_for_ruleset(s_sample_source, s_sample_ruleset);
 	auto state_set = libsinsp::events::sinsp_state_sc_set();
-	for(const auto& erased : ignored_set) {
+	for (const auto &erased : ignored_set)
+	{
 		rule_set.remove(erased);
 		state_set.remove(erased);
 	}
@@ -250,7 +210,8 @@ TEST_F(test_falco_engine, selection_not_allevents) {
 	ASSERT_EQ(s2.selected_sc_set, union_set);
 }

-TEST_F(test_falco_engine, selection_allevents) {
+TEST_F(test_falco_engine, selection_allevents)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	falco::app::state s3;
@@ -268,23 +229,10 @@ TEST_F(test_falco_engine, selection_allevents) {
 	ASSERT_GT(s3.selected_sc_set.size(), 1);
 	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s3.selected_sc_set);
 	auto expected_sc_names = strset_t({
-	        // note: we expect the "read" syscall to not be erased
-	        "connect",
-	        "accept",
-	        "accept4",
-	        "umount2",
-	        "open",
-	        "ptrace",
-	        "mmap",
-	        "execve",
-	        "read",  // from ruleset
-	        "clone",
-	        "clone3",
-	        "fork",
-	        "vfork",  // from sinsp state set (spawned_process)
-	        "socket",
-	        "bind",
-	        "close"  // from sinsp state set (network, files)
+		// note: we expect the "read" syscall to not be erased
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "read", // from ruleset
+		"clone", "clone3", "fork", "vfork", // from sinsp state set (spawned_process)
+		"socket", "bind", "close" // from sinsp state set (network, files)
 	});
 	ASSERT_NAMES_CONTAIN(selected_sc_names, expected_sc_names);

@@ -297,7 +245,8 @@ TEST_F(test_falco_engine, selection_allevents) {
 	ASSERT_EQ(s3.selected_sc_set, union_set);
 }

-TEST_F(test_falco_engine, selection_generic_evts) {
+TEST_F(test_falco_engine, selection_generic_evts)
+{
 	falco::app::state s4;
 	// run app action with fake engine and without the `-A` option
 	s4.options.all_events = false;
@@ -313,28 +262,14 @@ TEST_F(test_falco_engine, selection_generic_evts) {
 	ASSERT_GT(s4.selected_sc_set.size(), 1);
 	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s4.selected_sc_set);
 	auto expected_sc_names = strset_t({
-	        // note: we expect the "read" syscall to not be erased
-	        "connect",
-	        "accept",
-	        "accept4",
-	        "umount2",
-	        "open",
-	        "ptrace",
-	        "mmap",
-	        "execve",  // from ruleset
-	        "syncfs",
-	        "fanotify_init",  // from ruleset (generic events)
-	        "clone",
-	        "clone3",
-	        "fork",
-	        "vfork",  // from sinsp state set (spawned_process)
-	        "socket",
-	        "bind",
-	        "close"  // from sinsp state set (network, files)
+		// note: we expect the "read" syscall to not be erased
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", // from ruleset
+		"syncfs", "fanotify_init",  // from ruleset (generic events)
+		"clone", "clone3", "fork", "vfork", // from sinsp state set (spawned_process)
+		"socket", "bind", "close" // from sinsp state set (network, files)
 	});
 	ASSERT_NAMES_CONTAIN(selected_sc_names, expected_sc_names);
-	auto unexpected_sc_names =
-	        libsinsp::events::sc_set_to_event_names(falco::app::ignored_sc_set());
+	auto unexpected_sc_names = libsinsp::events::sc_set_to_event_names(falco::app::ignored_sc_set());
 	ASSERT_NAMES_NOCONTAIN(selected_sc_names, unexpected_sc_names);
 }

@@ -343,7 +278,8 @@ TEST_F(test_falco_engine, selection_generic_evts) {
 //   (either default or custom positive set)
 // - events in the custom negative set are removed from the selected set
 // - if `-A` is not set, events from the IO set are removed from the selected set
-TEST_F(test_falco_engine, selection_custom_base_set) {
+TEST_F(test_falco_engine, selection_custom_base_set)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	falco::app::state s5;
@@ -359,24 +295,17 @@ TEST_F(test_falco_engine, selection_custom_base_set) {
 	ASSERT_TRUE(result.success);
 	ASSERT_EQ(result.errstr, "");
 	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s5.selected_sc_set);
-	auto expected_sc_names =
-	        strset_t({// note: `syncfs` has been added due to the custom base set, and `accept`
-	                  // has been remove due to the negative base set.
-	                  // note: `read` is not ignored due to the "-A" option being set.
-	                  // note: `accept` is not included even though it is matched by the rules,
-	                  // which means that the custom negation base set has precedence over the
-	                  // final selection set as a whole
-	                  // note(jasondellaluce): "accept4" should be added, however old versions
-	                  // of the ACCEPT4 event are actually named "accept" in the event table
-	                  "connect",
-	                  "umount2",
-	                  "open",
-	                  "ptrace",
-	                  "mmap",
-	                  "execve",
-	                  "read",
-	                  "syncfs",
-	                  "procexit"});
+	auto expected_sc_names = strset_t({
+		// note: `syncfs` has been added due to the custom base set, and `accept`
+		// has been remove due to the negative base set.
+		// note: `read` is not ignored due to the "-A" option being set.
+		// note: `accept` is not included even though it is matched by the rules,
+		// which means that the custom negation base set has precedence over the
+		// final selection set as a whole
+		// note(jasondellaluce): "accept4" should be added, however old versions
+		// of the ACCEPT4 event are actually named "accept" in the event table
+		"connect", "umount2", "open", "ptrace", "mmap", "execve", "read", "syncfs", "procexit"
+	});
 	ASSERT_NAMES_EQ(selected_sc_names, expected_sc_names);

 	// non-empty custom base set (both positive and negative with collision)
@@ -396,18 +325,10 @@ TEST_F(test_falco_engine, selection_custom_base_set) {
 	ASSERT_TRUE(result.success);
 	ASSERT_EQ(result.errstr, "");
 	selected_sc_names = libsinsp::events::sc_set_to_event_names(s5.selected_sc_set);
-	expected_sc_names = strset_t({// note: accept is not negated anymore
-	                              "connect",
-	                              "accept",
-	                              "accept4",
-	                              "umount2",
-	                              "open",
-	                              "ptrace",
-	                              "mmap",
-	                              "execve",
-	                              "read",
-	                              "syncfs",
-	                              "procexit"});
+	expected_sc_names = strset_t({
+		// note: accept is not negated anymore
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "read", "syncfs", "procexit"
+	});
 	ASSERT_NAMES_EQ(selected_sc_names, expected_sc_names);

 	// non-empty custom base set (only negative)
@@ -417,8 +338,8 @@ TEST_F(test_falco_engine, selection_custom_base_set) {
 	ASSERT_EQ(result.errstr, "");
 	selected_sc_names = libsinsp::events::sc_set_to_event_names(s5.selected_sc_set);
 	expected_sc_names = unordered_set_union(
-	        libsinsp::events::sc_set_to_event_names(default_base_set),
-	        strset_t({"connect", "umount2", "open", "ptrace", "mmap", "execve", "read"}));
+		libsinsp::events::sc_set_to_event_names(default_base_set),
+		strset_t({ "connect", "umount2", "open", "ptrace", "mmap", "execve", "read"}));
 	expected_sc_names.erase("accept");
 	// note(jasondellaluce): "accept4" should be included, however old versions
 	// of the ACCEPT4 event are actually named "accept" in the event table
@@ -432,24 +353,18 @@ TEST_F(test_falco_engine, selection_custom_base_set) {
 	ASSERT_TRUE(result.success);
 	ASSERT_EQ(result.errstr, "");
 	selected_sc_names = libsinsp::events::sc_set_to_event_names(s5.selected_sc_set);
-	expected_sc_names = strset_t({// note: read is both part of the custom base set and the rules
-	                              // set, but we expect the unset -A option to take precedence
-	                              "connect",
-	                              "accept",
-	                              "accept4",
-	                              "umount2",
-	                              "open",
-	                              "ptrace",
-	                              "mmap",
-	                              "execve",
-	                              "procexit"});
+	expected_sc_names = strset_t({
+		// note: read is both part of the custom base set and the rules set,
+		// but we expect the unset -A option to take precedence
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "procexit"
+	});
 	ASSERT_NAMES_EQ(selected_sc_names, expected_sc_names);
-	auto unexpected_sc_names =
-	        libsinsp::events::sc_set_to_event_names(falco::app::ignored_sc_set());
+	auto unexpected_sc_names = libsinsp::events::sc_set_to_event_names(falco::app::ignored_sc_set());
 	ASSERT_NAMES_NOCONTAIN(selected_sc_names, unexpected_sc_names);
 }

-TEST_F(test_falco_engine, selection_custom_base_set_repair) {
+TEST_F(test_falco_engine, selection_custom_base_set_repair)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	falco::app::state s6;
@@ -468,29 +383,18 @@ TEST_F(test_falco_engine, selection_custom_base_set_repair) {
 	ASSERT_TRUE(result.success);
 	ASSERT_EQ(result.errstr, "");
 	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s6.selected_sc_set);
-	auto expected_sc_names = strset_t({// note: expecting syscalls from mock rules and
-	                                   // `sinsp_repair_state_sc_set` enforced syscalls
-	                                   "connect",
-	                                   "accept",
-	                                   "accept4",
-	                                   "umount2",
-	                                   "open",
-	                                   "ptrace",
-	                                   "mmap",
-	                                   "execve",
-	                                   "procexit",
-	                                   "bind",
-	                                   "socket",
-	                                   "clone3",
-	                                   "close",
-	                                   "setuid"});
+	auto expected_sc_names = strset_t({
+		// note: expecting syscalls from mock rules and `sinsp_repair_state_sc_set` enforced syscalls
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "procexit", \
+		"bind", "socket", "clone3", "close", "setuid"
+	});
 	ASSERT_NAMES_CONTAIN(selected_sc_names, expected_sc_names);
-	auto unexpected_sc_names =
-	        libsinsp::events::sc_set_to_event_names(falco::app::ignored_sc_set());
+	auto unexpected_sc_names = libsinsp::events::sc_set_to_event_names(falco::app::ignored_sc_set());
 	ASSERT_NAMES_NOCONTAIN(selected_sc_names, unexpected_sc_names);
 }

-TEST_F(test_falco_engine, selection_empty_custom_base_set_repair) {
+TEST_F(test_falco_engine, selection_empty_custom_base_set_repair)
+{
 	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");

 	falco::app::state s7;
@@ -506,71 +410,23 @@ TEST_F(test_falco_engine, selection_empty_custom_base_set_repair) {
 	ASSERT_TRUE(result.success);
 	ASSERT_EQ(result.errstr, "");
 	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s7.selected_sc_set);
-	auto expected_sc_names = strset_t({// note: expecting syscalls from mock rules and
-	                                   // `sinsp_repair_state_sc_set` enforced syscalls
-	                                   "connect",
-	                                   "accept",
-	                                   "accept4",
-	                                   "umount2",
-	                                   "open",
-	                                   "ptrace",
-	                                   "mmap",
-	                                   "execve",
-	                                   "procexit",
-	                                   "bind",
-	                                   "socket",
-	                                   "clone3",
-	                                   "close",
-	                                   "setuid"});
+	auto expected_sc_names = strset_t({
+		// note: expecting syscalls from mock rules and `sinsp_repair_state_sc_set` enforced syscalls
+		"connect", "accept", "accept4", "umount2", "open", "ptrace", "mmap", "execve", "procexit", \
+		"bind", "socket", "clone3", "close", "setuid"
+	});
 	ASSERT_NAMES_CONTAIN(selected_sc_names, expected_sc_names);
 	auto s7_state_set = libsinsp::events::sinsp_repair_state_sc_set(s7_rules_set);
 	ASSERT_EQ(s7.selected_sc_set, s7_state_set);
 	ASSERT_EQ(s7.selected_sc_set.size(), s7_state_set.size());
 }

-TEST_F(test_falco_engine, selection_base_syscalls_all) {
-	load_rules(ruleset_from_filters(s_sample_filters), "dummy_ruleset.yaml");
-
-	falco::app::state s7;
-	s7.engine = m_engine;
-
-	// simulate empty custom set but repair option set.
-	s7.config->m_base_syscalls_custom_set = {};
-	s7.config->m_base_syscalls_repair = true;
-	s7.config->m_base_syscalls_all = true;
-	auto result = falco::app::actions::configure_interesting_sets(s7);
-	auto s7_rules_set = s7.engine->sc_codes_for_ruleset(s_sample_source, s_sample_ruleset);
-	ASSERT_TRUE(result.success);
-	ASSERT_EQ(result.errstr, "");
-	auto selected_sc_names = libsinsp::events::sc_set_to_event_names(s7.selected_sc_set);
-	auto expected_sc_names = strset_t({// note: expecting syscalls from mock rules and
-	                                   // `sinsp_repair_state_sc_set` enforced syscalls
-	                                   "connect",
-	                                   "accept",
-	                                   "accept4",
-	                                   "umount2",
-	                                   "open",
-	                                   "ptrace",
-	                                   "mmap",
-	                                   "execve",
-	                                   "procexit",
-	                                   "bind",
-	                                   "socket",
-	                                   "clone3",
-	                                   "close",
-	                                   "setuid"});
-	ASSERT_NAMES_CONTAIN(selected_sc_names, expected_sc_names);
-	auto s7_state_set = libsinsp::events::sinsp_repair_state_sc_set(s7_rules_set);
-	ASSERT_EQ(s7.selected_sc_set, s7_state_set);
-	ASSERT_EQ(s7.selected_sc_set.size(), s7_state_set.size());
-}
-
-TEST(ConfigureInterestingSets, ignored_set_expected_size) {
+TEST(ConfigureInterestingSets, ignored_set_expected_size)
+{
 	// unit test fence to make sure we don't have unexpected regressions
 	// in the ignored set, to be updated in the future
-	ASSERT_EQ(falco::app::ignored_sc_set().size(), 12);
+	ASSERT_EQ(falco::app::ignored_sc_set().size(), 14);

 	// we don't expect to ignore any syscall in the default base set
-	ASSERT_EQ(falco::app::ignored_sc_set().intersect(libsinsp::events::sinsp_state_sc_set()).size(),
-	          0);
+	ASSERT_EQ(falco::app::ignored_sc_set().intersect(libsinsp::events::sinsp_state_sc_set()).size(), 0);
 }
--- a/unit_tests/falco/app/actions/test_configure_syscall_buffer_num.cpp
+++ b/unit_tests/falco/app/actions/test_configure_syscall_buffer_num.cpp
@@ -17,11 +17,13 @@ limitations under the License.

 #include "app_action_helpers.h"

-TEST(ActionConfigureSyscallBufferNum, variable_number_of_CPUs) {
+TEST(ActionConfigureSyscallBufferNum, variable_number_of_CPUs)
+{
 	auto action = falco::app::actions::configure_syscall_buffer_num;

 	ssize_t online_cpus = sysconf(_SC_NPROCESSORS_ONLN);
-	if(online_cpus <= 0) {
+	if(online_cpus <= 0)
+	{
 		FAIL() << "cannot get the number of online CPUs from the system\n";
 	}

--- a/unit_tests/falco/app/actions/test_load_config.cpp
+++ b/unit_tests/falco/app/actions/test_load_config.cpp
@@ -19,7 +19,8 @@ limitations under the License.
 #include "falco_test_var.h"

 #ifndef __EMSCRIPTEN__
-TEST(ActionLoadConfig, check_kmod_engine_config) {
+TEST(ActionLoadConfig, check_kmod_engine_config)
+{
 	falco::app::state s = {};
 	s.options.conf_filename = TEST_ENGINE_KMOD_CONFIG;
 	EXPECT_ACTION_OK(falco::app::actions::load_config(s));
@@ -46,7 +47,8 @@ TEST(ActionLoadConfig, check_kmod_engine_config) {
 	EXPECT_TRUE(s.config->m_gvisor.m_root.empty());
 }

-TEST(ActionLoadConfig, check_modern_engine_config) {
+TEST(ActionLoadConfig, check_modern_engine_config)
+{
 	falco::app::state s = {};
 	s.options.conf_filename = TEST_ENGINE_MODERN_CONFIG;
 	EXPECT_ACTION_OK(falco::app::actions::load_config(s));
--- a/unit_tests/falco/app/actions/test_select_event_sources.cpp
+++ b/unit_tests/falco/app/actions/test_select_event_sources.cpp
@@ -17,82 +17,85 @@ limitations under the License.

 #include "app_action_helpers.h"

-TEST(ActionSelectEventSources, pre_post_conditions) {
-	auto action = falco::app::actions::select_event_sources;
+TEST(ActionSelectEventSources, pre_post_conditions)
+{
+    auto action = falco::app::actions::select_event_sources;

-	// requires sources to be already loaded
-	{
-		falco::app::state s;
-		EXPECT_ACTION_FAIL(action(s));
-	}
+    // requires sources to be already loaded
+    {
+        falco::app::state s;
+        EXPECT_ACTION_FAIL(action(s));
+    }

-	// ignore source selection in capture mode
-	{
-		falco::app::state s;
-		s.config->m_engine_mode = engine_kind_t::REPLAY;
-		EXPECT_TRUE(s.is_capture_mode());
-		EXPECT_ACTION_OK(action(s));
-	}
+    // ignore source selection in capture mode
+    {
+        falco::app::state s;
+        s.config->m_engine_mode = engine_kind_t::REPLAY;
+        EXPECT_TRUE(s.is_capture_mode());
+        EXPECT_ACTION_OK(action(s));
+    }

-	// enable all loaded sources by default, even with multiple calls
-	{
-		falco::app::state s;
-		s.loaded_sources = {"syscall", "some_source"};
-		EXPECT_ACTION_OK(action(s));
-		EXPECT_EQ(s.loaded_sources.size(), s.enabled_sources.size());
-		for(const auto& v : s.loaded_sources) {
-			ASSERT_TRUE(s.enabled_sources.find(v) != s.enabled_sources.end());
-		}
-		s.loaded_sources.push_back("another_source");
-		EXPECT_ACTION_OK(action(s));
-		EXPECT_EQ(s.loaded_sources.size(), s.enabled_sources.size());
-		for(const auto& v : s.loaded_sources) {
-			ASSERT_TRUE(s.enabled_sources.find(v) != s.enabled_sources.end());
-		}
-	}
+    // enable all loaded sources by default, even with multiple calls
+    {
+        falco::app::state s;
+        s.loaded_sources = {"syscall", "some_source"};
+        EXPECT_ACTION_OK(action(s));
+        EXPECT_EQ(s.loaded_sources.size(), s.enabled_sources.size());
+        for (const auto& v : s.loaded_sources)
+        {
+            ASSERT_TRUE(s.enabled_sources.find(v) != s.enabled_sources.end());
+        }
+        s.loaded_sources.push_back("another_source");
+        EXPECT_ACTION_OK(action(s));
+        EXPECT_EQ(s.loaded_sources.size(), s.enabled_sources.size());
+        for (const auto& v : s.loaded_sources)
+        {
+            ASSERT_TRUE(s.enabled_sources.find(v) != s.enabled_sources.end());
+        }
+    }

-	// enable only selected sources
-	{
-		falco::app::state s;
-		s.loaded_sources = {"syscall", "some_source"};
-		s.options.enable_sources = {"syscall"};
-		EXPECT_ACTION_OK(action(s));
-		EXPECT_EQ(s.enabled_sources.size(), 1);
-		EXPECT_EQ(*s.enabled_sources.begin(), "syscall");
-	}
+    // enable only selected sources
+    {
+        falco::app::state s;
+        s.loaded_sources = {"syscall", "some_source"};
+        s.options.enable_sources = {"syscall"};
+        EXPECT_ACTION_OK(action(s));
+        EXPECT_EQ(s.enabled_sources.size(), 1);
+        EXPECT_EQ(*s.enabled_sources.begin(), "syscall");
+    }

-	// enable all loaded sources expect the disabled ones
-	{
-		falco::app::state s;
-		s.loaded_sources = {"syscall", "some_source"};
-		s.options.disable_sources = {"syscall"};
-		EXPECT_ACTION_OK(action(s));
-		EXPECT_EQ(s.enabled_sources.size(), 1);
-		EXPECT_EQ(*s.enabled_sources.begin(), "some_source");
-	}
+    // enable all loaded sources expect the disabled ones
+    {
+        falco::app::state s;
+        s.loaded_sources = {"syscall", "some_source"};
+        s.options.disable_sources = {"syscall"};
+        EXPECT_ACTION_OK(action(s));
+        EXPECT_EQ(s.enabled_sources.size(), 1);
+        EXPECT_EQ(*s.enabled_sources.begin(), "some_source");
+    }

-	// enable unknown sources
-	{
-		falco::app::state s;
-		s.loaded_sources = {"syscall", "some_source"};
-		s.options.enable_sources = {"some_other_source"};
-		EXPECT_ACTION_FAIL(action(s));
-	}
+    // enable unknown sources
+    {
+        falco::app::state s;
+        s.loaded_sources = {"syscall", "some_source"};
+        s.options.enable_sources = {"some_other_source"};
+        EXPECT_ACTION_FAIL(action(s));
+    }

-	// disable unknown sources
-	{
-		falco::app::state s;
-		s.loaded_sources = {"syscall", "some_source"};
-		s.options.disable_sources = {"some_other_source"};
-		EXPECT_ACTION_FAIL(action(s));
-	}
+    // disable unknown sources
+    {
+        falco::app::state s;
+        s.loaded_sources = {"syscall", "some_source"};
+        s.options.disable_sources = {"some_other_source"};
+        EXPECT_ACTION_FAIL(action(s));
+    }

-	// mix enable and disable sources options
-	{
-		falco::app::state s;
-		s.loaded_sources = {"syscall", "some_source"};
-		s.options.disable_sources = {"syscall"};
-		s.options.enable_sources = {"syscall"};
-		EXPECT_ACTION_FAIL(action(s));
-	}
+    // mix enable and disable sources options
+    {
+        falco::app::state s;
+        s.loaded_sources = {"syscall", "some_source"};
+        s.options.disable_sources = {"syscall"};
+        s.options.enable_sources = {"syscall"};
+        EXPECT_ACTION_FAIL(action(s));
+    }
 }
--- a/unit_tests/falco/test_atomic_signal_handler.cpp
+++ b/unit_tests/falco/test_atomic_signal_handler.cpp
@@ -25,11 +25,13 @@ limitations under the License.
 #include <memory>
 #include <vector>

-TEST(AtomicSignalHandler, lock_free_implementation) {
+TEST(AtomicSignalHandler, lock_free_implementation)
+{
 	ASSERT_TRUE(falco::atomic_signal_handler().is_lock_free());
 }

-TEST(AtomicSignalHandler, handle_once_wait_consistency) {
+TEST(AtomicSignalHandler, handle_once_wait_consistency)
+{
 	constexpr const auto thread_num = 10;
 	constexpr const std::chrono::seconds thread_wait_sec{2};
 	constexpr const std::chrono::seconds handler_wait_sec{1};
@@ -38,27 +40,33 @@ TEST(AtomicSignalHandler, handle_once_wait_consistency) {
 	falco::atomic_signal_handler handler;

 	// launch a bunch of threads all syncing on the same handler
-	struct task_result_t {
+	struct task_result_t
+	{
 		bool handled;
 		std::chrono::seconds duration_secs;
 	};

 	std::vector<std::future<task_result_t>> futures;
-	for(int i = 0; i < thread_num; i++) {
-		futures.emplace_back(std::async(std::launch::async, [&handler, thread_wait_sec]() {
-			auto start = std::chrono::high_resolution_clock::now();
-			task_result_t res;
-			res.handled = false;
-			while(!handler.handled()) {
-				if(handler.triggered()) {
-					res.handled = handler.handle(
-					        [thread_wait_sec]() { std::this_thread::sleep_for(thread_wait_sec); });
+	for (int i = 0; i < thread_num; i++)
+	{
+		futures.emplace_back(std::async(std::launch::async,
+			[&handler, thread_wait_sec]() {
+				auto start = std::chrono::high_resolution_clock::now();
+				task_result_t res;
+				res.handled = false;
+				while (!handler.handled())
+				{
+					if (handler.triggered())
+					{
+						res.handled = handler.handle([thread_wait_sec]() {
+							std::this_thread::sleep_for(thread_wait_sec);
+						});
+					}
 				}
-			}
-			auto diff = std::chrono::high_resolution_clock::now() - start;
-			res.duration_secs = std::chrono::duration_cast<std::chrono::seconds>(diff);
-			return res;
-		}));
+				auto diff = std::chrono::high_resolution_clock::now() - start;
+				res.duration_secs = std::chrono::duration_cast<std::chrono::seconds>(diff);
+				return res;
+			}));
 	}

 	// wait a bit, then trigger the signal handler from the main thread
@@ -66,10 +74,12 @@ TEST(AtomicSignalHandler, handle_once_wait_consistency) {
 	auto start = std::chrono::high_resolution_clock::now();
 	std::this_thread::sleep_for(handler_wait_sec);
 	handler.trigger();
-	for(int i = 0; i < thread_num; i++) {
+	for (int i = 0; i < thread_num; i++)
+	{
 		// wait for all threads to finish and get the results from the futures
 		auto res = futures[i].get();
-		if(res.handled) {
+		if (res.handled)
+		{
 			total_handled++;
 		}
 		ASSERT_GE(res.duration_secs, thread_wait_sec);
@@ -84,8 +94,9 @@ TEST(AtomicSignalHandler, handle_once_wait_consistency) {
 	ASSERT_EQ(total_handled, 1);
 }

-TEST(AtomicSignalHandler, handle_and_reset) {
-	auto do_nothing = [] {};
+TEST(AtomicSignalHandler, handle_and_reset)
+{
+	auto do_nothing = []{};
 	falco::atomic_signal_handler handler;

 	ASSERT_FALSE(handler.triggered());
--- a/unit_tests/falco/test_configuration.cpp
+++ b/unit_tests/falco/test_configuration.cpp
@@ -18,20 +18,27 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include <falco/configuration.h>

-static std::string sample_yaml =
-        "base_value:\n"
-        "    id: 1\n"
-        "    name: 'sample_name'\n"
-        "    subvalue:\n"
-        "      subvalue2:\n"
-        "        boolean: true\n"
-        "base_value_2:\n"
-        "  sample_list:\n"
-        "    - elem1\n"
-        "    - elem2\n"
-        "    - elem3\n";
+#ifdef _WIN32
+#define SET_ENV_VAR(env_var_name, env_var_value) _putenv_s(env_var_name, env_var_value)
+#else
+#define SET_ENV_VAR(env_var_name, env_var_value) setenv(env_var_name, env_var_value, 1)
+#endif

-TEST(Configuration, configuration_exceptions) {
+static std::string sample_yaml =
+	"base_value:\n"
+	"    id: 1\n"
+	"    name: 'sample_name'\n"
+	"    subvalue:\n"
+	"      subvalue2:\n"
+	"        boolean: true\n"
+	"base_value_2:\n"
+	"  sample_list:\n"
+	"    - elem1\n"
+	"    - elem2\n"
+	"    - elem3\n";
+
+TEST(Configuration, configuration_exceptions)
+{
 	yaml_helper conf;

 	/* Broken YAML */
@@ -42,7 +49,8 @@ TEST(Configuration, configuration_exceptions) {
 	EXPECT_NO_THROW(conf.load_from_string(sample_yaml));
 }

-TEST(Configuration, configuration_reload) {
+TEST(Configuration, configuration_reload)
+{
 	yaml_helper conf;

 	/* Clear and reload config */
@@ -54,7 +62,8 @@ TEST(Configuration, configuration_reload) {
 	ASSERT_TRUE(conf.is_defined("base_value"));
 }

-TEST(Configuration, read_yaml_fields) {
+TEST(Configuration, read_yaml_fields)
+{
 	yaml_helper conf;
 	conf.load_from_string(sample_yaml);

@@ -69,12 +78,9 @@ TEST(Configuration, read_yaml_fields) {
 	ASSERT_EQ(conf.get_scalar<bool>("base_value.subvalue.subvalue2.boolean", false), true);

 	/* get list field elements */
-	ASSERT_STREQ(conf.get_scalar<std::string>("base_value_2.sample_list[0]", "none").c_str(),
-	             "elem1");
-	ASSERT_STREQ(conf.get_scalar<std::string>("base_value_2.sample_list[1]", "none").c_str(),
-	             "elem2");
-	ASSERT_STREQ(conf.get_scalar<std::string>("base_value_2.sample_list[2]", "none").c_str(),
-	             "elem3");
+	ASSERT_STREQ(conf.get_scalar<std::string>("base_value_2.sample_list[0]", "none").c_str(), "elem1");
+	ASSERT_STREQ(conf.get_scalar<std::string>("base_value_2.sample_list[1]", "none").c_str(), "elem2");
+	ASSERT_STREQ(conf.get_scalar<std::string>("base_value_2.sample_list[2]", "none").c_str(), "elem3");

 	/* get sequence */
 	std::vector<std::string> seq;
@@ -85,100 +91,751 @@ TEST(Configuration, read_yaml_fields) {
 	ASSERT_STREQ(seq[2].c_str(), "elem3");
 }

-TEST(Configuration, modify_yaml_fields) {
+TEST(Configuration, modify_yaml_fields)
+{
 	std::string key = "base_value.subvalue.subvalue2.boolean";
 	yaml_helper conf;

-	/* Get original value */
-	conf.load_from_string(sample_yaml);
+    /* Get original value */
+    conf.load_from_string(sample_yaml);
 	ASSERT_EQ(conf.get_scalar<bool>(key, false), true);

-	/* Modify the original value */
-	conf.set_scalar<bool>(key, false);
+    /* Modify the original value */
+    conf.set_scalar<bool>(key, false);
 	ASSERT_EQ(conf.get_scalar<bool>(key, true), false);

-	/* Modify it again */
-	conf.set_scalar<bool>(key, true);
+    /* Modify it again */
+    conf.set_scalar<bool>(key, true);
 	ASSERT_EQ(conf.get_scalar<bool>(key, false), true);
 }

-TEST(Configuration, configuration_webserver_ip) {
+TEST(Configuration, configuration_config_files_secondary_fail)
+{
+	/* Test that a secondary config file is not able to include anything, triggering an exception. */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ":\n"
+					   "  - conf_2.yaml\n"
+					   "  - conf_3.yaml\n"
+					   "foo: bar\n"
+					   "base_value:\n"
+					   "    id: 1\n"
+					   "    name: foo\n";
+	const std::string conf_yaml_2 =
+		yaml_helper::configs_key + ":\n"
+					   "  - conf_4.yaml\n"
+					   "foo2: bar2\n"
+					   "base_value_2:\n"
+					   "    id: 2\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open("conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
 	falco_configuration falco_config;
+	ASSERT_ANY_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));

-	std::vector<std::string> valid_addresses = {"127.0.0.1",
-	                                            "1.127.0.1",
-	                                            "1.1.127.1",
-	                                            "1.1.1.127",
-	                                            "::",
-	                                            "::1",
-	                                            "1200:0000:AB00:1234:0000:2552:7777:1313",
-	                                            "1200::AB00:1234:0000:2552:7777:1313",
-	                                            "1200:0000:AB00:1234::2552:7777:1313",
-	                                            "21DA:D3:0:2F3B:2AA:FF:FE28:9C5A",
-	                                            "FE80:0000:0000:0000:0202:B3FF:FE1E:8329",
-	                                            "0.0.0.0",
-	                                            "9.255.255.255",
-	                                            "11.0.0.0",
-	                                            "126.255.255.255",
-	                                            "129.0.0.0",
-	                                            "169.253.255.255",
-	                                            "169.255.0.0",
-	                                            "172.15.255.255",
-	                                            "172.32.0.0",
-	                                            "191.0.1.255",
-	                                            "192.88.98.255",
-	                                            "192.88.100.0",
-	                                            "192.167.255.255",
-	                                            "192.169.0.0",
-	                                            "198.17.255.255",
-	                                            "223.255.255.255"};
-
-	for(const std::string &address : valid_addresses) {
-		std::string option = "webserver.listen_address=";
-		option.append(address);
-
-		std::vector<std::string> cmdline_config_options;
-		cmdline_config_options.push_back(option);
-
-		EXPECT_NO_THROW(falco_config.init_from_content("", cmdline_config_options));
-
-		ASSERT_EQ(falco_config.m_webserver_config.m_listen_address, address);
-	}
-
-	std::vector<std::string> invalid_addresses = {
-	        "327.0.0.1",
-	        "1.327.0.1",
-	        "1.1.327.1",
-	        "1.1.1.327",
-	        "12 7.0.0.1",
-	        "127. 0.0.1",
-	        "127.0. 0.1",
-	        "127.0.0. 1",
-	        "!27.0.0.1",
-	        "1200: 0000:AB00:1234:0000:2552:7777:1313",
-	        "1200:0000: AB00:1234:0000:2552:7777:1313",
-	        "1200:0000:AB00: 1234:0000:2552:7777:1313",
-	        "1200:0000:AB00:1234: 0000:2552:7777:1313",
-	        "1200:0000:AB00:1234:0000: 2552:7777:1313",
-	        "1200:0000:AB00:1234:0000:2552: 7777:1313",
-	        "1200:0000:AB00:1234:0000:2552:7777: 1313",
-	        "1200:0000:AB00:1234:0000:2552:7777:131G",
-	        "1200:0000:AB00:1234:0000:2552:77Z7:1313",
-	        "1200:0000:AB00:1234:0000:2G52:7777:1313",
-	        "1200:0000:AB00:1234:0O00:2552:7777:1313",
-	        "1200:0000:AB00:H234:0000:2552:7777:1313",
-	        "1200:0000:IB00:1234:0000:2552:7777:1313",
-	        "1200:0O00:AB00:1234:0000:2552:7777:1313",
-	        "12O0:0000:AB00:1234:0000:2552:7777:1313",
-	};
-
-	for(const std::string &address : invalid_addresses) {
-		std::string option = "webserver.listen_address=";
-		option.append(address);
-
-		std::vector<std::string> cmdline_config_options;
-		cmdline_config_options.push_back(option);
-
-		EXPECT_ANY_THROW(falco_config.init_from_content("", cmdline_config_options));
-	}
+	std::filesystem::remove("main.yaml");
+	std::filesystem::remove("conf_2.yaml");
+}
+
+TEST(Configuration, configuration_config_files_ok)
+{
+	/* Test that every included config file was correctly parsed */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ":\n"
+					   "  - conf_2.yaml\n"
+					   "  - conf_3.yaml\n"
+					   "foo: bar\n"
+					   "base_value:\n"
+					   "    id: 1\n"
+					   "    name: foo\n";
+	const std::string conf_yaml_2 =
+		"foo2: bar2\n"
+		"base_value_2:\n"
+		"    id: 2\n";
+	const std::string conf_yaml_3 =
+		"foo3: bar3\n"
+		"base_value_3:\n"
+		"    id: 3\n"
+		"    name: foo3\n";
+	const std::string conf_yaml_4 =
+		"base_value_4:\n"
+		"    id: 4\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open("conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	outfile.open("conf_3.yaml");
+	outfile << conf_yaml_3;
+	outfile.close();
+
+	outfile.open("conf_4.yaml");
+	outfile << conf_yaml_4;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main + conf_2 + conf_3
+	ASSERT_EQ(loaded_conf_files.size(), 3);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+	ASSERT_TRUE(falco_config.config.is_defined("foo2"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo2", ""), "bar2");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_2.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_2.id", 0), 2);
+	ASSERT_TRUE(falco_config.config.is_defined("foo3"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo3", ""), "bar3");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_3.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_3.id", 0), 3);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_3.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value_3.name", ""), "foo3");
+	ASSERT_FALSE(falco_config.config.is_defined("base_value_4.id")); // conf_4 is not included
+
+	std::filesystem::remove("main.yaml");
+	std::filesystem::remove("conf_2.yaml");
+	std::filesystem::remove("conf_3.yaml");
+	std::filesystem::remove("conf_4.yaml");
+}
+
+
+TEST(Configuration, configuration_config_files_relative_main)
+{
+	/*
+	 * Test that relative path are treated as relative to cwd and not to main config folder,
+	 * and that absolute includes are ok too.
+	 */
+	const auto temp_main = std::filesystem::temp_directory_path() / "main.yaml";
+	// So, conf_2 will be looked up in the same folder as main config file,
+	// while conf_3, since is absolute, will be looked up in the absolute path (and found!).
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ":\n"
+		"  - conf_2.yaml\n"
+		"  - " +
+		std::filesystem::current_path().string() + "/conf_3.yaml\n"
+							   "foo: bar\n"
+							   "base_value:\n"
+							   "    id: 1\n"
+							   "    name: foo\n";
+	const std::string conf_yaml_2 =
+		"foo2: bar2\n"
+		"base_value_2:\n"
+		"    id: 2\n";
+	const std::string conf_yaml_3 =
+		"foo3: bar3\n"
+		"base_value_3:\n"
+		"    id: 3\n"
+		"    name: foo3\n";
+
+	std::ofstream outfile(temp_main.string());
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open("conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	outfile.open("conf_3.yaml");
+	outfile << conf_yaml_3;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file(temp_main.string(), loaded_conf_files, cmdline_config_options));
+
+	// main + conf_2 + conf_3
+	ASSERT_EQ(loaded_conf_files.size(), 3);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+	ASSERT_TRUE(falco_config.config.is_defined("foo2"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo2", ""), "bar2");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_2"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_2.id", 0), 2);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_3.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_3.id", 0), 3);
+
+	std::filesystem::remove(temp_main.string());
+	std::filesystem::remove("conf_2.yaml");
+	std::filesystem::remove("conf_3.yaml");
+}
+
+TEST(Configuration, configuration_config_files_override)
+{
+	/* Test that included config files are able to override configs from main file */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ":\n"
+					   "  - conf_2.yaml\n"
+					   "  - conf_3.yaml\n"
+					   "foo: bar\n"
+					   "base_value:\n"
+					   "    id: 1\n"
+					   "    name: foo\n";
+	const std::string conf_yaml_2 =
+		"foo2: bar2\n"
+		"base_value_2:\n"
+		"    id: 2\n";
+	const std::string conf_yaml_3 =
+		"base_value:\n"
+		"    id: 3\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open("conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	outfile.open("conf_3.yaml");
+	outfile << conf_yaml_3;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main + conf_2 + conf_3
+	ASSERT_EQ(loaded_conf_files.size(), 3);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 3); // overridden!
+	ASSERT_FALSE(falco_config.config.is_defined("base_value.name"));	// no more present since entire `base_value` block was overridden
+	ASSERT_TRUE(falco_config.config.is_defined("foo2"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo2", ""), "bar2");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_2.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_2.id", 0), 2);
+	ASSERT_FALSE(falco_config.config.is_defined("base_value_3.id")); // not defined
+
+	std::filesystem::remove("main.yaml");
+	std::filesystem::remove("conf_2.yaml");
+	std::filesystem::remove("conf_3.yaml");
+}
+
+TEST(Configuration, configuration_config_files_unexistent)
+{
+	/* Test that including an unexistent file just skips it */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ":\n"
+		"  - conf_5.yaml\n"
+		"base_value:\n"
+		"    id: 1\n"
+		"    name: foo\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main
+	ASSERT_EQ(loaded_conf_files.size(), 1);
+
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+
+	std::filesystem::remove("main.yaml");
+}
+
+TEST(Configuration, configuration_config_files_scalar_config_files)
+{
+	/* Test that a single file can be included as a scalar (thanks to get_sequence_from_node magic) */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ": conf_2.yaml\n"
+		"foo: bar\n"
+		"base_value:\n"
+		"    id: 1\n"
+		"    name: foo\n";
+	const std::string conf_yaml_2 =
+		"foo2: bar2\n"
+		"base_value_2:\n"
+		"    id: 2\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open("conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main + conf_2
+	ASSERT_EQ(loaded_conf_files.size(), 2);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+	ASSERT_TRUE(falco_config.config.is_defined("foo2"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo2", ""), "bar2");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_2.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_2.id", 0), 2);
+
+	std::filesystem::remove("main.yaml");
+	std::filesystem::remove("conf_2.yaml");
+}
+
+TEST(Configuration, configuration_config_files_empty_config_files)
+{
+	/* Test that empty includes list is accepted */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ":\n"
+		"foo: bar\n"
+		"base_value:\n"
+		"    id: 1\n"
+		"    name: foo\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main
+	ASSERT_EQ(loaded_conf_files.size(), 1);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+
+	std::filesystem::remove("main.yaml");
+}
+
+TEST(Configuration, configuration_config_files_self)
+{
+	/* Test that main config file cannot include itself */
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ": main.yaml\n"
+		"foo: bar\n"
+		"base_value:\n"
+		"    id: 1\n"
+		"    name: foo\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_ANY_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	std::filesystem::remove("main.yaml");
+}
+
+TEST(Configuration, configuration_config_files_directory)
+{
+	/*
+	 * Test that when main config file includes a config directory,
+	 * the config directory is parsed in lexicographic order,
+	 * and only regular files are parsed.
+	 */
+	// Main config includes whole temp directory
+	const std::string main_conf_yaml =
+		yaml_helper::configs_key + ": " + std::filesystem::temp_directory_path().string() + "/test\n"
+		   "foo: bar\n"
+		   "base_value:\n"
+		   "    id: 1\n"
+		   "    name: foo\n";
+	const std::string conf_yaml_2 =
+		"foo2: bar2\n"
+		"base_value_2:\n"
+		"    id: 2\n";
+	const std::string conf_yaml_3 =
+		"foo2: bar3\n"
+		"base_value_3:\n"
+		"    id: 3\n"
+		"    name: foo3\n";
+	const std::string conf_yaml_4 =
+		"foo4: bar4\n";
+
+	std::filesystem::create_directory(std::filesystem::temp_directory_path() / "test");
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open(std::filesystem::temp_directory_path()/"test/conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	outfile.open(std::filesystem::temp_directory_path()/"test/conf_3.yaml");
+	outfile << conf_yaml_3;
+	outfile.close();
+
+	// Create a directory and create a config inside it. We will later check that it was not parsed
+	std::filesystem::create_directory(std::filesystem::temp_directory_path() / "test" / "foo");
+	outfile.open(std::filesystem::temp_directory_path()/"test/foo/conf_4.yaml");
+	outfile << conf_yaml_4;
+	outfile.close();
+
+	std::vector<std::string> cmdline_config_options;
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main + conf_2 + conf_3.
+	// test/foo is not parsed.
+	ASSERT_EQ(loaded_conf_files.size(), 3);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_2"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_2.id", 0), 2);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_3.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_3.id", 0), 3);
+	ASSERT_TRUE(falco_config.config.is_defined("foo2"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo2", ""), "bar3");
+	ASSERT_FALSE(falco_config.config.is_defined("foo4"));
+
+	std::filesystem::remove("main");
+	std::filesystem::remove_all(std::filesystem::temp_directory_path()/"test");
+}
+
+TEST(Configuration, configuration_config_files_cmdline)
+{
+	/* Test that we support including configs files from cmdline option */
+	const std::string main_conf_yaml =
+					   "foo: bar\n"
+					   "base_value:\n"
+					   "    id: 1\n"
+					   "    name: foo\n";
+	const std::string conf_yaml_2 =
+		"foo2: bar2\n"
+		"base_value_2:\n"
+		"    id: 2\n";
+
+	std::ofstream outfile("main.yaml");
+	outfile << main_conf_yaml;
+	outfile.close();
+
+	outfile.open("conf_2.yaml");
+	outfile << conf_yaml_2;
+	outfile.close();
+
+	// Pass "config_files=..." cmdline option
+	std::vector<std::string> cmdline_config_options;
+	cmdline_config_options.push_back((yaml_helper::configs_key+"=conf_2.yaml"));
+
+	std::vector<std::string> loaded_conf_files;
+	falco_configuration falco_config;
+	ASSERT_NO_THROW(falco_config.init_from_file("main.yaml", loaded_conf_files, cmdline_config_options));
+
+	// main + conf_2
+	ASSERT_EQ(loaded_conf_files.size(), 2);
+
+	ASSERT_TRUE(falco_config.config.is_defined("foo"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo", ""), "bar");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value.id", 0), 1);
+	ASSERT_TRUE(falco_config.config.is_defined("base_value.name"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("base_value.name", ""), "foo");
+	ASSERT_TRUE(falco_config.config.is_defined("foo2"));
+	ASSERT_EQ(falco_config.config.get_scalar<std::string>("foo2", ""), "bar2");
+	ASSERT_TRUE(falco_config.config.is_defined("base_value_2.id"));
+	ASSERT_EQ(falco_config.config.get_scalar<int>("base_value_2.id", 0), 2);
+
+	std::filesystem::remove("main.yaml");
+	std::filesystem::remove("conf_2.yaml");
+}
+
+TEST(Configuration, configuration_environment_variables)
+{
+    // Set an environment variable for testing purposes
+    std::string env_var_value = "envVarValue";
+    std::string env_var_name = "ENV_VAR";
+    SET_ENV_VAR(env_var_name.c_str(), env_var_value.c_str());
+
+    std::string embedded_env_var_value = "${ENV_VAR}";
+    std::string embedded_env_var_name = "ENV_VAR_EMBEDDED";
+    SET_ENV_VAR(embedded_env_var_name.c_str(), embedded_env_var_value.c_str());
+
+    std::string bool_env_var_value = "true";
+    std::string bool_env_var_name = "ENV_VAR_BOOL";
+    SET_ENV_VAR(bool_env_var_name.c_str(), bool_env_var_value.c_str());
+
+    std::string int_env_var_value = "12";
+    std::string int_env_var_name = "ENV_VAR_INT";
+    SET_ENV_VAR(int_env_var_name.c_str(), int_env_var_value.c_str());
+
+    std::string empty_env_var_value = "";
+    std::string empty_env_var_name = "ENV_VAR_EMPTY";
+    SET_ENV_VAR(empty_env_var_name.c_str(), empty_env_var_value.c_str());
+
+    std::string default_value = "default";
+    std::string env_var_sample_yaml =
+        "base_value:\n"
+        "    id: $ENV_VAR\n"
+        "    name: '${ENV_VAR}'\n"
+        "    string: my_string\n"
+        "    invalid: $${ENV_VAR}\n"
+	"    invalid_env: $$ENV_VAR\n"
+	"    invalid_double_env: $${ENV_VAR}$${ENV_VAR}\n"
+	"    invalid_embedded_env: $${${ENV_VAR}}\n"
+	"    invalid_valid_env: $${ENV_VAR}${ENV_VAR}\n"
+        "    escaped: \"${ENV_VAR}\"\n"
+        "    subvalue:\n"
+        "        subvalue2:\n"
+        "            boolean: ${UNSED_XX_X_X_VAR}\n"
+        "base_value_2:\n"
+        "    sample_list:\n"
+        "        - ${ENV_VAR}\n"
+        "        - ' ${ENV_VAR}'\n"
+	"        - '${ENV_VAR} '\n"
+        "        - $UNSED_XX_X_X_VAR\n"
+        "paths:\n"
+	"    - ${ENV_VAR}/foo\n"
+	"    - $ENV_VAR/foo\n"
+	"    - /foo/${ENV_VAR}/\n"
+	"    - /${ENV_VAR}/${ENV_VAR}${ENV_VAR}/foo\n"
+	"    - ${ENV_VAR_EMBEDDED}/foo\n"
+	"is_test: ${ENV_VAR_BOOL}\n"
+	"num_test: ${ENV_VAR_INT}\n"
+	"empty_test: ${ENV_VAR_EMPTY}\n"
+	"plugins:\n"
+	"  - name: k8saudit\n"
+	"    library_path: /foo/${ENV_VAR}/libk8saudit.so\n"
+	"    open_params: ${ENV_VAR_INT}\n";
+
+    yaml_helper conf;
+    conf.load_from_string(env_var_sample_yaml);
+
+    /* Check if the base values are defined */
+    ASSERT_TRUE(conf.is_defined("base_value"));
+    ASSERT_TRUE(conf.is_defined("base_value_2"));
+    ASSERT_TRUE(conf.is_defined("paths"));
+    ASSERT_FALSE(conf.is_defined("unknown_base_value"));
+
+    /* Test fetching of a regular string without any environment variable */
+    auto base_value_string = conf.get_scalar<std::string>("base_value.string", default_value);
+    ASSERT_EQ(base_value_string, "my_string");
+
+    /* Test fetching of escaped environment variable format. Should return the string as-is after stripping the leading `$` */
+    auto base_value_invalid = conf.get_scalar<std::string>("base_value.invalid", default_value);
+    ASSERT_EQ(base_value_invalid, "${ENV_VAR}");
+
+    /* Test fetching of invalid escaped environment variable format. Should return the string as-is */
+    auto base_value_invalid_env = conf.get_scalar<std::string>("base_value.invalid_env", default_value);
+    ASSERT_EQ(base_value_invalid_env, "$$ENV_VAR");
+
+    /* Test fetching of 2 escaped environment variables side by side. Should return the string as-is after stripping the leading `$` */
+    auto base_value_double_invalid = conf.get_scalar<std::string>("base_value.invalid_double_env", default_value);
+    ASSERT_EQ(base_value_double_invalid, "${ENV_VAR}${ENV_VAR}");
+
+    /*
+     * Test fetching of escaped environment variable format with inside an env variable.
+     * Should return the string as-is after stripping the leading `$` with the resolved env variable within
+     */
+    auto base_value_embedded_invalid = conf.get_scalar<std::string>("base_value.invalid_embedded_env", default_value);
+    ASSERT_EQ(base_value_embedded_invalid, "${" + env_var_value + "}");
+
+    /*
+     * Test fetching of an escaped env variable plus an env variable side by side.
+     * Should return the escaped one trimming the leading `$` plus the second one resolved.
+     */
+    auto base_value_valid_invalid = conf.get_scalar<std::string>("base_value.invalid_valid_env", default_value);
+    ASSERT_EQ(base_value_valid_invalid, "${ENV_VAR}" + env_var_value);
+
+    /* Test fetching of strings that contain environment variables */
+    auto base_value_id = conf.get_scalar<std::string>("base_value.id", default_value);
+    ASSERT_EQ(base_value_id, "$ENV_VAR"); // Does not follow the `${VAR}` format, so it should be treated as a regular string
+
+    auto base_value_name = conf.get_scalar<std::string>("base_value.name", default_value);
+    ASSERT_EQ(base_value_name, env_var_value); // Proper environment variable format
+
+    auto base_value_escaped = conf.get_scalar<std::string>("base_value.escaped", default_value);
+    ASSERT_EQ(base_value_escaped, env_var_value); // Environment variable within quotes
+
+    /* Test fetching of an undefined environment variable. Resolves to empty string. */
+    auto unknown_boolean = conf.get_scalar<std::string>("base_value.subvalue.subvalue2.boolean", default_value);
+    ASSERT_EQ(unknown_boolean, "");
+
+    /* Test fetching of environment variables from a list */
+    auto base_value_2_list_0 = conf.get_scalar<std::string>("base_value_2.sample_list[0]", default_value);
+    ASSERT_EQ(base_value_2_list_0, env_var_value); // Proper environment variable format
+
+    auto base_value_2_list_1 = conf.get_scalar<std::string>("base_value_2.sample_list[1]", default_value);
+    ASSERT_EQ(base_value_2_list_1, " " + env_var_value); // Environment variable preceded by a space, still extracted env var with leading space
+
+    auto base_value_2_list_2 = conf.get_scalar<std::string>("base_value_2.sample_list[2]", default_value);
+    ASSERT_EQ(base_value_2_list_2, env_var_value + " "); // Environment variable followed by a space, still extracted env var with trailing space
+
+    auto base_value_2_list_3 = conf.get_scalar<std::string>("base_value_2.sample_list[3]", default_value);
+    ASSERT_EQ(base_value_2_list_3, "$UNSED_XX_X_X_VAR"); // Does not follow the `${VAR}` format, so should be treated as a regular string
+
+    /* Test expansion of environment variables within strings */
+    auto path_list_0 = conf.get_scalar<std::string>("paths[0]", default_value);
+    ASSERT_EQ(path_list_0, env_var_value + "/foo"); // Even if env var is part of bigger string, it gets expanded
+
+    auto path_list_1 = conf.get_scalar<std::string>("paths[1]", default_value);
+    ASSERT_EQ(path_list_1, "$ENV_VAR/foo"); // Does not follow the `${VAR}` format, so should be treated as a regular string
+
+    auto path_list_2 = conf.get_scalar<std::string>("paths[2]", default_value);
+    ASSERT_EQ(path_list_2, "/foo/" + env_var_value + "/"); // Even when env var is in the middle of a string. it gets expanded
+
+    auto path_list_3 = conf.get_scalar<std::string>("paths[3]", default_value);
+    ASSERT_EQ(path_list_3, "/" + env_var_value + "/" + env_var_value + env_var_value + "/foo"); // Even when the string contains multiple env vars they are correctly expanded
+
+    auto path_list_4 = conf.get_scalar<std::string>("paths[4]", default_value);
+    ASSERT_EQ(path_list_4, env_var_value + "/foo"); // Even when the env var contains another env var, it gets correctly double-expanded
+
+    /* Check that variable expansion is type-aware */
+    auto boolean = conf.get_scalar<bool>("is_test", false);
+    ASSERT_EQ(boolean, true); // `true` can be parsed to bool.
+
+    auto boolean_as_str = conf.get_scalar<std::string>("is_test", "false");
+    ASSERT_EQ(boolean_as_str, "true"); // `true` can be parsed to string.
+
+    auto boolean_as_int = conf.get_scalar<int32_t>("is_test", 0);
+    ASSERT_EQ(boolean_as_int, 0); // `true` cannot be parsed to integer.
+
+    auto integer = conf.get_scalar<int32_t>("num_test", -1);
+    ASSERT_EQ(integer, 12);
+
+    // An env var that resolves to an empty string returns ""
+    auto empty_default_str = conf.get_scalar<std::string>("empty_test", default_value);
+    ASSERT_EQ(empty_default_str, "");
+
+    std::list<falco_configuration::plugin_config> plugins;
+    conf.get_sequence<std::list<falco_configuration::plugin_config>>(plugins, std::string("plugins"));
+    std::vector<falco_configuration::plugin_config> m_plugins{ std::make_move_iterator(std::begin(plugins)),
+							      std::make_move_iterator(std::end(plugins)) };
+    ASSERT_EQ(m_plugins[0].m_name, "k8saudit");
+    ASSERT_EQ(m_plugins[0].m_library_path, "/foo/" + env_var_value + "/libk8saudit.so");
+    ASSERT_EQ(m_plugins[0].m_open_params, "12");
+
+    /* Clear the set environment variables after testing */
+    SET_ENV_VAR(env_var_name.c_str(), "");
+    SET_ENV_VAR(embedded_env_var_name.c_str(), "");
+    SET_ENV_VAR(bool_env_var_name.c_str(), "");
+    SET_ENV_VAR(int_env_var_name.c_str(), "");
+    SET_ENV_VAR(empty_env_var_name.c_str(), "");
+}
+
+TEST(Configuration, configuration_webserver_ip)
+{
+    falco_configuration falco_config;
+
+    std::vector<std::string> valid_addresses = {"127.0.0.1",
+                                                "1.127.0.1",
+                                                "1.1.127.1",
+                                                "1.1.1.127",
+                                                "::",
+                                                "::1",
+                                                "1200:0000:AB00:1234:0000:2552:7777:1313",
+                                                "1200::AB00:1234:0000:2552:7777:1313",
+                                                "1200:0000:AB00:1234::2552:7777:1313",
+                                                "21DA:D3:0:2F3B:2AA:FF:FE28:9C5A",
+                                                "FE80:0000:0000:0000:0202:B3FF:FE1E:8329",
+                                                "0.0.0.0",
+                                                "9.255.255.255",
+                                                "11.0.0.0",
+                                                "126.255.255.255",
+                                                "129.0.0.0",
+                                                "169.253.255.255",
+                                                "169.255.0.0",
+                                                "172.15.255.255",
+                                                "172.32.0.0",
+                                                "191.0.1.255",
+                                                "192.88.98.255",
+                                                "192.88.100.0",
+                                                "192.167.255.255",
+                                                "192.169.0.0",
+                                                "198.17.255.255",
+                                                "223.255.255.255"};
+
+    for (const std::string &address: valid_addresses) {
+        std::string option = "webserver.listen_address=";
+        option.append(address);
+
+        std::vector<std::string> cmdline_config_options;
+        cmdline_config_options.push_back(option);
+
+        EXPECT_NO_THROW(falco_config.init_from_content("", cmdline_config_options));
+
+        ASSERT_EQ(falco_config.m_webserver_config.m_listen_address, address);
+    }
+
+    std::vector<std::string> invalid_addresses = {"327.0.0.1",
+                                                  "1.327.0.1",
+                                                  "1.1.327.1",
+                                                  "1.1.1.327",
+                                                  "12 7.0.0.1",
+                                                  "127. 0.0.1",
+                                                  "127.0. 0.1",
+                                                  "127.0.0. 1",
+                                                  "!27.0.0.1",
+                                                  "1200: 0000:AB00:1234:0000:2552:7777:1313",
+                                                  "1200:0000: AB00:1234:0000:2552:7777:1313",
+                                                  "1200:0000:AB00: 1234:0000:2552:7777:1313",
+                                                  "1200:0000:AB00:1234: 0000:2552:7777:1313",
+                                                  "1200:0000:AB00:1234:0000: 2552:7777:1313",
+                                                  "1200:0000:AB00:1234:0000:2552: 7777:1313",
+                                                  "1200:0000:AB00:1234:0000:2552:7777: 1313",
+                                                  "1200:0000:AB00:1234:0000:2552:7777:131G",
+                                                  "1200:0000:AB00:1234:0000:2552:77Z7:1313",
+                                                  "1200:0000:AB00:1234:0000:2G52:7777:1313",
+                                                  "1200:0000:AB00:1234:0O00:2552:7777:1313",
+                                                  "1200:0000:AB00:H234:0000:2552:7777:1313",
+                                                  "1200:0000:IB00:1234:0000:2552:7777:1313",
+                                                  "1200:0O00:AB00:1234:0000:2552:7777:1313",
+                                                  "12O0:0000:AB00:1234:0000:2552:7777:1313",};
+
+    for (const std::string &address: invalid_addresses) {
+        std::string option = "webserver.listen_address=";
+        option.append(address);
+
+        std::vector<std::string> cmdline_config_options;
+        cmdline_config_options.push_back(option);
+
+        EXPECT_ANY_THROW(falco_config.init_from_content("", cmdline_config_options));
+    }
 }
--- a/unit_tests/falco/test_configuration_config_files.cpp
+++ b/unit_tests/falco/test_configuration_config_files.cpp
@@ -1,489 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-Copyright (C) 2023 The Falco Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <gtest/gtest.h>
-#include <falco/configuration.h>
-
-TEST(Configuration, configuration_config_files_secondary_fail) {
-	/* Test that a secondary config file is not able to include anything, triggering an exception.
-	 */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ":\n"
-	                                   "  - conf_2.yaml\n"
-	                                   "  - conf_3.yaml\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-	const std::string conf_yaml_2 = yaml_helper::configs_key +
-	                                ":\n"
-	                                "  - conf_4.yaml\n"
-	                                "foo2: bar2\n"
-	                                "base_value_2:\n"
-	                                "    id: 2\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open("conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	ASSERT_ANY_THROW(falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	std::filesystem::remove("main.yaml");
-	std::filesystem::remove("conf_2.yaml");
-}
-
-TEST(Configuration, configuration_config_files_ok) {
-	/* Test that every included config file was correctly parsed */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ":\n"
-	                                   "  - conf_2.yaml\n"
-	                                   "  - conf_3.yaml\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-	const std::string conf_yaml_2 =
-	        "foo2: bar2\n"
-	        "base_value_2:\n"
-	        "    id: 2\n";
-	const std::string conf_yaml_3 =
-	        "foo3: bar3\n"
-	        "base_value_3:\n"
-	        "    id: 3\n"
-	        "    name: foo3\n";
-	const std::string conf_yaml_4 =
-	        "base_value_4:\n"
-	        "    id: 4\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open("conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	outfile.open("conf_3.yaml");
-	outfile << conf_yaml_3;
-	outfile.close();
-
-	outfile.open("conf_4.yaml");
-	outfile << conf_yaml_4;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	std::vector<std::string> loaded_conf_files;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main + conf_2 + conf_3
-	ASSERT_EQ(res.size(), 3);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo2", ""), "bar2");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_2.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_2.id", 0), 2);
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo3"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo3", ""), "bar3");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_3.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_3.id", 0), 3);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_3.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value_3.name", ""), "foo3");
-	ASSERT_FALSE(falco_config.m_config.is_defined("base_value_4.id"));  // conf_4 is not included
-
-	std::filesystem::remove("main.yaml");
-	std::filesystem::remove("conf_2.yaml");
-	std::filesystem::remove("conf_3.yaml");
-	std::filesystem::remove("conf_4.yaml");
-}
-
-TEST(Configuration, configuration_config_files_relative_main) {
-	/*
-	 * Test that relative path are treated as relative to cwd and not to main config folder,
-	 * and that absolute includes are ok too.
-	 */
-	const auto temp_main = std::filesystem::temp_directory_path() / "main.yaml";
-	// So, conf_2 will be looked up in the same folder as main config file,
-	// while conf_3, since is absolute, will be looked up in the absolute path (and found!).
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ":\n"
-	                                   "  - conf_2.yaml\n"
-	                                   "  - " +
-	                                   std::filesystem::current_path().string() +
-	                                   "/conf_3.yaml\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-	const std::string conf_yaml_2 =
-	        "foo2: bar2\n"
-	        "base_value_2:\n"
-	        "    id: 2\n";
-	const std::string conf_yaml_3 =
-	        "foo3: bar3\n"
-	        "base_value_3:\n"
-	        "    id: 3\n"
-	        "    name: foo3\n";
-
-	std::ofstream outfile(temp_main.string());
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open("conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	outfile.open("conf_3.yaml");
-	outfile << conf_yaml_3;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file(temp_main.string(), cmdline_config_options));
-
-	// main + conf_2 + conf_3
-	ASSERT_EQ(res.size(), 3);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo2", ""), "bar2");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_2.id", 0), 2);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_3.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_3.id", 0), 3);
-
-	std::filesystem::remove(temp_main.string());
-	std::filesystem::remove("conf_2.yaml");
-	std::filesystem::remove("conf_3.yaml");
-}
-
-TEST(Configuration, configuration_config_files_override) {
-	/* Test that included config files are able to override configs from main file */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ":\n"
-	                                   "  - conf_2.yaml\n"
-	                                   "  - conf_3.yaml\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-	const std::string conf_yaml_2 =
-	        "foo2: bar2\n"
-	        "base_value_2:\n"
-	        "    id: 2\n";
-	const std::string conf_yaml_3 =
-	        "base_value:\n"
-	        "    id: 3\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open("conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	outfile.open("conf_3.yaml");
-	outfile << conf_yaml_3;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main + conf_2 + conf_3
-	ASSERT_EQ(res.size(), 3);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 3);  // overridden!
-	ASSERT_FALSE(falco_config.m_config.is_defined(
-	        "base_value.name"));  // no more present since entire `base_value` block was overridden
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo2", ""), "bar2");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_2.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_2.id", 0), 2);
-	ASSERT_FALSE(falco_config.m_config.is_defined("base_value_3.id"));  // not defined
-
-	std::filesystem::remove("main.yaml");
-	std::filesystem::remove("conf_2.yaml");
-	std::filesystem::remove("conf_3.yaml");
-}
-
-TEST(Configuration, configuration_config_files_unexistent) {
-	/* Test that including an unexistent file just skips it */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ":\n"
-	                                   "  - conf_5.yaml\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main
-	ASSERT_EQ(res.size(), 1);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-
-	std::filesystem::remove("main.yaml");
-}
-
-TEST(Configuration, configuration_config_files_scalar_config_files) {
-	/* Test that a single file can be included as a scalar (thanks to get_sequence_from_node magic)
-	 */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ": conf_2.yaml\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-	const std::string conf_yaml_2 =
-	        "foo2: bar2\n"
-	        "base_value_2:\n"
-	        "    id: 2\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open("conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main + conf_2
-	ASSERT_EQ(res.size(), 2);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo2", ""), "bar2");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_2.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_2.id", 0), 2);
-
-	std::filesystem::remove("main.yaml");
-	std::filesystem::remove("conf_2.yaml");
-}
-
-TEST(Configuration, configuration_config_files_empty_config_files) {
-	/* Test that empty includes list is accepted */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ":\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main
-	ASSERT_EQ(res.size(), 1);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-
-	std::filesystem::remove("main.yaml");
-}
-
-TEST(Configuration, configuration_config_files_self) {
-	/* Test that main config file cannot include itself */
-	const std::string main_conf_yaml = yaml_helper::configs_key +
-	                                   ": main.yaml\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	ASSERT_ANY_THROW(falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	std::filesystem::remove("main.yaml");
-}
-
-TEST(Configuration, configuration_config_files_directory) {
-	/*
-	 * Test that when main config file includes a config directory,
-	 * the config directory is parsed in lexicographic order,
-	 * and only regular files are parsed.
-	 */
-	// Main config includes whole temp directory
-	const std::string main_conf_yaml = yaml_helper::configs_key + ": " +
-	                                   std::filesystem::temp_directory_path().string() +
-	                                   "/test\n"
-	                                   "foo: bar\n"
-	                                   "base_value:\n"
-	                                   "    id: 1\n"
-	                                   "    name: foo\n";
-	const std::string conf_yaml_2 =
-	        "foo2: bar2\n"
-	        "base_value_2:\n"
-	        "    id: 2\n";
-	const std::string conf_yaml_3 =
-	        "foo2: bar3\n"
-	        "base_value_3:\n"
-	        "    id: 3\n"
-	        "    name: foo3\n";
-	const std::string conf_yaml_4 = "foo4: bar4\n";
-
-	std::filesystem::create_directory(std::filesystem::temp_directory_path() / "test");
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open(std::filesystem::temp_directory_path() / "test/conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	outfile.open(std::filesystem::temp_directory_path() / "test/conf_3.yaml");
-	outfile << conf_yaml_3;
-	outfile.close();
-
-	// Create a directory and create a config inside it. We will later check that it was not parsed
-	std::filesystem::create_directory(std::filesystem::temp_directory_path() / "test" / "foo");
-	outfile.open(std::filesystem::temp_directory_path() / "test/foo/conf_4.yaml");
-	outfile << conf_yaml_4;
-	outfile.close();
-
-	std::vector<std::string> cmdline_config_options;
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main + conf_2 + conf_3.
-	// test/foo is not parsed.
-	ASSERT_EQ(res.size(), 3);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_2.id", 0), 2);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_3.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_3.id", 0), 3);
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo2", ""), "bar3");
-	ASSERT_FALSE(falco_config.m_config.is_defined("foo4"));
-
-	std::filesystem::remove("main");
-	std::filesystem::remove_all(std::filesystem::temp_directory_path() / "test");
-}
-
-TEST(Configuration, configuration_config_files_cmdline) {
-	/* Test that we support including configs files from cmdline option */
-	const std::string main_conf_yaml =
-	        "foo: bar\n"
-	        "base_value:\n"
-	        "    id: 1\n"
-	        "    name: foo\n";
-	const std::string conf_yaml_2 =
-	        "foo2: bar2\n"
-	        "base_value_2:\n"
-	        "    id: 2\n";
-
-	std::ofstream outfile("main.yaml");
-	outfile << main_conf_yaml;
-	outfile.close();
-
-	outfile.open("conf_2.yaml");
-	outfile << conf_yaml_2;
-	outfile.close();
-
-	// Pass "config_files=..." cmdline option
-	std::vector<std::string> cmdline_config_options;
-	cmdline_config_options.push_back((yaml_helper::configs_key + "=conf_2.yaml"));
-
-	falco_configuration falco_config;
-	config_loaded_res res;
-	ASSERT_NO_THROW(res = falco_config.init_from_file("main.yaml", cmdline_config_options));
-
-	// main + conf_2
-	ASSERT_EQ(res.size(), 2);
-
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo", ""), "bar");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value.id", 0), 1);
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value.name"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("base_value.name", ""), "foo");
-	ASSERT_TRUE(falco_config.m_config.is_defined("foo2"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<std::string>("foo2", ""), "bar2");
-	ASSERT_TRUE(falco_config.m_config.is_defined("base_value_2.id"));
-	ASSERT_EQ(falco_config.m_config.get_scalar<int>("base_value_2.id", 0), 2);
-
-	std::filesystem::remove("main.yaml");
-	std::filesystem::remove("conf_2.yaml");
-}
--- a/unit_tests/falco/test_configuration_env_vars.cpp
+++ b/unit_tests/falco/test_configuration_env_vars.cpp
@@ -1,227 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-Copyright (C) 2023 The Falco Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <gtest/gtest.h>
-#include <falco/configuration.h>
-
-#ifdef _WIN32
-#define SET_ENV_VAR(env_var_name, env_var_value) _putenv_s(env_var_name, env_var_value)
-#else
-#define SET_ENV_VAR(env_var_name, env_var_value) setenv(env_var_name, env_var_value, 1)
-#endif
-
-TEST(Configuration, configuration_environment_variables) {
-	// Set an environment variable for testing purposes
-	std::string env_var_value = "envVarValue";
-	std::string env_var_name = "ENV_VAR";
-	SET_ENV_VAR(env_var_name.c_str(), env_var_value.c_str());
-
-	std::string embedded_env_var_value = "${ENV_VAR}";
-	std::string embedded_env_var_name = "ENV_VAR_EMBEDDED";
-	SET_ENV_VAR(embedded_env_var_name.c_str(), embedded_env_var_value.c_str());
-
-	std::string bool_env_var_value = "true";
-	std::string bool_env_var_name = "ENV_VAR_BOOL";
-	SET_ENV_VAR(bool_env_var_name.c_str(), bool_env_var_value.c_str());
-
-	std::string int_env_var_value = "12";
-	std::string int_env_var_name = "ENV_VAR_INT";
-	SET_ENV_VAR(int_env_var_name.c_str(), int_env_var_value.c_str());
-
-	std::string empty_env_var_value = "";
-	std::string empty_env_var_name = "ENV_VAR_EMPTY";
-	SET_ENV_VAR(empty_env_var_name.c_str(), empty_env_var_value.c_str());
-
-	std::string default_value = "default";
-	std::string env_var_sample_yaml =
-	        "base_value:\n"
-	        "    id: $ENV_VAR\n"
-	        "    name: '${ENV_VAR}'\n"
-	        "    string: my_string\n"
-	        "    invalid: $${ENV_VAR}\n"
-	        "    invalid_env: $$ENV_VAR\n"
-	        "    invalid_double_env: $${ENV_VAR}$${ENV_VAR}\n"
-	        "    invalid_embedded_env: $${${ENV_VAR}}\n"
-	        "    invalid_valid_env: $${ENV_VAR}${ENV_VAR}\n"
-	        "    escaped: \"${ENV_VAR}\"\n"
-	        "    subvalue:\n"
-	        "        subvalue2:\n"
-	        "            boolean: ${UNSED_XX_X_X_VAR}\n"
-	        "base_value_2:\n"
-	        "    sample_list:\n"
-	        "        - ${ENV_VAR}\n"
-	        "        - ' ${ENV_VAR}'\n"
-	        "        - '${ENV_VAR} '\n"
-	        "        - $UNSED_XX_X_X_VAR\n"
-	        "paths:\n"
-	        "    - ${ENV_VAR}/foo\n"
-	        "    - $ENV_VAR/foo\n"
-	        "    - /foo/${ENV_VAR}/\n"
-	        "    - /${ENV_VAR}/${ENV_VAR}${ENV_VAR}/foo\n"
-	        "    - ${ENV_VAR_EMBEDDED}/foo\n"
-	        "is_test: ${ENV_VAR_BOOL}\n"
-	        "num_test: ${ENV_VAR_INT}\n"
-	        "empty_test: ${ENV_VAR_EMPTY}\n"
-	        "plugins:\n"
-	        "  - name: k8saudit\n"
-	        "    library_path: /foo/${ENV_VAR}/libk8saudit.so\n"
-	        "    open_params: ${ENV_VAR_INT}\n";
-
-	yaml_helper conf;
-	conf.load_from_string(env_var_sample_yaml);
-
-	/* Check if the base values are defined */
-	ASSERT_TRUE(conf.is_defined("base_value"));
-	ASSERT_TRUE(conf.is_defined("base_value_2"));
-	ASSERT_TRUE(conf.is_defined("paths"));
-	ASSERT_FALSE(conf.is_defined("unknown_base_value"));
-
-	/* Test fetching of a regular string without any environment variable */
-	auto base_value_string = conf.get_scalar<std::string>("base_value.string", default_value);
-	ASSERT_EQ(base_value_string, "my_string");
-
-	/* Test fetching of escaped environment variable format. Should return the string as-is after
-	 * stripping the leading `$` */
-	auto base_value_invalid = conf.get_scalar<std::string>("base_value.invalid", default_value);
-	ASSERT_EQ(base_value_invalid, "${ENV_VAR}");
-
-	/* Test fetching of invalid escaped environment variable format. Should return the string as-is
-	 */
-	auto base_value_invalid_env =
-	        conf.get_scalar<std::string>("base_value.invalid_env", default_value);
-	ASSERT_EQ(base_value_invalid_env, "$$ENV_VAR");
-
-	/* Test fetching of 2 escaped environment variables side by side. Should return the string as-is
-	 * after stripping the leading `$` */
-	auto base_value_double_invalid =
-	        conf.get_scalar<std::string>("base_value.invalid_double_env", default_value);
-	ASSERT_EQ(base_value_double_invalid, "${ENV_VAR}${ENV_VAR}");
-
-	/*
-	 * Test fetching of escaped environment variable format with inside an env variable.
-	 * Should return the string as-is after stripping the leading `$` with the resolved env variable
-	 * within
-	 */
-	auto base_value_embedded_invalid =
-	        conf.get_scalar<std::string>("base_value.invalid_embedded_env", default_value);
-	ASSERT_EQ(base_value_embedded_invalid, "${" + env_var_value + "}");
-
-	/*
-	 * Test fetching of an escaped env variable plus an env variable side by side.
-	 * Should return the escaped one trimming the leading `$` plus the second one resolved.
-	 */
-	auto base_value_valid_invalid =
-	        conf.get_scalar<std::string>("base_value.invalid_valid_env", default_value);
-	ASSERT_EQ(base_value_valid_invalid, "${ENV_VAR}" + env_var_value);
-
-	/* Test fetching of strings that contain environment variables */
-	auto base_value_id = conf.get_scalar<std::string>("base_value.id", default_value);
-	ASSERT_EQ(base_value_id, "$ENV_VAR");  // Does not follow the `${VAR}` format, so it should be
-	                                       // treated as a regular string
-
-	auto base_value_name = conf.get_scalar<std::string>("base_value.name", default_value);
-	ASSERT_EQ(base_value_name, env_var_value);  // Proper environment variable format
-
-	auto base_value_escaped = conf.get_scalar<std::string>("base_value.escaped", default_value);
-	ASSERT_EQ(base_value_escaped, env_var_value);  // Environment variable within quotes
-
-	/* Test fetching of an undefined environment variable. Resolves to empty string. */
-	auto unknown_boolean =
-	        conf.get_scalar<std::string>("base_value.subvalue.subvalue2.boolean", default_value);
-	ASSERT_EQ(unknown_boolean, "");
-
-	/* Test fetching of environment variables from a list */
-	auto base_value_2_list_0 =
-	        conf.get_scalar<std::string>("base_value_2.sample_list[0]", default_value);
-	ASSERT_EQ(base_value_2_list_0, env_var_value);  // Proper environment variable format
-
-	auto base_value_2_list_1 =
-	        conf.get_scalar<std::string>("base_value_2.sample_list[1]", default_value);
-	ASSERT_EQ(base_value_2_list_1,
-	          " " + env_var_value);  // Environment variable preceded by a space, still extracted
-	                                 // env var with leading space
-
-	auto base_value_2_list_2 =
-	        conf.get_scalar<std::string>("base_value_2.sample_list[2]", default_value);
-	ASSERT_EQ(base_value_2_list_2,
-	          env_var_value + " ");  // Environment variable followed by a space, still extracted
-	                                 // env var with trailing space
-
-	auto base_value_2_list_3 =
-	        conf.get_scalar<std::string>("base_value_2.sample_list[3]", default_value);
-	ASSERT_EQ(base_value_2_list_3, "$UNSED_XX_X_X_VAR");  // Does not follow the `${VAR}` format, so
-	                                                      // should be treated as a regular string
-
-	/* Test expansion of environment variables within strings */
-	auto path_list_0 = conf.get_scalar<std::string>("paths[0]", default_value);
-	ASSERT_EQ(
-	        path_list_0,
-	        env_var_value + "/foo");  // Even if env var is part of bigger string, it gets expanded
-
-	auto path_list_1 = conf.get_scalar<std::string>("paths[1]", default_value);
-	ASSERT_EQ(path_list_1, "$ENV_VAR/foo");  // Does not follow the `${VAR}` format, so should be
-	                                         // treated as a regular string
-
-	auto path_list_2 = conf.get_scalar<std::string>("paths[2]", default_value);
-	ASSERT_EQ(path_list_2,
-	          "/foo/" + env_var_value +
-	                  "/");  // Even when env var is in the middle of a string. it gets expanded
-
-	auto path_list_3 = conf.get_scalar<std::string>("paths[3]", default_value);
-	ASSERT_EQ(path_list_3,
-	          "/" + env_var_value + "/" + env_var_value + env_var_value +
-	                  "/foo");  // Even when the string contains multiple env vars they are
-	                            // correctly expanded
-
-	auto path_list_4 = conf.get_scalar<std::string>("paths[4]", default_value);
-	ASSERT_EQ(path_list_4, env_var_value + "/foo");  // Even when the env var contains another env
-	                                                 // var, it gets correctly double-expanded
-
-	/* Check that variable expansion is type-aware */
-	auto boolean = conf.get_scalar<bool>("is_test", false);
-	ASSERT_EQ(boolean, true);  // `true` can be parsed to bool.
-
-	auto boolean_as_str = conf.get_scalar<std::string>("is_test", "false");
-	ASSERT_EQ(boolean_as_str, "true");  // `true` can be parsed to string.
-
-	auto boolean_as_int = conf.get_scalar<int32_t>("is_test", 0);
-	ASSERT_EQ(boolean_as_int, 0);  // `true` cannot be parsed to integer.
-
-	auto integer = conf.get_scalar<int32_t>("num_test", -1);
-	ASSERT_EQ(integer, 12);
-
-	// An env var that resolves to an empty string returns ""
-	auto empty_default_str = conf.get_scalar<std::string>("empty_test", default_value);
-	ASSERT_EQ(empty_default_str, "");
-
-	std::list<falco_configuration::plugin_config> plugins;
-	conf.get_sequence<std::list<falco_configuration::plugin_config>>(plugins,
-	                                                                 std::string("plugins"));
-	std::vector<falco_configuration::plugin_config> m_plugins{
-	        std::make_move_iterator(std::begin(plugins)),
-	        std::make_move_iterator(std::end(plugins))};
-	ASSERT_EQ(m_plugins[0].m_name, "k8saudit");
-	ASSERT_EQ(m_plugins[0].m_library_path, "/foo/" + env_var_value + "/libk8saudit.so");
-	ASSERT_EQ(m_plugins[0].m_open_params, "12");
-
-	/* Clear the set environment variables after testing */
-	SET_ENV_VAR(env_var_name.c_str(), "");
-	SET_ENV_VAR(embedded_env_var_name.c_str(), "");
-	SET_ENV_VAR(bool_env_var_name.c_str(), "");
-	SET_ENV_VAR(int_env_var_name.c_str(), "");
-	SET_ENV_VAR(empty_env_var_name.c_str(), "");
-}
--- a/unit_tests/falco/test_configuration_output_options.cpp
+++ b/unit_tests/falco/test_configuration_output_options.cpp
@@ -1,123 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-Copyright (C) 2024 The Falco Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <gtest/gtest.h>
-#include <falco/configuration.h>
-
-TEST(ConfigurationRuleOutputOptions, parse_yaml) {
-	falco_configuration falco_config;
-	ASSERT_NO_THROW(falco_config.init_from_content(R"(
-append_output:
-  - match:
-      source: syscall
-      tags: ["persistence"]
-      rule: some rule name
-    
-    extra_output: "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]"
-
-  - match:
-      tags: ["persistence", "execution"]
-    extra_fields:
-      - proc.aname[2]: "%proc.aname[2]"
-      - proc.aname[3]: "%proc.aname[3]"
-      - proc.aname[4]: "%proc.aname[4]"
-    extra_output: "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]"
-
-  - match:
-      source: k8s_audit
-    extra_fields:
-      - ka.verb
-      - static_field: "static content"
-
-	)",
-	                                               {}));
-
-	EXPECT_EQ(falco_config.m_append_output.size(), 3);
-
-	EXPECT_EQ(falco_config.m_append_output[0].m_source, "syscall");
-	EXPECT_EQ(falco_config.m_append_output[0].m_tags.size(), 1);
-	EXPECT_EQ(falco_config.m_append_output[0].m_tags.count("persistence"), 1);
-	EXPECT_EQ(falco_config.m_append_output[0].m_rule, "some rule name");
-	EXPECT_EQ(falco_config.m_append_output[0].m_formatted_fields.size(), 0);
-	EXPECT_EQ(falco_config.m_append_output[0].m_format,
-	          "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]");
-
-	EXPECT_EQ(falco_config.m_append_output[1].m_tags.size(), 2);
-	EXPECT_EQ(falco_config.m_append_output[1].m_tags.count("persistence"), 1);
-	EXPECT_EQ(falco_config.m_append_output[1].m_tags.count("execution"), 1);
-	EXPECT_EQ(falco_config.m_append_output[1].m_format,
-	          "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]");
-
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields.size(), 3);
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields["proc.aname[2]"],
-	          "%proc.aname[2]");
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields["proc.aname[3]"],
-	          "%proc.aname[3]");
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields["proc.aname[4]"],
-	          "%proc.aname[4]");
-
-	EXPECT_EQ(falco_config.m_append_output[2].m_source, "k8s_audit");
-
-	EXPECT_EQ(falco_config.m_append_output[2].m_formatted_fields.size(), 1);
-	EXPECT_EQ(falco_config.m_append_output[2].m_formatted_fields["static_field"], "static content");
-
-	EXPECT_EQ(falco_config.m_append_output[2].m_raw_fields.size(), 1);
-	EXPECT_EQ(falco_config.m_append_output[2].m_raw_fields.count("ka.verb"), 1);
-}
-
-TEST(ConfigurationRuleOutputOptions, cli_options) {
-	falco_configuration falco_config;
-
-	ASSERT_NO_THROW(falco_config.init_from_content(
-	        "",
-	        std::vector<std::string>{
-	                R"(append_output[]={"match": {"source": "syscall", "tags": ["persistence"], "rule": "some rule name"}, "extra_output": "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]"})",
-	                R"(append_output[]={"match": {"tags": ["persistence", "execution"]}, "extra_fields": [{"proc.aname[2]": "%proc.aname[2]"}, {"proc.aname[3]": "%proc.aname[3]"}, {"proc.aname[4]": "%proc.aname[4]"}], "extra_output": "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]"})",
-	                R"(append_output[]={"match": {"source": "k8s_audit"}, "extra_fields": ["ka.verb", {"static_field": "static content"}]})"}));
-
-	EXPECT_EQ(falco_config.m_append_output.size(), 3);
-
-	EXPECT_EQ(falco_config.m_append_output[0].m_source, "syscall");
-	EXPECT_EQ(falco_config.m_append_output[0].m_tags.size(), 1);
-	EXPECT_EQ(falco_config.m_append_output[0].m_tags.count("persistence"), 1);
-	EXPECT_EQ(falco_config.m_append_output[0].m_rule, "some rule name");
-	EXPECT_EQ(falco_config.m_append_output[0].m_formatted_fields.size(), 0);
-	EXPECT_EQ(falco_config.m_append_output[0].m_format,
-	          "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]");
-
-	EXPECT_EQ(falco_config.m_append_output[1].m_tags.size(), 2);
-	EXPECT_EQ(falco_config.m_append_output[1].m_tags.count("persistence"), 1);
-	EXPECT_EQ(falco_config.m_append_output[1].m_tags.count("execution"), 1);
-	EXPECT_EQ(falco_config.m_append_output[1].m_format,
-	          "gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4]");
-
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields.size(), 3);
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields["proc.aname[2]"],
-	          "%proc.aname[2]");
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields["proc.aname[3]"],
-	          "%proc.aname[3]");
-	EXPECT_EQ(falco_config.m_append_output[1].m_formatted_fields["proc.aname[4]"],
-	          "%proc.aname[4]");
-
-	EXPECT_EQ(falco_config.m_append_output[2].m_source, "k8s_audit");
-
-	EXPECT_EQ(falco_config.m_append_output[2].m_formatted_fields.size(), 1);
-	EXPECT_EQ(falco_config.m_append_output[2].m_formatted_fields["static_field"], "static content");
-
-	EXPECT_EQ(falco_config.m_append_output[2].m_raw_fields.size(), 1);
-	EXPECT_EQ(falco_config.m_append_output[2].m_raw_fields.count("ka.verb"), 1);
-}
--- a/unit_tests/falco/test_configuration_rule_selection.cpp
+++ b/unit_tests/falco/test_configuration_rule_selection.cpp
@@ -18,9 +18,10 @@ limitations under the License.
 #include <gtest/gtest.h>
 #include <falco/configuration.h>

-TEST(ConfigurationRuleSelection, parse_yaml) {
+TEST(ConfigurationRuleSelection, parse_yaml)
+{
 	falco_configuration falco_config;
-	ASSERT_NO_THROW(falco_config.init_from_content(R"(
+	EXPECT_NO_THROW(falco_config.init_from_content(R"(
 rules:
  - enable:
      rule: 'Terminal Shell in Container'
@@ -30,57 +31,30 @@ rules:

  - enable:
      rule: 'hello*'
-	)",
-	                                               {}));
+	)", {}));

-	EXPECT_EQ(falco_config.m_rules_selection.size(), 3);
+	ASSERT_EQ(falco_config.m_rules_selection.size(), 3);

-	EXPECT_EQ(falco_config.m_rules_selection[0].m_op,
-	          falco_configuration::rule_selection_operation::enable);
-	EXPECT_EQ(falco_config.m_rules_selection[0].m_rule, "Terminal Shell in Container");
+	ASSERT_EQ(falco_config.m_rules_selection[0].m_op, falco_configuration::rule_selection_operation::enable);
+	ASSERT_EQ(falco_config.m_rules_selection[0].m_rule, "Terminal Shell in Container");

-	EXPECT_EQ(falco_config.m_rules_selection[1].m_op,
-	          falco_configuration::rule_selection_operation::disable);
-	EXPECT_EQ(falco_config.m_rules_selection[1].m_tag, "experimental");
+	ASSERT_EQ(falco_config.m_rules_selection[1].m_op, falco_configuration::rule_selection_operation::disable);
+	ASSERT_EQ(falco_config.m_rules_selection[1].m_tag, "experimental");

-	EXPECT_EQ(falco_config.m_rules_selection[2].m_op,
-	          falco_configuration::rule_selection_operation::enable);
-	EXPECT_EQ(falco_config.m_rules_selection[2].m_rule, "hello*");
+	ASSERT_EQ(falco_config.m_rules_selection[2].m_op, falco_configuration::rule_selection_operation::enable);
+	ASSERT_EQ(falco_config.m_rules_selection[2].m_rule, "hello*");
 }

-TEST(ConfigurationRuleSelection, cli_options) {
+TEST(ConfigurationRuleSelection, cli_options)
+{
 	falco_configuration falco_config;
-	ASSERT_NO_THROW(falco_config.init_from_content(
-	        "",
-	        std::vector<std::string>{"rules[].disable.tag=maturity_incubating",
-	                                 "rules[].enable.rule=Adding ssh keys to authorized_keys"}));
+	EXPECT_NO_THROW(falco_config.init_from_content("", std::vector<std::string>{"rules[].disable.tag=maturity_incubating", "rules[].enable.rule=Adding ssh keys to authorized_keys"}));

-	EXPECT_EQ(falco_config.m_rules_selection.size(), 2);
+	ASSERT_EQ(falco_config.m_rules_selection.size(), 2);

-	EXPECT_EQ(falco_config.m_rules_selection[0].m_op,
-	          falco_configuration::rule_selection_operation::disable);
-	EXPECT_EQ(falco_config.m_rules_selection[0].m_tag, "maturity_incubating");
+	ASSERT_EQ(falco_config.m_rules_selection[0].m_op, falco_configuration::rule_selection_operation::disable);
+	ASSERT_EQ(falco_config.m_rules_selection[0].m_tag, "maturity_incubating");

-	EXPECT_EQ(falco_config.m_rules_selection[1].m_op,
-	          falco_configuration::rule_selection_operation::enable);
-	EXPECT_EQ(falco_config.m_rules_selection[1].m_rule, "Adding ssh keys to authorized_keys");
-}
-
-TEST(ConfigurationRuleSelection, cli_options_object) {
-	falco_configuration falco_config;
-	ASSERT_NO_THROW(falco_config.init_from_content(
-	        "",
-	        std::vector<std::string>{
-	                R"(rules[]={"disable": {"tag": "maturity_incubating"}})",
-	                R"(rules[]={"enable": {"rule": "Adding ssh keys to authorized_keys"}})"}));
-
-	EXPECT_EQ(falco_config.m_rules_selection.size(), 2);
-
-	EXPECT_EQ(falco_config.m_rules_selection[0].m_op,
-	          falco_configuration::rule_selection_operation::disable);
-	EXPECT_EQ(falco_config.m_rules_selection[0].m_tag, "maturity_incubating");
-
-	EXPECT_EQ(falco_config.m_rules_selection[1].m_op,
-	          falco_configuration::rule_selection_operation::enable);
-	EXPECT_EQ(falco_config.m_rules_selection[1].m_rule, "Adding ssh keys to authorized_keys");
+	ASSERT_EQ(falco_config.m_rules_selection[1].m_op, falco_configuration::rule_selection_operation::enable);
+	ASSERT_EQ(falco_config.m_rules_selection[1].m_rule, "Adding ssh keys to authorized_keys");
 }
--- a/unit_tests/falco/test_configuration_schema.cpp
+++ b/unit_tests/falco/test_configuration_schema.cpp
@@ -1,172 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-/*
-Copyright (C) 2023 The Falco Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-#include <gtest/gtest.h>
-#include <falco/configuration.h>
-#include <falco_test_var.h>
-#include <nlohmann/json.hpp>
-
-#define EXPECT_VALIDATION_STATUS(res, status)                                                     \
-	do {                                                                                          \
-		for(const auto& pair : res) {                                                             \
-			auto validation_status = pair.second;                                                 \
-			EXPECT_TRUE(sinsp_utils::startswith(validation_status, status)) << validation_status; \
-		}                                                                                         \
-	} while(0)
-
-// Read Falco config from current repo-path
-TEST(Configuration, schema_validate_config) {
-	falco_configuration falco_config;
-	config_loaded_res res;
-
-	if(!std::filesystem::exists(TEST_FALCO_CONFIG)) {
-		GTEST_SKIP() << "Falco config not present under " << TEST_FALCO_CONFIG;
-	}
-	EXPECT_NO_THROW(res = falco_config.init_from_file(TEST_FALCO_CONFIG, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
-}
-
-TEST(Configuration, schema_ok) {
-	falco_configuration falco_config;
-	config_loaded_res res;
-
-	/* OK YAML */
-	std::string config =
-	        "falco_libs:\n"
-	        "    thread_table_size: 50\n";
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
-}
-
-TEST(Configuration, schema_wrong_key) {
-	falco_configuration falco_config;
-	config_loaded_res res;
-
-	/* Miss-typed key YAML */
-	std::string config =
-	        "falco_libss:\n"
-	        "    thread_table_size: 50\n";
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_failed);
-}
-
-TEST(Configuration, schema_wrong_type) {
-	falco_configuration falco_config;
-
-	/* Wrong value type YAML */
-	std::string config = "falco_libs: 512\n";
-
-	// We expect an exception since `falco_configuration::load_yaml()`
-	// will fail to parse `falco_libs` node.
-	ASSERT_ANY_THROW(falco_config.init_from_content(config, {}));
-}
-
-TEST(Configuration, schema_wrong_embedded_key) {
-	falco_configuration falco_config;
-	config_loaded_res res;
-
-	/* Miss-typed sub-key YAML */
-	std::string config =
-	        "falco_libs:\n"
-	        "    thread_table_sizeee: 50\n";
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_failed);
-}
-
-TEST(Configuration, plugin_init_config) {
-	falco_configuration falco_config;
-	config_loaded_res res;
-
-	std::string config = R"(
-plugins:
-  - name: k8saudit
-    library_path: libk8saudit.so
-    init_config:
-      maxEventSize: 262144
-      sslCertificate: /etc/falco/falco.pem
-)";
-
-	auto plugin_config_json = nlohmann::json::parse(
-	        R"({"maxEventSize": 262144, "sslCertificate": "/etc/falco/falco.pem"})");
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
-	auto parsed_init_config = nlohmann::json::parse(falco_config.m_plugins[0].m_init_config);
-	EXPECT_EQ(parsed_init_config, plugin_config_json);
-
-	config = R"(
-plugins:
-  - name: k8saudit
-    library_path: libk8saudit.so
-    init_config: '{"maxEventSize": 262144, "sslCertificate": "/etc/falco/falco.pem"}'
-)";
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
-	parsed_init_config = nlohmann::json::parse(falco_config.m_plugins[0].m_init_config);
-	EXPECT_EQ(parsed_init_config, plugin_config_json);
-
-	config = R"(
-plugins:
-  - name: k8saudit
-    library_path: libk8saudit.so
-    init_config: ""
-)";
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
-	EXPECT_EQ(falco_config.m_plugins[0].m_init_config, "");
-
-	config = R"(
-plugins:
-  - name: k8saudit
-    library_path: libk8saudit.so
-    init_config: null
-)";
-
-	EXPECT_NO_THROW(res = falco_config.init_from_content(config, {}));
-	EXPECT_VALIDATION_STATUS(res, yaml_helper::validation_ok);
-	EXPECT_EQ(falco_config.m_plugins[0].m_init_config, "");
-}
-
-TEST(Configuration, schema_yaml_helper_validator) {
-	yaml_helper conf;
-	falco_configuration falco_config;
-
-	/* Broken YAML */
-	std::string sample_yaml =
-	        "falco_libs:\n"
-	        "    thread_table_size: 50\n";
-
-	// Ok, we don't ask for any validation
-	EXPECT_NO_THROW(conf.load_from_string(sample_yaml));
-
-	// We pass a string variable but not a schema
-	std::vector<std::string> validation;
-	EXPECT_NO_THROW(conf.load_from_string(sample_yaml, nlohmann::json{}, &validation));
-	EXPECT_EQ(validation[0], yaml_helper::validation_none);
-
-	// We pass a schema but not a string storage for the validation; no validation takes place
-	EXPECT_NO_THROW(conf.load_from_string(sample_yaml, falco_config.m_config_schema, nullptr));
-
-	// We pass everything
-	EXPECT_NO_THROW(conf.load_from_string(sample_yaml, falco_config.m_config_schema, &validation));
-	EXPECT_EQ(validation[0], yaml_helper::validation_ok);
-}
--- a/unit_tests/falco_test_var.h.in
+++ b/unit_tests/falco_test_var.h.in
@@ -2,4 +2,3 @@

 #define TEST_ENGINE_KMOD_CONFIG "${CMAKE_SOURCE_DIR}/unit_tests/falco/test_configs/engine_kmod_config.yaml"
 #define TEST_ENGINE_MODERN_CONFIG "${CMAKE_SOURCE_DIR}/unit_tests/falco/test_configs/engine_modern_config.yaml"
-#define TEST_FALCO_CONFIG "${CMAKE_SOURCE_DIR}/falco.yaml"
--- a/unit_tests/test_falco_engine.cpp
+++ b/unit_tests/test_falco_engine.cpp
@@ -1,6 +1,7 @@
 #include "test_falco_engine.h"

-test_falco_engine::test_falco_engine() {
+test_falco_engine::test_falco_engine()
+{
 	// create a falco engine ready to load the ruleset
 	m_filter_factory = std::make_shared<sinsp_filter_factory>(&m_inspector, m_filterlist);
 	m_formatter_factory = std::make_shared<sinsp_evt_formatter_factory>(&m_inspector, m_filterlist);
@@ -8,8 +9,8 @@ test_falco_engine::test_falco_engine() {
 	m_engine->add_source(m_sample_source, m_filter_factory, m_formatter_factory);
 }

-bool test_falco_engine::load_rules(const std::string& rules_content,
-                                   const std::string& rules_filename) {
+bool test_falco_engine::load_rules(const std::string& rules_content, const std::string& rules_filename)
+{
 	bool ret = false;
 	falco::load_result::rules_contents_t rc = {{rules_filename, rules_content}};
 	m_load_result = m_engine->load_rules(rules_content, rules_filename);
@@ -17,7 +18,8 @@ bool test_falco_engine::load_rules(const std::string& rules_content,
 	m_load_result_json = m_load_result->as_json(rc);
 	ret = m_load_result->successful();

-	if(ret) {
+	if (ret)
+	{
 		m_engine->enable_rule("", true, m_sample_ruleset);
 	}

@@ -25,24 +27,30 @@ bool test_falco_engine::load_rules(const std::string& rules_content,
 }

 // This must be kept in line with the (private) falco_engine::s_default_ruleset
-uint64_t test_falco_engine::num_rules_for_ruleset(const std::string& ruleset) {
+uint64_t test_falco_engine::num_rules_for_ruleset(const std::string& ruleset)
+{
 	return m_engine->num_rules_for_ruleset(ruleset);
 }

-bool test_falco_engine::has_warnings() const {
+bool test_falco_engine::has_warnings() const
+{
 	return m_load_result->has_warnings();
 }

-bool test_falco_engine::check_warning_message(const std::string& warning_msg) const {
-	if(!m_load_result->has_warnings()) {
+bool test_falco_engine::check_warning_message(const std::string& warning_msg) const
+{
+	if(!m_load_result->has_warnings())
+	{
 		return false;
 	}

-	for(const auto& warn : m_load_result_json["warnings"]) {
+	for(const auto &warn : m_load_result_json["warnings"])
+	{
 		std::string msg = warn["message"];
 		// Debug:
 		// printf("msg: %s\n", msg.c_str());
-		if(msg.find(warning_msg) != std::string::npos) {
+		if(msg.find(warning_msg) != std::string::npos)
+		{
 			return true;
 		}
 	}
@@ -50,17 +58,21 @@ bool test_falco_engine::check_warning_message(const std::string& warning_msg) co
 	return false;
 }

-bool test_falco_engine::check_error_message(const std::string& error_msg) const {
+bool test_falco_engine::check_error_message(const std::string& error_msg) const
+{
 	// if the loading is successful there are no errors
-	if(m_load_result->successful()) {
+	if(m_load_result->successful())
+	{
 		return false;
 	}

-	for(const auto& err : m_load_result_json["errors"]) {
+	for(const auto &err : m_load_result_json["errors"])
+	{
 		std::string msg = err["message"];
 		// Debug:
 		// printf("msg: %s\n", msg.c_str());
-		if(msg.find(error_msg) != std::string::npos) {
+		if(msg.find(error_msg) != std::string::npos)
+		{
 			return true;
 		}
 	}
@@ -68,20 +80,8 @@ bool test_falco_engine::check_error_message(const std::string& error_msg) const
 	return false;
 }

-std::string test_falco_engine::get_compiled_rule_condition(std::string rule_name) const {
+std::string test_falco_engine::get_compiled_rule_condition(std::string rule_name) const
+{
 	auto rule_description = m_engine->describe_rule(&rule_name, {});
-	return rule_description["rules"][0]["details"]["condition_compiled"]
-	        .template get<std::string>();
-}
-
-std::string test_falco_engine::get_compiled_rule_output(std::string rule_name) const {
-	auto rule_description = m_engine->describe_rule(&rule_name, {});
-	return rule_description["rules"][0]["details"]["output_compiled"].template get<std::string>();
-}
-
-std::unordered_map<std::string, std::string> test_falco_engine::get_compiled_rule_formatted_fields(
-        std::string rule_name) const {
-	auto rule_description = m_engine->describe_rule(&rule_name, {});
-	return rule_description["rules"][0]["details"]["extra_output_formatted_fields"]
-	        .template get<std::unordered_map<std::string, std::string>>();
+	return rule_description["rules"][0]["details"]["condition_compiled"].template get<std::string>();
 }
--- a/unit_tests/test_falco_engine.h
+++ b/unit_tests/test_falco_engine.h
@@ -6,9 +6,9 @@
 #include "rule_loading_messages.h"

 #include <gtest/gtest.h>
-#include <unordered_map>

-class test_falco_engine : public testing::Test {
+class test_falco_engine : public testing::Test
+{
 protected:
 	test_falco_engine();

@@ -19,9 +19,6 @@ protected:
 	bool check_warning_message(const std::string& warning_msg) const;
 	bool check_error_message(const std::string& error_msg) const;
 	std::string get_compiled_rule_condition(std::string rule_name = "") const;
-	std::string get_compiled_rule_output(std::string rule_name = "") const;
-	std::unordered_map<std::string, std::string> get_compiled_rule_formatted_fields(
-	        std::string rule_name) const;

 	std::string m_sample_ruleset = "sample-ruleset";
 	std::string m_sample_source = falco_common::syscall_source;
--- a/userspace/engine/CMakeLists.txt
+++ b/userspace/engine/CMakeLists.txt
@@ -2,40 +2,47 @@
 #
 # Copyright (C) 2023 The Falco Authors.
 #
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software distributed under the License
-# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
-# or implied. See the License for the specific language governing permissions and limitations under
-# the License.
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.

-add_library(
-	falco_engine STATIC
-	falco_common.cpp
-	falco_engine.cpp
-	falco_load_result.cpp
-	falco_utils.cpp
-	filter_ruleset.cpp
-	evttype_index_ruleset.cpp
-	formats.cpp
-	filter_details_resolver.cpp
-	filter_macro_resolver.cpp
-	filter_warning_resolver.cpp
-	logger.cpp
-	stats_manager.cpp
-	rule_loader.cpp
-	rule_loader_reader.cpp
-	rule_loader_collector.cpp
-	rule_loader_compiler.cpp
+add_library(falco_engine STATIC
+    falco_common.cpp
+    falco_engine.cpp
+    falco_load_result.cpp
+    falco_utils.cpp
+    filter_ruleset.cpp
+    evttype_index_ruleset.cpp
+    formats.cpp
+    filter_details_resolver.cpp
+    filter_macro_resolver.cpp
+    filter_warning_resolver.cpp
+    logger.cpp
+    stats_manager.cpp
+    rule_loader.cpp
+    rule_loader_reader.cpp
+    rule_loader_collector.cpp
+    rule_loader_compiler.cpp
 )

-if(EMSCRIPTEN)
+if (EMSCRIPTEN)
 	target_compile_options(falco_engine PRIVATE "-sDISABLE_EXCEPTION_CATCHING=0")
 endif()

-target_include_directories(falco_engine PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${TBB_INCLUDE_DIR})
+target_include_directories(falco_engine
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${TBB_INCLUDE_DIR}
+)

-target_link_libraries(falco_engine PUBLIC sinsp nlohmann_json::nlohmann_json yaml-cpp)
+target_link_libraries(falco_engine
+PUBLIC
+    sinsp
+    nlohmann_json::nlohmann_json
+    yaml-cpp
+)
--- a/userspace/engine/evttype_index_ruleset.cpp
+++ b/userspace/engine/evttype_index_ruleset.cpp
@@ -17,48 +17,124 @@ limitations under the License.

 #include "evttype_index_ruleset.h"

+#include "falco_utils.h"
+
 #include "logger.h"

 #include <algorithm>

-evttype_index_ruleset::evttype_index_ruleset(std::shared_ptr<sinsp_filter_factory> f):
-        m_filter_factory(f) {}
+evttype_index_ruleset::evttype_index_ruleset(
+	std::shared_ptr<sinsp_filter_factory> f): m_filter_factory(f)
+{
+}

-evttype_index_ruleset::~evttype_index_ruleset() {}
+evttype_index_ruleset::~evttype_index_ruleset()
+{
+}

-void evttype_index_ruleset::add(const falco_rule &rule,
-                                std::shared_ptr<sinsp_filter> filter,
-                                std::shared_ptr<libsinsp::filter::ast::expr> condition) {
-	try {
-		auto wrap = std::make_shared<evttype_index_wrapper>();
-		wrap->m_rule = rule;
-		wrap->m_filter = filter;
-		if(rule.source == falco_common::syscall_source) {
-			wrap->m_sc_codes = libsinsp::filter::ast::ppm_sc_codes(condition.get());
-			wrap->m_event_codes = libsinsp::filter::ast::ppm_event_codes(condition.get());
-		} else {
-			wrap->m_sc_codes = {};
-			wrap->m_event_codes = {ppm_event_code::PPME_PLUGINEVENT_E};
-		}
-		wrap->m_event_codes.insert(ppm_event_code::PPME_ASYNCEVENT_E);
+evttype_index_ruleset::ruleset_filters::ruleset_filters()
+{
+}

-		add_wrapper(wrap);
-	} catch(const sinsp_exception &e) {
-		throw falco_exception(std::string(e.what()));
+evttype_index_ruleset::ruleset_filters::~ruleset_filters()
+{
+}
+
+void evttype_index_ruleset::ruleset_filters::add_wrapper_to_list(filter_wrapper_list &wrappers, std::shared_ptr<filter_wrapper> wrap)
+{
+	// This is O(n) but it's also uncommon
+	// (when loading rules only).
+	auto pos = std::find(wrappers.begin(),
+			     wrappers.end(),
+			     wrap);
+
+	if(pos == wrappers.end())
+	{
+		wrappers.push_back(wrap);
 	}
 }

-void evttype_index_ruleset::on_loading_complete() {
-	print_enabled_rules_falco_logger();
+void evttype_index_ruleset::ruleset_filters::remove_wrapper_from_list(filter_wrapper_list &wrappers, std::shared_ptr<filter_wrapper> wrap)
+{
+	// This is O(n) but it's also uncommon
+	// (when loading rules only).
+	auto pos = std::find(wrappers.begin(),
+			     wrappers.end(),
+			     wrap);
+	if(pos != wrappers.end())
+	{
+		wrappers.erase(pos);
+	}
 }

-bool evttype_index_ruleset::run_wrappers(sinsp_evt *evt,
-                                         filter_wrapper_list &wrappers,
-                                         uint16_t ruleset_id,
-                                         falco_rule &match) {
-	for(auto &wrap : wrappers) {
-		if(wrap->m_filter->run(evt)) {
-			match = wrap->m_rule;
+void evttype_index_ruleset::ruleset_filters::add_filter(std::shared_ptr<filter_wrapper> wrap)
+{
+	if(wrap->event_codes.empty())
+	{
+		// Should run for all event types
+		add_wrapper_to_list(m_filter_all_event_types, wrap);
+	}
+	else
+	{
+		for(auto &etype : wrap->event_codes)
+		{
+			if(m_filter_by_event_type.size() <= etype)
+			{
+				m_filter_by_event_type.resize(etype + 1);
+			}
+
+			add_wrapper_to_list(m_filter_by_event_type[etype], wrap);
+		}
+	}
+
+	m_filters.insert(wrap);
+}
+
+void evttype_index_ruleset::ruleset_filters::remove_filter(std::shared_ptr<filter_wrapper> wrap)
+{
+	if(wrap->event_codes.empty())
+	{
+		remove_wrapper_from_list(m_filter_all_event_types, wrap);
+	}
+	else
+	{
+		for(auto &etype : wrap->event_codes)
+		{
+			if( etype < m_filter_by_event_type.size() )
+			{
+				remove_wrapper_from_list(m_filter_by_event_type[etype], wrap);
+			}
+		}
+	}
+
+	m_filters.erase(wrap);
+}
+
+uint64_t evttype_index_ruleset::ruleset_filters::num_filters()
+{
+	return m_filters.size();
+}
+
+bool evttype_index_ruleset::ruleset_filters::run(sinsp_evt *evt, falco_rule& match)
+{
+    if(evt->get_type() < m_filter_by_event_type.size())
+    {
+        for(const auto &wrap : m_filter_by_event_type[evt->get_type()])
+        {
+            if(wrap->filter->run(evt))
+            {
+				match = wrap->rule;
+                return true;
+            }
+        }
+    }
+
+	// Finally, try filters that are not specific to an event type.
+	for(const auto &wrap : m_filter_all_event_types)
+	{
+		if(wrap->filter->run(evt))
+		{
+			match = wrap->rule;
 			return true;
 		}
 	}
@@ -66,15 +142,33 @@ bool evttype_index_ruleset::run_wrappers(sinsp_evt *evt,
 	return false;
 }

-bool evttype_index_ruleset::run_wrappers(sinsp_evt *evt,
-                                         filter_wrapper_list &wrappers,
-                                         uint16_t ruleset_id,
-                                         std::vector<falco_rule> &matches) {
+bool evttype_index_ruleset::ruleset_filters::run(sinsp_evt *evt, std::vector<falco_rule>& matches)
+{
 	bool match_found = false;

-	for(auto &wrap : wrappers) {
-		if(wrap->m_filter->run(evt)) {
-			matches.push_back(wrap->m_rule);
+	if(evt->get_type() < m_filter_by_event_type.size())
+	{
+		for(const auto &wrap : m_filter_by_event_type[evt->get_type()])
+		{
+			if(wrap->filter->run(evt))
+			{
+				matches.push_back(wrap->rule);
+				match_found = true;
+			}
+		}
+	}
+
+	if(match_found)
+	{
+		return true;
+	}
+
+	// Finally, try filters that are not specific to an event type.
+	for(const auto &wrap : m_filter_all_event_types)
+	{
+		if(wrap->filter->run(evt))
+		{
+			matches.push_back(wrap->rule);
 			match_found = true;
 		}
 	}
@@ -82,15 +176,234 @@ bool evttype_index_ruleset::run_wrappers(sinsp_evt *evt,
 	return match_found;
 }

-void evttype_index_ruleset::print_enabled_rules_falco_logger() {
-	falco_logger::log(falco_logger::level::DEBUG, "Enabled rules:\n");
-
-	auto logger = [](std::shared_ptr<evttype_index_wrapper> wrap) {
-		falco_logger::log(falco_logger::level::DEBUG, std::string("   ") + wrap->name() + "\n");
-	};
-
-	uint64_t num_filters = iterate(logger);
-
-	falco_logger::log(falco_logger::level::DEBUG,
-	                  "(" + std::to_string(num_filters) + ") enabled rules in total\n");
+libsinsp::events::set<ppm_sc_code> evttype_index_ruleset::ruleset_filters::sc_codes()
+{
+	libsinsp::events::set<ppm_sc_code> res;
+	for(const auto &wrap : m_filters)
+	{
+		res.insert(wrap->sc_codes.begin(), wrap->sc_codes.end());
+	}
+	return res;
+}
+
+libsinsp::events::set<ppm_event_code> evttype_index_ruleset::ruleset_filters::event_codes()
+{
+	libsinsp::events::set<ppm_event_code> res;
+	for(const auto &wrap : m_filters)
+	{
+		res.insert(wrap->event_codes.begin(), wrap->event_codes.end());
+	}
+	return res;
+}
+
+void evttype_index_ruleset::add(
+		const falco_rule& rule,
+		std::shared_ptr<sinsp_filter> filter,
+		std::shared_ptr<libsinsp::filter::ast::expr> condition)
+{
+	try
+	{
+		auto wrap = std::make_shared<filter_wrapper>();
+		wrap->rule = rule;
+		wrap->filter = filter;
+		if(rule.source == falco_common::syscall_source)
+		{
+			wrap->sc_codes = libsinsp::filter::ast::ppm_sc_codes(condition.get());
+			wrap->event_codes = libsinsp::filter::ast::ppm_event_codes(condition.get());
+		}
+		else
+		{
+			wrap->sc_codes = { };
+			wrap->event_codes = { ppm_event_code::PPME_PLUGINEVENT_E };
+		}
+		wrap->event_codes.insert(ppm_event_code::PPME_ASYNCEVENT_E);
+		m_filters.insert(wrap);
+	}
+	catch (const sinsp_exception& e)
+	{
+		throw falco_exception(std::string(e.what()));
+	}
+}
+
+void evttype_index_ruleset::on_loading_complete()
+{
+	print_enabled_rules_falco_logger();
+}
+
+void evttype_index_ruleset::print_enabled_rules_falco_logger()
+{
+	falco_logger::log(falco_logger::level::DEBUG, "Enabled rules:\n");
+	int n = 0;
+	for (const auto& ruleset_ptr : m_rulesets)
+	{
+		if (ruleset_ptr)
+		{
+			for (const auto& wrap : ruleset_ptr->get_filters())
+			{
+				n++;
+				falco_logger::log(falco_logger::level::DEBUG, std::string("   ") + wrap->rule.name + "\n");
+			}
+		}
+	}
+	falco_logger::log(falco_logger::level::DEBUG, "(" + std::to_string(n) + ") enabled rules in total\n");
+}
+
+void evttype_index_ruleset::clear()
+{
+	for (size_t i = 0; i < m_rulesets.size(); i++)
+	{
+		m_rulesets[i] = std::make_shared<ruleset_filters>();
+	}
+	m_filters.clear();
+}
+
+void evttype_index_ruleset::enable(const std::string &pattern, match_type match, uint16_t ruleset_id)
+{
+	enable_disable(pattern, match, true, ruleset_id);
+}
+
+void evttype_index_ruleset::disable(const std::string &pattern, match_type match, uint16_t ruleset_id)
+{
+	enable_disable(pattern, match, false, ruleset_id);
+}
+
+void evttype_index_ruleset::enable_disable(const std::string &pattern, match_type match, bool enabled, uint16_t ruleset_id)
+{
+	while(m_rulesets.size() < (size_t)ruleset_id + 1)
+	{
+		m_rulesets.emplace_back(std::make_shared<ruleset_filters>());
+	}
+
+	for(const auto &wrap : m_filters)
+	{
+		bool matches;
+		std::string::size_type pos;
+
+		switch(match)
+		{
+		case match_type::exact:
+			pos = wrap->rule.name.find(pattern);
+
+			matches = (pattern == "" || (pos == 0 &&
+						       pattern.size() == wrap->rule.name.size()));
+			break;
+		case match_type::substring:
+			matches = (pattern == "" || (wrap->rule.name.find(pattern) != std::string::npos));
+			break;
+		case match_type::wildcard:
+			matches = falco::utils::matches_wildcard(pattern, wrap->rule.name);
+			break;
+		default:
+			// should never happen
+			matches = false;
+		}
+
+		if(matches)
+		{
+			if(enabled)
+			{
+				m_rulesets[ruleset_id]->add_filter(wrap);
+			}
+			else
+			{
+				m_rulesets[ruleset_id]->remove_filter(wrap);
+			}
+		}
+	}
+}
+
+void evttype_index_ruleset::enable_tags(const std::set<std::string> &tags, uint16_t ruleset_id)
+{
+	enable_disable_tags(tags, true, ruleset_id);
+}
+
+void evttype_index_ruleset::disable_tags(const std::set<std::string> &tags, uint16_t ruleset_id)
+{
+	enable_disable_tags(tags, false, ruleset_id);
+}
+
+void evttype_index_ruleset::enable_disable_tags(const std::set<std::string> &tags, bool enabled, uint16_t ruleset_id)
+{
+	while(m_rulesets.size() < (size_t)ruleset_id + 1)
+	{
+		m_rulesets.emplace_back(std::make_shared<ruleset_filters>());
+	}
+
+	for(const auto &wrap : m_filters)
+	{
+		std::set<std::string> intersect;
+
+		set_intersection(tags.begin(), tags.end(),
+				 wrap->rule.tags.begin(), wrap->rule.tags.end(),
+				 inserter(intersect, intersect.begin()));
+
+		if(!intersect.empty())
+		{
+			if(enabled)
+			{
+				m_rulesets[ruleset_id]->add_filter(wrap);
+			}
+			else
+			{
+				m_rulesets[ruleset_id]->remove_filter(wrap);
+			}
+		}
+	}
+}
+
+uint64_t evttype_index_ruleset::enabled_count(uint16_t ruleset_id)
+{
+	while(m_rulesets.size() < (size_t)ruleset_id + 1)
+	{
+		m_rulesets.emplace_back(std::make_shared<ruleset_filters>());
+	}
+
+	return m_rulesets[ruleset_id]->num_filters();
+}
+
+bool evttype_index_ruleset::run(sinsp_evt *evt, falco_rule& match, uint16_t ruleset_id)
+{
+	if(m_rulesets.size() < (size_t)ruleset_id + 1)
+	{
+		return false;
+	}
+
+	return m_rulesets[ruleset_id]->run(evt, match);
+}
+
+bool evttype_index_ruleset::run(sinsp_evt *evt, std::vector<falco_rule>& matches, uint16_t ruleset_id)
+{
+	if(m_rulesets.size() < (size_t)ruleset_id + 1)
+	{
+		return false;
+	}
+
+	return m_rulesets[ruleset_id]->run(evt, matches);
+}
+
+void evttype_index_ruleset::enabled_evttypes(std::set<uint16_t> &evttypes, uint16_t ruleset_id)
+{
+	evttypes.clear();
+	for (const auto& e : enabled_event_codes(ruleset_id))
+	{
+		evttypes.insert((uint16_t) e);
+	}
+}
+
+libsinsp::events::set<ppm_sc_code> evttype_index_ruleset::enabled_sc_codes(uint16_t ruleset)
+{
+	if(m_rulesets.size() < (size_t)ruleset + 1)
+	{
+		return {};
+	}
+	return m_rulesets[ruleset]->sc_codes();
+}
+
+libsinsp::events::set<ppm_event_code> evttype_index_ruleset::enabled_event_codes(uint16_t ruleset)
+{
+	if(m_rulesets.size() < (size_t)ruleset + 1)
+	{
+		return {};
+	}
+	return m_rulesets[ruleset]->event_codes();
 }
--- a/userspace/engine/evttype_index_ruleset.h
+++ b/userspace/engine/evttype_index_ruleset.h
@@ -17,65 +17,162 @@ limitations under the License.

 #pragma once

-#include "indexable_ruleset.h"
-
 #include <string>
 #include <set>
 #include <vector>
+#include <list>
+#include <map>
+
+#include "filter_ruleset.h"
+#include <libsinsp/sinsp.h>
+#include <libsinsp/filter.h>
+#include <libsinsp/event.h>

 /*!
-    \brief A filter_ruleset that indexes enabled rules by event type,
-    and performs linear search on each event type bucket
+	\brief A filter_ruleset that indexes enabled rules by event type,
+	and performs linear search on each event type bucket
 */
-
-struct evttype_index_wrapper {
-	const std::string &name() { return m_rule.name; }
-	const std::set<std::string> &tags() { return m_rule.tags; }
-	const libsinsp::events::set<ppm_sc_code> &sc_codes() { return m_sc_codes; }
-	const libsinsp::events::set<ppm_event_code> &event_codes() { return m_event_codes; }
-
-	falco_rule m_rule;
-	libsinsp::events::set<ppm_sc_code> m_sc_codes;
-	libsinsp::events::set<ppm_event_code> m_event_codes;
-	std::shared_ptr<sinsp_filter> m_filter;
-};
-
-class evttype_index_ruleset : public indexable_ruleset<evttype_index_wrapper> {
+class evttype_index_ruleset: public filter_ruleset
+{
 public:
 	explicit evttype_index_ruleset(std::shared_ptr<sinsp_filter_factory> factory);
 	virtual ~evttype_index_ruleset();

-	// From filter_ruleset
-	void add(const falco_rule &rule,
-	         std::shared_ptr<sinsp_filter> filter,
-	         std::shared_ptr<libsinsp::filter::ast::expr> condition) override;
+	void add(
+		const falco_rule& rule,
+		std::shared_ptr<sinsp_filter> filter,
+		std::shared_ptr<libsinsp::filter::ast::expr> condition) override;
+
+	void clear() override;
+
+	bool run(sinsp_evt *evt, falco_rule& match, uint16_t ruleset_id) override;
+	bool run(sinsp_evt *evt, std::vector<falco_rule>&matches, uint16_t ruleset_id) override;
+
+	uint64_t enabled_count(uint16_t ruleset_id) override;

 	void on_loading_complete() override;

-	// From indexable_ruleset
-	bool run_wrappers(sinsp_evt *evt,
-	                  filter_wrapper_list &wrappers,
-	                  uint16_t ruleset_id,
-	                  falco_rule &match) override;
-	bool run_wrappers(sinsp_evt *evt,
-	                  filter_wrapper_list &wrappers,
-	                  uint16_t ruleset_id,
-	                  std::vector<falco_rule> &matches) override;
-
 	// Print each enabled rule when running Falco with falco logger
 	// log_level=debug; invoked within on_loading_complete()
 	void print_enabled_rules_falco_logger();

+	void enable(
+		const std::string &pattern,
+		match_type match,
+		uint16_t rulset_id) override;
+
+	void disable(
+		const std::string &pattern,
+		match_type match,
+		uint16_t rulset_id) override;
+
+	void enable_tags(
+		const std::set<std::string> &tags,
+		uint16_t rulset_id) override;
+
+	void disable_tags(
+		const std::set<std::string> &tags,
+		uint16_t rulset_id) override;
+
+	// note(jasondellaluce): this is deprecated, must use the new
+	// typing-improved `enabled_event_codes` and `enabled_sc_codes` instead
+	// todo(jasondellaluce): remove this in future code refactors
+	void enabled_evttypes(
+		std::set<uint16_t> &evttypes,
+		uint16_t ruleset) override;
+
+	libsinsp::events::set<ppm_sc_code> enabled_sc_codes(uint16_t ruleset) override;
+
+	libsinsp::events::set<ppm_event_code> enabled_event_codes(uint16_t ruleset) override;
+
 private:
+
+	// Helper used by enable()/disable()
+	void enable_disable(
+		const std::string &pattern,
+		match_type match,
+		bool enabled,
+		uint16_t rulset_id);
+
+	// Helper used by enable_tags()/disable_tags()
+	void enable_disable_tags(
+		const std::set<std::string> &tags,
+		bool enabled,
+		uint16_t rulset_id);
+
+	struct filter_wrapper
+	{
+		falco_rule rule;
+		libsinsp::events::set<ppm_sc_code> sc_codes;
+		libsinsp::events::set<ppm_event_code> event_codes;
+		std::shared_ptr<sinsp_filter> filter;
+	};
+
+	typedef std::list<std::shared_ptr<filter_wrapper>> filter_wrapper_list;
+
+	// A group of filters all having the same ruleset
+	class ruleset_filters {
+	public:
+		ruleset_filters();
+
+		virtual ~ruleset_filters();
+
+		void add_filter(std::shared_ptr<filter_wrapper> wrap);
+		void remove_filter(std::shared_ptr<filter_wrapper> wrap);
+
+		uint64_t num_filters();
+
+		inline const std::set<std::shared_ptr<filter_wrapper>>& get_filters() const
+		{
+			return m_filters;
+		}
+
+		// Evaluate an event against the ruleset and return the first rule
+		// that matched.
+		bool run(sinsp_evt *evt, falco_rule& match);
+
+		//  Evaluate an event against the ruleset and return all the
+		//	matching rules.
+		bool run(sinsp_evt *evt, std::vector<falco_rule>& matches);
+
+		libsinsp::events::set<ppm_sc_code> sc_codes();
+
+		libsinsp::events::set<ppm_event_code> event_codes();
+
+	private:
+		void add_wrapper_to_list(filter_wrapper_list &wrappers, std::shared_ptr<filter_wrapper> wrap);
+		void remove_wrapper_from_list(filter_wrapper_list &wrappers, std::shared_ptr<filter_wrapper> wrap);
+
+		// Vector indexes from event type to a set of filters. There can
+		// be multiple filters for a given event type.
+		// NOTE: This is used only when the event sub-type is 0.
+		std::vector<filter_wrapper_list> m_filter_by_event_type;
+
+		filter_wrapper_list m_filter_all_event_types;
+
+		// All filters added. Used to make num_filters() fast.
+		std::set<std::shared_ptr<filter_wrapper>> m_filters;
+	};
+
+	// Vector indexes from ruleset id to set of rules.
+	std::vector<std::shared_ptr<ruleset_filters>> m_rulesets;
+
+	// All filters added. The set of enabled filters is held in m_rulesets
+	std::set<std::shared_ptr<filter_wrapper>> m_filters;
+
 	std::shared_ptr<sinsp_filter_factory> m_filter_factory;
+	std::vector<std::string> m_ruleset_names;
 };

-class evttype_index_ruleset_factory : public filter_ruleset_factory {
+class evttype_index_ruleset_factory: public filter_ruleset_factory
+{
 public:
-	inline explicit evttype_index_ruleset_factory(std::shared_ptr<sinsp_filter_factory> factory):
-	        m_filter_factory(factory) {}
+	inline explicit evttype_index_ruleset_factory(
+		std::shared_ptr<sinsp_filter_factory> factory
+	): m_filter_factory(factory) { }

-	inline std::shared_ptr<filter_ruleset> new_ruleset() override {
+	inline std::shared_ptr<filter_ruleset> new_ruleset() override
+	{
 		return std::make_shared<evttype_index_ruleset>(m_filter_factory);
 	}

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gianmatteo Palmieri	2820cd1d07	new(metrics): enable plugins metrics Signed-off-by: Gianmatteo Palmieri <mail@gian.im> Co-authored-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-06-17 11:54:00 +02:00
Luca Guerra	ee26667e89	update(engine): allow using -p to pass a format to plugin events Signed-off-by: Luca Guerra <luca@guerra.sh>	2024-06-17 11:54:00 +02:00
Luca Guerra	f267404be9	cleanup(falco): clarify that --print variants only affect syscalls Signed-off-by: Luca Guerra <luca@guerra.sh>	2024-06-17 11:54:00 +02:00
Gianmatteo Palmieri	160e35e801	Revert "fix(engine): apply output substitutions for all sources" This reverts commit `4ef7c9553a`. Signed-off-by: Gianmatteo Palmieri <mail@gian.im>	2024-06-17 11:54:00 +02:00
Melissa Kilby	2117f3031d	fix(metrics): fix sha256 metric names for prometheus Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-06-17 11:54:00 +02:00
Melissa Kilby	fa905e1356	fix(metrics): allow each metric output channel to be selected independently Signed-off-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-06-17 11:54:00 +02:00
Federico Di Pierro	f265e18d96	chore(userspace/falco): more extra safety checks on stats collector too. Signed-off-by: Federico Di Pierro <nierro92@gmail.com> Co-authored-by: Melissa Kilby <melissa.kilby.oss@gmail.com>	2024-06-17 11:54:00 +02:00
Federico Di Pierro	6643c7491f	fix(userspace/falco): fixed `falco_metrics::to_text` implementation when running with plugins. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-06-17 11:54:00 +02:00
Federico Di Pierro	cb5b075b0e	update(cmake): bump libs to 0.17.2 Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-06-17 11:54:00 +02:00
Luca Guerra	fc921d1bda	update(docs): update CHANGELOG for 0.38.0 Signed-off-by: Luca Guerra <luca@guerra.sh>	2024-05-30 09:59:54 +02:00
Federico Di Pierro	576f3164d8	update(cmake): bump libs to 0.17.1. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-05-29 15:05:50 +02:00
Federico Di Pierro	11ad96bdd7	chore(proposals): fix typo. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-05-28 15:33:47 +02:00
Federico Di Pierro	718e3e8876	update(cmake): bump falcoctl to v0.8.0. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-05-28 15:33:47 +02:00
Luca Guerra	fdd093b817	chore(build): bump rules to 3.1.0 Signed-off-by: Luca Guerra <luca@guerra.sh>	2024-05-28 15:33:47 +02:00
dependabot[bot]	dbc3765aef	--- updated-dependencies: - dependency-name: submodules/falcosecurity-rules dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-28 15:33:47 +02:00
Jason Dellaluce	d7cbf9c7c9	refactor(userspace): move falco logger under falco engine Signed-off-by: Jason Dellaluce <jasondellaluce@gmail.com>	2024-05-28 15:33:47 +02:00
Federico Di Pierro	7fc186ac81	update(cmake): bumped libs to 0.17.0 and driver to 7.2.0+driver. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-05-27 10:09:43 +02:00
Federico Di Pierro	951310878c	update(cmake): bump libs to 0.17.0-rc2. Signed-off-by: Federico Di Pierro <nierro92@gmail.com>	2024-05-22 10:14:19 +02:00
Luca Guerra	7a4ee0d768	chore(gha): update cosign Signed-off-by: Luca Guerra <luca@guerra.sh>	2024-05-21 12:14:13 +02:00
dependabot[bot]	6948b2f5c0	build(deps): Bump submodules/falcosecurity-rules Bumps [submodules/falcosecurity-rules](https://github.com/falcosecurity/rules) from `29c41c4` to `59bf03b`. - [Release notes](https://github.com/falcosecurity/rules/releases) - [Commits](`29c41c4eed...59bf03bf74`) --- updated-dependencies: - dependency-name: submodules/falcosecurity-rules dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2024-05-21 12:14:13 +02:00