chore(userspace/falco): correct comment

Co-authored-by: Andrea Terzolo <andrea.terzolo@polito.it> Signed-off-by: Leonardo Grasso <me@leonardograsso.com>
chore: cleanup Mesos references
2026-03-21 20:22:11 +00:00 · 2022-08-09 13:15:43 +02:00 · 2022-08-09 11:18:36 +02:00 · 2022-08-09 11:15:35 +02:00 · 2022-08-09 11:13:27 +02:00 · 2022-08-09 11:12:30 +02:00
129 changed files with 2670 additions and 5927 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,7 +67,7 @@ jobs:
          command: |
            mkdir -p /build-static/release
            cd /build-static/release
-            cmake -DCPACK_GENERATOR=TGZ -DBUILD_BPF=Off -DBUILD_DRIVER=Off -DCMAKE_BUILD_TYPE=Release -DUSE_BUNDLED_DEPS=On -DUSE_BUNDLED_LIBELF=Off -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco /source-static/falco
+            cmake -DCPACK_GENERATOR=TGZ -DBUILD_BPF=Off -DBUILD_DRIVER=Off -DCMAKE_BUILD_TYPE=Release -DUSE_BUNDLED_DEPS=On -DMUSL_OPTIMIZED_BUILD=On -DFALCO_ETC_DIR=/etc/falco /source-static/falco
      - run:
          name: Build
          command: |
@@ -360,7 +360,7 @@ jobs:
          name: Build and publish falco-driver-loader-dev
          command: |
            cd /source/falco
-            docker buildx build --push --build-arg FALCO_IMAGE_TAG=x86_64-master \
+            docker buildx build --push --build-arg FALCO_IMAGE_TAG=master \
              -t falcosecurity/falco-driver-loader:x86_64-master \
              -t public.ecr.aws/falcosecurity/falco-driver-loader:x86_64-master \
              docker/driver-loader
@@ -409,7 +409,7 @@ jobs:
          name: Build and publish falco-driver-loader-dev
          command: |
            cd /tmp/source-arm64/falco
-            docker buildx build --push --build-arg FALCO_IMAGE_TAG=aarch64-master \
+            docker buildx build --push --build-arg FALCO_IMAGE_TAG=master \
              -t falcosecurity/falco-driver-loader:aarch64-master \
              -t public.ecr.aws/falcosecurity/falco-driver-loader:aarch64-master \
              docker/driver-loader
@@ -555,7 +555,7 @@ jobs:
          name: Build and publish no-driver
          command: |
            cd /source/falco
-            docker buildx build --push --build-arg VERSION_BUCKET=bin --build-arg FALCO_VERSION=${CIRCLE_TAG} \
+            docker buildx build --push --build-arg VERSION_BUCKET=bin-dev --build-arg FALCO_VERSION=${CIRCLE_TAG} \
              -t "falcosecurity/falco-no-driver:x86_64-${CIRCLE_TAG}" \
              -t falcosecurity/falco-no-driver:x86_64-latest \
              -t "falcosecurity/falco:x86_64-${CIRCLE_TAG}-slim" \
@@ -569,7 +569,7 @@ jobs:
          name: Build and publish falco
          command: |
            cd /source/falco
-            docker buildx build --push --build-arg VERSION_BUCKET=deb --build-arg FALCO_VERSION=${CIRCLE_TAG} \
+            docker buildx build --push --build-arg VERSION_BUCKET=deb-dev --build-arg FALCO_VERSION=${CIRCLE_TAG} \
              -t "falcosecurity/falco:x86_64-${CIRCLE_TAG}" \
              -t "falcosecurity/falco:x86_64-latest" \
              -t "public.ecr.aws/falcosecurity/falco:x86_64-${CIRCLE_TAG}" \
@@ -579,7 +579,7 @@ jobs:
          name: Build and publish falco-driver-loader
          command: |
            cd /source/falco
-            docker buildx build --push --build-arg FALCO_IMAGE_TAG=x86_64-${CIRCLE_TAG} \
+            docker buildx build --push --build-arg FALCO_IMAGE_TAG=${CIRCLE_TAG} \
              -t "falcosecurity/falco-driver-loader:x86_64-${CIRCLE_TAG}" \
              -t "falcosecurity/falco-driver-loader:x86_64-latest" \
              -t "public.ecr.aws/falcosecurity/falco-driver-loader:x86_64-${CIRCLE_TAG}" \
@@ -624,7 +624,7 @@ jobs:
          name: Build and publish falco
          command: |
            cd /tmp/source-arm64/falco
-            docker buildx build --push --build-arg VERSION_BUCKET=deb --build-arg FALCO_VERSION=${CIRCLE_TAG} \
+            docker buildx build --push --build-arg VERSION_BUCKET=deb-dev --build-arg FALCO_VERSION=${CIRCLE_TAG} \
              -t "falcosecurity/falco:aarch64-${CIRCLE_TAG}" \
              -t "falcosecurity/falco:aarch64-latest" \
              -t "public.ecr.aws/falcosecurity/falco:aarch64-${CIRCLE_TAG}" \
@@ -634,7 +634,7 @@ jobs:
          name: Build and publish falco-driver-loader
          command: |
            cd /tmp/source-arm64/falco
-            docker buildx build --push --build-arg FALCO_IMAGE_TAG=aarch64-${CIRCLE_TAG} \
+            docker buildx build --push --build-arg FALCO_IMAGE_TAG=${CIRCLE_TAG} \
              -t "falcosecurity/falco-driver-loader:aarch64-${CIRCLE_TAG}" \
              -t "falcosecurity/falco-driver-loader:aarch64-latest" \
              -t "public.ecr.aws/falcosecurity/falco-driver-loader:aarch64-${CIRCLE_TAG}" \
@@ -754,7 +754,6 @@ workflows:
      - "build-musl"
      - "build-arm64"
      - "build-centos7"
-      - "quality-static-analysis"
      - "tests-integration":
          requires:
            - "build-centos7"
--- a/.codespellignore
+++ b/.codespellignore
@@ -1,4 +1,3 @@
 aks
 creat
 chage
-ro
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,8 +22,6 @@

 > /kind feature

-> /kind release
-
 > If contributing rules or changes to rules, please make sure to also uncomment one of the following line:

 > /kind rule-update
@@ -48,8 +46,6 @@ Please remove the leading whitespace before the `/kind <>` you uncommented.

 > /area proposals

-> /area CI
-
 <!--
 Please remove the leading whitespace before the `/area <>` you uncommented.
 -->
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -1,75 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "master" ]
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-20.04
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        
-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    - name: Update base image
-      run: sudo apt update -y
-
-    - name: Install build dependencies
-      run: sudo DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libc-ares-dev libprotobuf-dev protobuf-compiler libjq-dev libyaml-cpp-dev libgrpc++-dev protobuf-compiler-grpc rpm libelf-dev cmake build-essential libcurl4-openssl-dev linux-headers-$(uname -r) clang llvm git -y
-
-    - name: Prepare project
-      run: |
-          mkdir build
-          pushd build
-          cmake -DBUILD_BPF=On ..
-          popd
-
-    - name: Build
-      run: |
-          pushd build
-          KERNELDIR=/lib/modules/$(uname -r)/build make -j4 all
-          popd
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -11,4 +11,4 @@ jobs:
        skip: .git
        ignore_words_file: .codespellignore
        check_filenames: true
-        check_hidden: false
+        check_hidden: true
--- a/ADOPTERS.md
+++ b/ADOPTERS.md
@@ -39,7 +39,7 @@ This is a list of production adopters of Falco (in alphabetical order):
 * [Logz.io](https://logz.io/) - Logz.io is a cloud observability platform for modern engineering teams. The Logz.io platform consists of three products — Log Management, Infrastructure Monitoring, and Cloud SIEM — that work together to unify the jobs of monitoring, troubleshooting, and security. We empower engineers to deliver better software by offering the world's most popular open source observability tools — the ELK Stack, Grafana, and Jaeger — in a single, easy to use, and powerful platform purpose-built for monitoring distributed cloud environments. Cloud SIEM supports data from multiple sources, including Falco's alerts, and offers useful rules and dashboards content to visualize and manage incidents across your systems in a unified UI.
  * https://logz.io/blog/k8s-security-with-falco-and-cloud-siem/

-* [MathWorks](https://mathworks.com) - MathWorks develops mathematical computing software for engineers and scientists. MathWorks uses Falco for Kubernetes threat detection, unexpected application behavior, and maps Falco rules to their cloud infrastructure's security kill chain model. MathWorks presented their Falco use case at [KubeCon + CloudNativeCon North America 2020](https://www.youtube.com/watch?v=L-5RYBTV010).
+* [MathWorks](https://mathworks.com) - MathWorks develops mathematical computing software for engineers and scientists. MathWorks uses Falco for Kubernetes threat detection, unexpected application behavior, and maps Falco rules to their cloud infrastructure's security kill chain model. MathWorks presented their Falco use case at [KubeCon + CloudNativeCon North America 2020](https://www.youtube.com/watch?v=L-5RYBTV010).  

 * [Pocteo](https://pocteo.co) - Pocteo helps with Kubernetes adoption in enterprises by providing a variety of services such as training, consulting, auditing and mentoring. We build CI/CD pipelines the GitOps way, as well as design and run k8s clusters. Pocteo uses Falco as a runtime monitoring system to secure clients' workloads against suspicious behavior and ensure k8s pods immutability. We also use Falco to collect, process and act on security events through a response engine and serverless functions.

@@ -70,16 +70,12 @@ This is a list of production adopters of Falco (in alphabetical order):

 * [Sysdig](https://www.sysdig.com/) Sysdig originally created Falco in 2016 to detect unexpected or suspicious activity using a rules engine on top of the data that comes from the sysdig kernel system call driver. Sysdig provides tooling to help with vulnerability management, compliance, detection, incident response and forensics in Cloud-native environments. Sysdig Secure has extended Falco to include: a rule library, the ability to update macros, lists & rules via the user interface and API, automated tuning of rules, and rule creation based on profiling known system behavior. On top of the basic Falco rules, Sysdig Secure implements the concept of a "Security policy" that can comprise several rules which are evaluated for a user-defined infrastructure scope like Kubernetes namespaces, OpenShift clusters, deployment workload, cloud regions etc.

-* [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.
-
 ## Projects that use Falco libs

 * [R6/Phoenix](https://r6security.com/) is an attack surface protection company that uses moving target defense to provide fully automated, proactive and devops friendly security to its customers. There are a set of policies you can add to enable the moving target defense capabilities. Some of them are triggered by a combination of Falco's findings. You can kill, restart and rename pods according to the ever changing policies.

 * [SysFlow](https://sysflow.io) SysFlow is a cloud-native system telemetry framework that focuses on data abstraction, behavioral analytics, and noise reduction. At its core, SysFlow exposes a compact open telemetry format that records workload behaviors by connecting event and flow representations of process control flows, file interactions, and network communications. The resulting abstraction encodes a graph structure that enables provenance reasoning on host and container environments, and fast retrieval of security-relevant information.

-* [StackRox](https://stackrox.io) is the industry’s first Kubernetes-native security platform enabling organizations to build, deploy, and run cloud-native applications securely. The platform works with Kubernetes environments and integrates with DevOps and security tools, enabling teams to operationalize and secure their supply chain, infrastructure, and workloads. StackRox aims to harness containerized applications’ development speed while giving operations and security teams greater context and risk profiling. StackRox leverages cloud-native principles and declarative artifacts to automate DevSecOps best practices.
-
 ## Adding a name

 If you would like to add your name to this file, submit a pull request with your change.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,168 +1,5 @@
 # Change Log

-## v0.33.1
-
-Released on 2022-11-24
-
-### Minor Changes
-
-* update(falco): fix container-gvisor and kubernetes-gvisor print options [[#2288](https://github.com/falcosecurity/falco/pull/2288)]
-* Update libs to 0.9.2, fixing potential CLBO on gVisor+Kubernetes and crash with eBPF when some CPUs are offline [[#2299](https://github.com/falcosecurity/falco/pull/2299)] - [@LucaGuerra](https://github.com/LucaGuerra)
-
-## v0.33.0
-
-Released on 2022-10-19
-
-### Major Changes
-
-
-* new: add a `drop_pct` referred to the global number of events [[#2130](https://github.com/falcosecurity/falco/pull/2130)] - [@Andreagit97](https://github.com/Andreagit97)
-* new: print some info about eBPF and enabled sources when Falco starts [[#2133](https://github.com/falcosecurity/falco/pull/2133)] - [@Andreagit97](https://github.com/Andreagit97)
-* new(userspace): print architecture information [[#2147](https://github.com/falcosecurity/falco/pull/2147)] - [@Andreagit97](https://github.com/Andreagit97)
-* new(CI): add CodeQL security scanning to Falco. [[#2171](https://github.com/falcosecurity/falco/pull/2171)] - [@Andreagit97](https://github.com/Andreagit97)
-* new: configure syscall buffer dimension from Falco [[#2214](https://github.com/falcosecurity/falco/pull/2214)] - [@Andreagit97](https://github.com/Andreagit97)
-* new(cmdline): add development support for modern BPF probe [[#2221](https://github.com/falcosecurity/falco/pull/2221)] - [@Andreagit97](https://github.com/Andreagit97)
-* new(falco-driver-loader): `DRIVERS_REPO` now supports the use of multiple download URLs (comma separated) [[#2165](https://github.com/falcosecurity/falco/pull/2165)] - [@IanRobertson-wpe](https://github.com/IanRobertson-wpe)
-* new(userspace/engine): support alternative plugin version requirements in checks [[#2190](https://github.com/falcosecurity/falco/pull/2190)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* new: support running multiple event sources in parallel [[#2182](https://github.com/falcosecurity/falco/pull/2182)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* new(userspace/falco): automatically create paths for grpc unix socket and gvisor endpoint. [[#2189](https://github.com/falcosecurity/falco/pull/2189)] - [@FedeDP](https://github.com/FedeDP)
-* new(scripts): allow falco-driver-loader to properly distinguish any ubuntu flavor [[#2178](https://github.com/falcosecurity/falco/pull/2178)] - [@FedeDP](https://github.com/FedeDP)
-* new: add option to enable event sources selectively [[#2085](https://github.com/falcosecurity/falco/pull/2085)] - [@jasondellaluce](https://github.com/jasondellaluce)
-
-
-### Minor Changes
-
-* docs(falco-driver-loader): add some comments in `falco-driver-loader` [[#2153](https://github.com/falcosecurity/falco/pull/2153)] - [@Andreagit97](https://github.com/Andreagit97)
-* update(cmake): use latest libs tag `0.9.0` [[#2257](https://github.com/falcosecurity/falco/pull/2257)] - [@Andreagit97](https://github.com/Andreagit97)
-* update(.circleci): re-enabled cppcheck [[#2186](https://github.com/falcosecurity/falco/pull/2186)] - [@leogr](https://github.com/leogr)
-* update(userspace/engine): improve falco files loading performance [[#2151](https://github.com/falcosecurity/falco/pull/2151)] - [@VadimZy](https://github.com/VadimZy)
-* update(cmake): use latest driver tag 3.0.1+driver [[#2251](https://github.com/falcosecurity/falco/pull/2251)] - [@Andreagit97](https://github.com/Andreagit97)
-* update(userspace/falco)!: adapt stats writer for multiple parallel event sources [[#2182](https://github.com/falcosecurity/falco/pull/2182)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* refactor(userspace/engine): remove falco engine APIs that returned a required_engine_version [[#2096](https://github.com/falcosecurity/falco/pull/2096)] - [@mstemm](https://github.com/mstemm)
-* update(userspace/engine): add some small changes to rules matching that reduce cpu usage with high event volumes (> 1M syscalls/sec) [[#2210](https://github.com/falcosecurity/falco/pull/2210)] - [@mstemm](https://github.com/mstemm)
-* rules: added process IDs to default rules [[#2211](https://github.com/falcosecurity/falco/pull/2211)] - [@spyder-kyle](https://github.com/spyder-kyle)
-* update(scripts/debian): falco.service systemd unit is now cleaned-up during (re)install and removal via the DEB and RPM packages [[#2138](https://github.com/falcosecurity/falco/pull/2138)] - [@Happy-Dude](https://github.com/Happy-Dude)
-* update(userspace/falco): move on from deprecated libs API for printing event list [[#2253](https://github.com/falcosecurity/falco/pull/2253)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* chore(userspace/falco): improve cli helper and log options with debug level [[#2252](https://github.com/falcosecurity/falco/pull/2252)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* update(userspace): minor pre-release improvements [[#2236](https://github.com/falcosecurity/falco/pull/2236)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* update: bumped libs to fd46dd139a8e35692a7d40ab2f0ed2016df827cf. [[#2201](https://github.com/falcosecurity/falco/pull/2201)] - [@FedeDP](https://github.com/FedeDP)
-* update!: gVisor sock default path changed from `/tmp/gvisor.sock` to `/run/falco/gvisor.sock`  [[#2163](https://github.com/falcosecurity/falco/pull/2163)] - [@vjjmiras](https://github.com/vjjmiras)
-* update!: gRPC server sock default path changed from `/run/falco.sock.sock` to `/run/falco/falco.sock` [[#2163](https://github.com/falcosecurity/falco/pull/2163)] - [@vjjmiras](https://github.com/vjjmiras)
-* update(scripts/falco-driver-loader): minikube environment is now correctly detected [[#2191](https://github.com/falcosecurity/falco/pull/2191)] - [@alacuku](https://github.com/alacuku)
-* update(rules/falco_rules.yaml): `required_engine_version` changed to 13 [[#2179](https://github.com/falcosecurity/falco/pull/2179)] - [@incertum](https://github.com/incertum)
-* refactor(userspace/falco): re-design stats writer and make it thread-safe [[#2109](https://github.com/falcosecurity/falco/pull/2109)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* refactor(userspace/falco): make signal handlers thread safe [[#2091](https://github.com/falcosecurity/falco/pull/2091)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* refactor(userspace/engine): strengthen and document thread-safety guarantees of falco_engine::process_event [[#2082](https://github.com/falcosecurity/falco/pull/2082)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* update(userspace/falco): make webserver threadiness configurable [[#2090](https://github.com/falcosecurity/falco/pull/2090)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* refactor(userspace/falco): reduce app actions dependency on app state and inspector [[#2097](https://github.com/falcosecurity/falco/pull/2097)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* update(userspace/falco): use move semantics in falco logger [[#2095](https://github.com/falcosecurity/falco/pull/2095)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* update: use `FALCO_HOSTNAME` env var to override the hostname value [[#2174](https://github.com/falcosecurity/falco/pull/2174)] - [@leogr](https://github.com/leogr)
-* update: bump libs and driver versions to 6599e2efebce30a95f27739d655d53f0d5f686e4 [[#2177](https://github.com/falcosecurity/falco/pull/2177)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* refactor(userspace/falco): make output rate limiter optional and output engine explicitly thread-safe [[#2139](https://github.com/falcosecurity/falco/pull/2139)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* update(falco.yaml)!: notification rate limiter disabled by default. [[#2139](https://github.com/falcosecurity/falco/pull/2139)] - [@jasondellaluce](https://github.com/jasondellaluce)
-
-
-### Bug Fixes
-
-* fix: compute the `drop ratio` in the right way [[#2128](https://github.com/falcosecurity/falco/pull/2128)] - [@Andreagit97](https://github.com/Andreagit97)
-* fix(falco_service): falco service needs to write under /sys/module/falco [[#2238](https://github.com/falcosecurity/falco/pull/2238)] - [@Andreagit97](https://github.com/Andreagit97)
-* fix(userspace): cleanup output of ruleset validation result [[#2248](https://github.com/falcosecurity/falco/pull/2248)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(userspace): properly print ignored syscalls messages when not in `-A` mode [[#2243](https://github.com/falcosecurity/falco/pull/2243)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(falco): clarify pid/tid and container info in gvisor [[#2223](https://github.com/falcosecurity/falco/pull/2223)] - [@LucaGuerra](https://github.com/LucaGuerra)
-* fix(userspace/engine): avoid reading duplicate exception values [[#2200](https://github.com/falcosecurity/falco/pull/2200)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix: hostname was not present when `json_output: true` [[#2174](https://github.com/falcosecurity/falco/pull/2174)] - [@leogr](https://github.com/leogr)
-
-
-### Rule Changes
-
-* rule(macro: known_gke_mount_in_privileged_containers): add new macro [[#2198](https://github.com/falcosecurity/falco/pull/2198)] - [@hi120ki](https://github.com/hi120ki)
-* rule(Mount Launched in Privileged Container): add GKE default pod into allowlist in Mount Launched of Privileged Container rule [[#2198](https://github.com/falcosecurity/falco/pull/2198)] - [@hi120ki](https://github.com/hi120ki)
-* rule(list: known_binaries_to_read_environment_variables_from_proc_files): add new list [[#2193](https://github.com/falcosecurity/falco/pull/2193)] - [@hi120ki](https://github.com/hi120ki)
-* rule(Read environment variable from /proc files): add rule to detect an attempt to read process environment variables from /proc files [[#2193](https://github.com/falcosecurity/falco/pull/2193)] - [@hi120ki](https://github.com/hi120ki)
-* rule(macro: k8s_containers): add falco no-driver images [[#2234](https://github.com/falcosecurity/falco/pull/2234)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* rule(macro: open_file_failed): add new macro [[#2118](https://github.com/falcosecurity/falco/pull/2118)] - [@incertum](https://github.com/incertum)
-* rule(macro: directory_traversal): add new macro [[#2118](https://github.com/falcosecurity/falco/pull/2118)] - [@incertum](https://github.com/incertum)
-* rule(Directory traversal monitored file read): add new rule [[#2118](https://github.com/falcosecurity/falco/pull/2118)] - [@incertum](https://github.com/incertum)
-* rule(Modify Container Entrypoint): new rule created to detect CVE-2019-5736 [[#2188](https://github.com/falcosecurity/falco/pull/2188)] - [@darryk10](https://github.com/darryk10)
-* rule(Program run with disallowed http proxy env)!: disabled by default [[#2179](https://github.com/falcosecurity/falco/pull/2179)] - [@incertum](https://github.com/incertum)
-* rule(Container Drift Detected (chmod))!: disabled by default [[#2179](https://github.com/falcosecurity/falco/pull/2179)] - [@incertum](https://github.com/incertum)
-* rule(Container Drift Detected (open+create))!: disabled by default [[#2179](https://github.com/falcosecurity/falco/pull/2179)] - [@incertum](https://github.com/incertum)
-* rule(Packet socket created in container)!: removed consider_packet_socket_communication macro [[#2179](https://github.com/falcosecurity/falco/pull/2179)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_packet_socket_communication)!: remove unused macro [[#2179](https://github.com/falcosecurity/falco/pull/2179)] - [@incertum](https://github.com/incertum)
-* rule(Interpreted procs outbound network activity)!: disabled by default [[#2166](https://github.com/falcosecurity/falco/pull/2166)] - [@incertum](https://github.com/incertum)
-* rule(Interpreted procs inbound network activity)!: disabled by default [[#2166](https://github.com/falcosecurity/falco/pull/2166)] - [@incertum](https://github.com/incertum)
-* rule(Contact cloud metadata service from container)!: disabled by default [[#2166](https://github.com/falcosecurity/falco/pull/2166)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_interpreted_outbound)!: remove unused macro [[#2166](https://github.com/falcosecurity/falco/pull/2166)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_interpreted_inbound)!: remove unused macro [[#2166](https://github.com/falcosecurity/falco/pull/2166)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_metadata_access)!: remove unused macro [[#2166](https://github.com/falcosecurity/falco/pull/2166)] - [@incertum](https://github.com/incertum)
-* rule(Unexpected outbound connection destination)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Unexpected inbound connection source)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Read Shell Configuration File)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Schedule Cron Jobs)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Launch Suspicious Network Tool on Host)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Create Hidden Files or Directories)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Outbound or Inbound Traffic not to Authorized Server Process and Port)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Network Connection outside Local Subnet)!: disabled by default [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_all_outbound_conns)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_all_inbound_conns)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_shell_config_reads)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_all_cron_jobs)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_all_inbound_conns)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_hidden_file_creation)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: allowed_port)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: enabled_rule_network_only_subnet)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_userfaultfd_activities)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(macro: consider_all_chmods)!: remove unused macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Set Setuid or Setgid bit)!: removed consider_all_chmods macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Container Drift Detected (chmod))!: removed consider_all_chmods macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-* rule(Unprivileged Delegation of Page Faults Handling to a Userspace Process)!: removed consider_userfaultfd_activities macro [[#2168](https://github.com/falcosecurity/falco/pull/2168)] - [@incertum](https://github.com/incertum)
-
-
-### Non user-facing changes
-
-* new(userspace): support `SCAP_FILTERED_EVENT` return code [[#2148](https://github.com/falcosecurity/falco/pull/2148)] - [@Andreagit97](https://github.com/Andreagit97)
-* chore(test/utils): remove unused script [[#2157](https://github.com/falcosecurity/falco/pull/2157)] - [@Andreagit97](https://github.com/Andreagit97)
-* Enrich pull request template [[#2162](https://github.com/falcosecurity/falco/pull/2162)] - [@Andreagit97](https://github.com/Andreagit97)
-* vote: update(OWNERS): add Andrea Terzolo to owners [[#2185](https://github.com/falcosecurity/falco/pull/2185)] - [@Andreagit97](https://github.com/Andreagit97)
-* fix(CI): codespell should ignore `ro` word [[#2173](https://github.com/falcosecurity/falco/pull/2173)] - [@Andreagit97](https://github.com/Andreagit97)
-* chore: bump plugin version [[#2256](https://github.com/falcosecurity/falco/pull/2256)] - [@Andreagit97](https://github.com/Andreagit97)
-* fix(userspace/falco): avoid using CPU when main thread waits for parallel event sources [[#2255](https://github.com/falcosecurity/falco/pull/2255)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(scripts): inject kmod script fails with some systemd versions [[#2250](https://github.com/falcosecurity/falco/pull/2250)] - [@Andreagit97](https://github.com/Andreagit97)
-* chore(userspace/falco): make logging optional when terminating, restarting, and reopening outputs [[#2249](https://github.com/falcosecurity/falco/pull/2249)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* chore: bump libs version [[#2244](https://github.com/falcosecurity/falco/pull/2244)] - [@Andreagit97](https://github.com/Andreagit97)
-* update(userspace): solve warnings and performance tips from cppcheck [[#2247](https://github.com/falcosecurity/falco/pull/2247)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(userspace/falco): make signal termination more robust with multi-threading [[#2235](https://github.com/falcosecurity/falco/pull/2235)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(userspace/falco): make termination and signal handlers more stable [[#2239](https://github.com/falcosecurity/falco/pull/2239)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(userspace): safely check string bounded access [[#2237](https://github.com/falcosecurity/falco/pull/2237)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* chore: bump libs/driver to the latest release branch commit [[#2232](https://github.com/falcosecurity/falco/pull/2232)] - [@Andreagit97](https://github.com/Andreagit97)
-* fix(userspace/falco): check plugin requirements when validating rule files [[#2233](https://github.com/falcosecurity/falco/pull/2233)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* fix(userspace): add explicit constructors and initializations [[#2229](https://github.com/falcosecurity/falco/pull/2229)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* Add StackRox to adopters [[#2187](https://github.com/falcosecurity/falco/pull/2187)] - [@Molter73](https://github.com/Molter73)
-* fix(process_events): check the return value of `open_live_inspector` [[#2215](https://github.com/falcosecurity/falco/pull/2215)] - [@Andreagit97](https://github.com/Andreagit97)
-* fix(userspace/engine): properly include stdexcept header to fix build. [[#2197](https://github.com/falcosecurity/falco/pull/2197)] - [@FedeDP](https://github.com/FedeDP)
-* refactor(userspace/engine): split rule loader classes for a more testable design [[#2206](https://github.com/falcosecurity/falco/pull/2206)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* chore(OWNERS): cleanup inactive reviewer [[#2204](https://github.com/falcosecurity/falco/pull/2204)] - [@leogr](https://github.com/leogr)
-* fix(circleci): falco-driver-loader image build must be done starting from just-pushed falco master image. [[#2194](https://github.com/falcosecurity/falco/pull/2194)] - [@FedeDP](https://github.com/FedeDP)
-* Support condition parse errors in rule loading results [[#2155](https://github.com/falcosecurity/falco/pull/2155)] - [@mstemm](https://github.com/mstemm)
-* docs: readme update [[#2183](https://github.com/falcosecurity/falco/pull/2183)] - [@leogr](https://github.com/leogr)
-* cleanup: rename legacy references [[#2180](https://github.com/falcosecurity/falco/pull/2180)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* refactor(userspace/engine): increase const coherence in falco engine [[#2081](https://github.com/falcosecurity/falco/pull/2081)] - [@jasondellaluce](https://github.com/jasondellaluce)
-* Rules result handle multiple files [[#2158](https://github.com/falcosecurity/falco/pull/2158)] - [@mstemm](https://github.com/mstemm)
-* fix: print full rule load errors/warnings without verbose/-v [[#2156](https://github.com/falcosecurity/falco/pull/2156)] - [@mstemm](https://github.com/mstemm)
-
-
-## v0.32.2
-
-Released on 2022-08-09
-
-### Major Changes
-
-
-### Bug Fixes
-
-* fix: Added ARCH to bpf download URL [[#2142](https://github.com/falcosecurity/falco/pull/2142)] - [@eric-engberg](https://github.com/eric-engberg)
-
-
 ## v0.32.1

 Released on 2022-07-11
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,14 +27,6 @@ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_SYSTEM_NAME MATCHES "Linux
  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" OFF)
-  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})
@@ -67,16 +59,16 @@ endif()
 # This will be used to print the architecture for which Falco is compiled.
 set(FALCO_TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})

-if(NOT FALCO_EXTRA_DEBUG_FLAGS)
-  set(FALCO_EXTRA_DEBUG_FLAGS "-D_DEBUG")
+if(NOT DRAIOS_DEBUG_FLAGS)
+  set(DRAIOS_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}")
+  set(KBUILD_FLAGS "${DRAIOS_DEBUG_FLAGS} ${DRAIOS_FEATURE_FLAGS}")
 else()
  set(CMAKE_BUILD_TYPE "release")
-  set(KBUILD_FLAGS "${FALCO_EXTRA_FEATURE_FLAGS}")
+  set(KBUILD_FLAGS "${DRAIOS_FEATURE_FLAGS}")
  add_definitions(-DBUILD_TYPE_RELEASE)
 endif()
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
@@ -97,7 +89,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "release")
  set(FALCO_SECURITY_FLAGS "${FALCO_SECURITY_FLAGS} -D_FORTIFY_SOURCE=2")
 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 ${DRAIOS_FEATURE_FLAGS} ${MINIMAL_BUILD_FLAGS} ${MUSL_FLAGS}")

 if(BUILD_WARNINGS_AS_ERRORS)
  set(CMAKE_SUPPRESSED_WARNINGS
@@ -109,8 +101,8 @@ endif()
 set(CMAKE_C_FLAGS "${CMAKE_COMMON_FLAGS}")
 set(CMAKE_CXX_FLAGS "--std=c++0x ${CMAKE_COMMON_FLAGS} -Wno-class-memaccess")

-set(CMAKE_C_FLAGS_DEBUG "${FALCO_EXTRA_DEBUG_FLAGS}")
-set(CMAKE_CXX_FLAGS_DEBUG "${FALCO_EXTRA_DEBUG_FLAGS}")
+set(CMAKE_C_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}")
+set(CMAKE_CXX_FLAGS_DEBUG "${DRAIOS_DEBUG_FLAGS}")

 set(CMAKE_C_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG")
@@ -122,11 +114,6 @@ 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`.
-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}")
 endif()
@@ -181,6 +168,9 @@ include(cxxopts)
 # One TBB
 include(tbb)

+#string-view-lite
+include(DownloadStringViewLite)
+
 if(NOT MINIMAL_BUILD)
  include(zlib)
  include(cares)
--- a/2
+++ b/2
@@ -3,9 +3,9 @@ approvers:
  - leogr
  - jasondellaluce
  - fededp
-  - andreagit97
 reviewers:
  - kaizhe
+  - mfdii
 emeritus_approvers:
  - fntlnz
  - kris-nova
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@

 Want to talk? Join us on the [#falco](https://kubernetes.slack.com/messages/falco) channel in the [Kubernetes Slack](https://slack.k8s.io).

-## Latest releases
+### Latest releases

 Read the [change log](CHANGELOG.md).

@@ -66,7 +66,7 @@ Falco can also be extended to other data sources by using plugins.
 Falco has a rich set of security rules specifically built for Kubernetes, Linux, and cloud-native.
 If a rule is violated in a system, Falco will send an alert notifying the user of the violation and its severity.

-## What can Falco detect?
+### What can Falco detect?

 Falco can detect and alert on any behavior that involves making Linux system calls.
 Falco alerts can be triggered by the use of specific system calls, their arguments, and by properties of the calling process.
@@ -80,11 +80,11 @@ For example, Falco can easily detect incidents including but not limited to:
 - A standard system binary, such as `ls`, is making an outbound network connection.
 - A privileged pod is started in a Kubernetes cluster.

-## Installing Falco
+### Installing Falco

 If you would like to run Falco in **production** please adhere to the [official installation guide](https://falco.org/docs/getting-started/installation/).

-### Kubernetes
+##### Kubernetes

 | Tool     | Link                                                                                       | Note                                                               |
 |----------|--------------------------------------------------------------------------------------------|--------------------------------------------------------------------|
@@ -93,20 +93,22 @@ If you would like to run Falco in **production** please adhere to the [official
 | Kind     | [Tutorial](https://falco.org/docs/getting-started/third-party/#kind)                                       | Running Falco with kind requires a driver on the host system.      |
 | GKE      | [Tutorial](https://falco.org/docs/getting-started/third-party/#gke)                                        | We suggest using the eBPF driver for running Falco on GKE.         |

-## Developing
+### Developing

 Falco is designed to be extensible such that it can be built into cloud-native applications and infrastructure.

 Falco has a [gRPC](https://falco.org/docs/grpc/) endpoint and an API defined in [protobuf](https://github.com/falcosecurity/falco/blob/master/userspace/falco/outputs.proto).
 The Falco Project supports various SDKs for this endpoint.

-### SDKs
+##### SDKs

 | Language | Repository                                              |
 |----------|---------------------------------------------------------|
 | Go       | [client-go](https://github.com/falcosecurity/client-go) |
+| Rust     | [client-rs](https://github.com/falcosecurity/client-rs) |
+| Python   | [client-py](https://github.com/falcosecurity/client-py) |

-## Plugins
+### Plugins

 Falco comes with a [plugin framework](https://falco.org/docs/plugins/) that extends it to potentially any cloud detection scenario. Plugins are shared libraries that conform to a documented API and allow for:

@@ -116,18 +118,18 @@ Falco comes with a [plugin framework](https://falco.org/docs/plugins/) that exte
 The Falco Project maintains [various plugins](https://github.com/falcosecurity/plugins) and provides SDKs for plugin development.


-### SDKs
+##### SDKs

 | Language | Repository                                                                    |
 |----------|-------------------------------------------------------------------------------|
 | Go       | [falcosecurity/plugin-sdk-go](https://github.com/falcosecurity/plugin-sdk-go) |


-## Documentation
+### Documentation

 The [Official Documentation](https://falco.org/docs/) is the best resource to learn about Falco.

-## Join the Community
+### Join the Community

 To get involved with The Falco Project please visit [the community repository](https://github.com/falcosecurity/community) to find more.

@@ -137,36 +139,23 @@ How to reach out?
 - [Join the Falco mailing list](https://lists.cncf.io/g/cncf-falco-dev)
 - [Read the Falco documentation](https://falco.org/docs/)

-## How to contribute

-See the [contributing guide](https://github.com/falcosecurity/.github/blob/main/CONTRIBUTING.md) and the [code of conduct](https://github.com/falcosecurity/evolution/CODE_OF_CONDUCT.md).
- 
-## Security Audit
+### Contributing
+
+See the [CONTRIBUTING.md](https://github.com/falcosecurity/.github/blob/master/CONTRIBUTING.md).
+
+### Security Audit

 A third party security audit was performed by Cure53, you can see the full report [here](./audits/SECURITY_AUDIT_2019_07.pdf).

-## Reporting security vulnerabilities
+### Reporting security vulnerabilities

-Please report security vulnerabilities following the community process documented [here](https://github.com/falcosecurity/.github/blob/main/SECURITY.md).
+Please report security vulnerabilities following the community process documented [here](https://github.com/falcosecurity/.github/blob/master/SECURITY.md).

-## License
+### License Terms

 Falco is licensed to you under the [Apache 2.0](./COPYING) open source license.

-## Project Evolution
-
-The [falcosecurity/evolution](https://github.com/falcosecurity/evolution) repository is the official space for the community to work together, discuss ideas, and document processes. It is also a place to make decisions. Check it out to find more helpful resources.
-
-## Resources
-
- - [Governance](https://github.com/falcosecurity/evolution/blob/main/GOVERNANCE.md)
- - [Code Of Conduct](https://github.com/falcosecurity/evolution/blob/main/CODE_OF_CONDUCT.md)
- - [Maintainers Guidelines](https://github.com/falcosecurity/evolution/blob/main/MAINTAINERS_GUIDELINES.md)
- - [Maintainers List](https://github.com/falcosecurity/evolution/blob/main/MAINTAINERS.md)
- - [Repositories Guidelines](https://github.com/falcosecurity/evolution/blob/main/REPOSITORIES.md)
- - [Repositories List](https://github.com/falcosecurity/evolution/blob/main/README.md#repositories)
- - [Adopters List](https://github.com/falcosecurity/falco/blob/master/ADOPTERS.md)
-

 [1]: https://download.falco.org/?prefix=packages/rpm-dev/
 [2]: https://download.falco.org/?prefix=packages/rpm/
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,77 +1,18 @@
 # Falco Release Process

-
-## Overview
-
-This document provides the process to create a new Falco release. In addition, it provides information about the versioning of the Falco components. At a high level each Falco release consists of the following main components:
-
- Falco binary (userspace)
- Falco kernel driver object files (kernel space)
-    - Option 1: Kernel module (`.ko` files)
-    - Option 2: eBPF (`.o` files)
- Falco config and primary rules `.yaml` files (userspace)
- Falco plugins (userspace - optional)
-
-One nice trait about releasing separate artifacts for userspace and kernel space is that Falco is amenable to supporting a large array of environments, that is, multiple kernel versions, distros and architectures (see `libs` [driver - kernel version support matrix](https://github.com/falcosecurity/libs#drivers-officially-supported-architectures)). The Falco project manages the release of both the Falco userspace binary and pre-compiled Falco kernel drivers for the most popular kernel versions and distros. The build and publish process is managed by the [test-infra](https://github.com/falcosecurity/test-infra) repo. The Falco userspace executable includes bundled dependencies, so that it can be run from anywhere.
-
-The Falco project also publishes all sources for each component. In fact, sources are included in the Falco release in the same way as some plugins (k8saudit and cloudtrail) as well as the rules that are shipped together with Falco. This empowers the end user to audit the integrity of the project as well as build kernel drivers for custom kernels or not officially supported kernels / distros (see [driverkit](https://github.com/falcosecurity/driverkit) for more information). While the Falco project is deeply embedded into an ecosystem of supporting [Falco sub-projects](https://github.com/falcosecurity/evolution) that aim to make the deployment of Falco easy, user-friendly, extendible and cloud-native, core Falco is split across two repos, [falco](https://github.com/falcosecurity/falco) (this repo) and [libs](https://github.com/falcosecurity/libs). The `libs` repo contains >90% of Falco's core features and is the home of each of the kernel drivers and engines. More details are provided in the [Falco Components Versioning](#falco-components-versioning) section.
-
-Finally, the release process follows a transparent process described in more detail in the following sections and the official [Falco docs](https://falco.org/) contain rich information around building, installing and using Falco.
-
-
-### Falco Binaries, Rules and Sources Artifacts - Quick Links
-
-The Falco project publishes all sources and the Falco userspace binaries as GitHub releases. Rules are also released in the GitHub tree Falco release tag.
-
- [Falco Releases](https://github.com/falcosecurity/falco/releases)
-    - `tgz`, `rpm` and `deb` Falco binary packages (contains sources, including driver sources, Falco rules as well as k8saudit and cloudtrail plugins)
-    - `tgz`, `zip` source code
- [Libs Releases](https://github.com/falcosecurity/libs/releases)
-    - `tgz`, `zip` source code
- Falco Rules (GitHub tree approach)
-    - RELEASE="x.y.z", `https://github.com/falcosecurity/falco/tree/${RELEASE}/rules`
-
-
-Alternatively Falco binaries or plugins can be downloaded from the Falco Artifacts repo.
-
- [Falco Artifacts Repo Packages Root](https://download.falco.org/?prefix=packages/)
- [Falco Artifacts Repo Plugins Root](https://download.falco.org/?prefix=plugins/)
-
-
-### Falco Drivers Artifacts Repo - Quick Links
-
-
-The Falco project publishes all drivers for each release for all popular kernel versions / distros and `x86_64` and `aarch64` architectures to the Falco project managed Artifacts repo. The Artifacts repo follows standard directory level conventions. The respective driver object file is prefixed by distro and named / versioned by kernel release - `$(uname -r)`. Pre-compiled drivers are released with a [best effort](https://github.com/falcosecurity/falco/blob/master/proposals/20200818-artifacts-storage.md#notice) notice. This is because gcc (`kmod`) and clang (`bpf`) compilers or for example the eBPF verifier are not perfect. More details around driver versioning and driver compatibility are provided in the [Falco Components Versioning](#falco-components-versioning) section. Short preview: If you use the standard Falco setup leveraging driver-loader, [driver-loader script](https://github.com/falcosecurity/falco/blob/master/scripts/falco-driver-loader) will fetch the kernel space artifact (object file) corresponding to the default `DRIVER_VERSION` Falco was shipped with.
-
- [Falco Artifacts Repo Drivers Root](https://download.falco.org/?prefix=driver/)
-    - Option 1: Kernel module (`.ko` files) - all under same driver version directory
-    - Option 2: eBPF (`.o` files) - all under same driver version directory
-
-
-### Timeline
-
-Falco releases are due to happen 3 times per year. Our current schedule sees a new release by the end of January, May, and September each year. Hotfix releases can happen whenever it's needed.
+Our release process is mostly automated, but we still need some manual steps to initiate and complete it.

 Changes and new features are grouped in [milestones](https://github.com/falcosecurity/falco/milestones), the milestone with the next version represents what is going to be released.

-
-### Procedures
-
-The release process is mostly automated requiring only a few manual steps to initiate and complete it.
+Falco releases are due to happen 3 times per year. Our current schedule sees a new release by the end of January, May, and September each year. Hotfix releases can happen whenever it's needed.

 Moreover, we need to assign owners for each release (usually we pair a new person with an experienced one). Assignees and the due date are proposed during the [weekly community call](https://github.com/falcosecurity/community).

-At a high level each Falco release needs to follow a pre-determined sequencing of releases and build order:
-
- [1 - 3] `libs` (+ `driver`) and `plugins` components releases
- [4] Falco driver pre-compiled object files push to Falco's Artifacts repo
- [5] Falco userspace binary + rules release
-
 Finally, on the proposed due date the assignees for the upcoming release proceed with the processes described below.

 ## Pre-Release Checklist

-Prior to cutting a release the following preparatory steps should take 5 minutes using the GitHub UI.
+Before cutting a release we need to do some homework in the Falco repository. This should take 5 minutes using the GitHub UI.

 ### 1. Release notes
 - Find the previous release date (`YYYY-MM-DD`) by looking at the [Falco releases](https://github.com/falcosecurity/falco/releases)
@@ -180,39 +121,3 @@ Announce the new release to the world!
 - Send an announcement to cncf-falco-dev@lists.cncf.io (plain text, please)
 - Let folks in the slack #falco channel know about a new release came out
 - IFF the on going release introduces a **new minor version**, [archive a snapshot of the Falco website](https://github.com/falcosecurity/falco-website/blob/master/release.md#documentation-versioning)
-
-
-## Falco Components Versioning
-
-This section provides more details around the versioning of all components that make up core Falco. It can also be a useful guide for the uninitiated to be more informed about Falco's source. Because the `libs` repo contains >90% of Falco's core features and is the home of each of the kernel drivers and engines, the [libs release doc](https://github.com/falcosecurity/libs/blob/master/release.md) is an excellent additional resource. In addition, the [plugins release doc](https://github.com/falcosecurity/plugins/blob/master/release.md) provides similar details around Falco's plugins. `SHA256` checksums are provided throughout Falco's source code to empower the end user to perform integrity checks. All Falco releases also contain the sources as part of the packages.
-
-
-### Falco repo (this repo)
- Falco version is a git tag (`x.y.z`), see [Procedures](#procedures) section. Note that the Falco version is a sem-ver-like schema, but not fully compatible with sem-ver.
- [FALCO_ENGINE_VERSION](https://github.com/falcosecurity/falco/blob/master/userspace/engine/falco_engine_version.h) is not sem-ver and must be bumped either when a backward incompatible change has been introduced to the rules files syntax or `falco --list -N | sha256sum` has changed. Breaking changes introduced in the Falco engine are not necessarily tied to the drivers or libs versions. The primary idea behind the hash is that when new filter / display fields (see currently supported [Falco fields](https://falco.org/docs/rules/supported-fields/)) are introduced a version bump indicates that this field was not available in previous engine versions. In case a new Falco rule uses new fields, the [Falco rules](https://github.com/falcosecurity/falco/blob/master/rules/falco_rules.yaml) file needs to bump this version as well via setting `required_engine_version` to the new version.
- During development and release preparation, libs and driver reference commits are often bumped in Falco's cmake setup ([falcosecurity-libs cmake](https://github.com/falcosecurity/falco/blob/master/cmake/modules/falcosecurity-libs.cmake#L30) and [driver cmake](https://github.com/falcosecurity/falco/blob/master/cmake/modules/driver.cmake#L29)) in order to merge new Falco features. In practice they are mostly bumped at the same time referencing the same `libs` commit. However, for the official Falco build `FALCOSECURITY_LIBS_VERSION` flag that references the stable Libs version is used (read below).
- Similarly, Falco plugins versions are bumped in Falco's cmake setup ([plugins cmake](https://github.com/falcosecurity/falco/blob/master/cmake/modules/plugins.cmake)) and those versions are the ones used for the Falco release.
- At release time Plugin, Libs and Driver versions are compatible with Falco.
- If you use the standard Falco setup leveraging driver-loader, [driver-loader script](https://github.com/falcosecurity/falco/blob/master/scripts/falco-driver-loader) will fetch the kernel space artifact (object file) corresponding to the default `DRIVER_VERSION` Falco was shipped with (read more below under Libs).
-
-
-```
-Falco version: x.y.z (sem-ver like)
-Libs version:  x.y.z (sem-ver like)
-Plugin API:    x.y.z (sem-ver like)
-Driver:
-  API version:    x.y.z (sem-ver)
-  Schema version: x.y.z (sem-ver)
-  Default driver: x.y.z+driver (sem-ver like, indirectly encodes compatibility range in addition to default version Falco is shipped with)
-```
-
-
-### Libs repo
- Libs version is a git tag (`x.y.z`) and when building Falco the libs version is set via the `FALCOSECURITY_LIBS_VERSION` flag (see above).
- Driver version in and of itself is not directly tied to the Falco binary as opposed to the libs version being part of the source code used to compile Falco's userspace binary. This is because of the strict separation between userspace and kernel space artifacts, so things become a bit more interesting here. This is why the concept of a `Default driver` has been introduced to still implicitly declare the compatible driver versions. For example, if the default driver version is `2.0.0+driver`, Falco works with all driver versions >= 2.0.0 and < 3.0.0. This is a consequence of how the driver version is constructed starting from the `Driver API version` and `Driver Schema version`. Driver API and Schema versions are explained in the respective [libs driver doc](https://github.com/falcosecurity/libs/blob/master/driver/README.VERSION.md) -> Falco's `driver-loader` will always fetch the default driver, therefore a Falco release is always "shipped" with the driver version corresponding to the default driver.
- See [libs release doc](https://github.com/falcosecurity/libs/blob/master/release.md) for more information.
-
-### Plugins repo
-
- Plugins version is a git tag (`x.y.z`)
- See [plugins release doc](https://github.com/falcosecurity/plugins/blob/master/release.md) for more information.
--- a/cmake/cpack/CMakeCPackOptions.cmake
+++ b/cmake/cpack/CMakeCPackOptions.cmake
@@ -1,13 +1,11 @@
 if(CPACK_GENERATOR MATCHES "DEB")
 	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/debian/falco.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
-	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/debian/falco_inject_kmod.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
 endif()

 if(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/rpm/falco.service _CPack_Packages/${CPACK_TOPLEVEL_TAG}/${CPACK_GENERATOR}/${CPACK_PACKAGE_FILE_NAME}/usr/lib/systemd/system")
-	list(APPEND CPACK_INSTALL_COMMANDS "cp scripts/rpm/falco_inject_kmod.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/DownloadStringViewLite.cmake
+++ b/cmake/modules/DownloadStringViewLite.cmake
@@ -0,0 +1,30 @@
+#
+# Copyright (C) 2020 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(ExternalProject)
+
+set(STRING_VIEW_LITE_PREFIX ${CMAKE_BINARY_DIR}/string-view-lite-prefix)
+set(STRING_VIEW_LITE_INCLUDE ${STRING_VIEW_LITE_PREFIX}/include)
+message(STATUS "Using bundled string-view-lite in ${STRING_VIEW_LITE_INCLUDE}")
+
+ExternalProject_Add(
+  string-view-lite
+  PREFIX ${STRING_VIEW_LITE_PREFIX}
+  GIT_REPOSITORY "https://github.com/martinmoene/string-view-lite.git"
+  GIT_TAG "v1.4.0"
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  UPDATE_COMMAND ""
+  INSTALL_COMMAND
+    ${CMAKE_COMMAND} -E copy ${STRING_VIEW_LITE_PREFIX}/src/string-view-lite/include/nonstd/string_view.hpp
+    ${STRING_VIEW_LITE_INCLUDE}/nonstd/string_view.hpp)
--- a/cmake/modules/driver.cmake
+++ b/cmake/modules/driver.cmake
@@ -26,8 +26,8 @@ else()
  # In case you want to test against another driver version (or branch, or commit) just pass the variable -
  # ie., `cmake -DDRIVER_VERSION=dev ..`
  if(NOT DRIVER_VERSION)
-    set(DRIVER_VERSION "dd443b67c6b04464cb8ee2771af8ada8777e7fac")
-    set(DRIVER_CHECKSUM "SHA256=df373099d0f4cd4417a0103bb57f26c7412ffa86cde2bb2d579c6feba841626d")
+    set(DRIVER_VERSION "b4c198773bf05486e122f6d3f7f63be125242413")
+    set(DRIVER_CHECKSUM "SHA256=e85fa42a0b58ba21ca7efb38c20ce25207f4816245bdf154e6b9a037a1cce930")
  endif()

  # cd /path/to/build && cmake /path/to/source
@@ -45,4 +45,4 @@ set(DRIVER_NAME "falco")
 set(DRIVER_PACKAGE_NAME "falco")
 set(DRIVER_COMPONENT_NAME "falco-driver")

-add_subdirectory(${DRIVER_SOURCE_DIR} ${PROJECT_BINARY_DIR}/driver)
+add_subdirectory(${DRIVER_SOURCE_DIR} ${PROJECT_BINARY_DIR}/driver)
--- a/cmake/modules/falcosecurity-libs.cmake
+++ b/cmake/modules/falcosecurity-libs.cmake
@@ -27,8 +27,8 @@ else()
  # In case you want to test against another falcosecurity/libs version (or branch, or commit) just pass the variable -
  # ie., `cmake -DFALCOSECURITY_LIBS_VERSION=dev ..`
  if(NOT FALCOSECURITY_LIBS_VERSION)
-    set(FALCOSECURITY_LIBS_VERSION "dd443b67c6b04464cb8ee2771af8ada8777e7fac")
-    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=df373099d0f4cd4417a0103bb57f26c7412ffa86cde2bb2d579c6feba841626d")
+    set(FALCOSECURITY_LIBS_VERSION "b4c198773bf05486e122f6d3f7f63be125242413")
+    set(FALCOSECURITY_LIBS_CHECKSUM "SHA256=e85fa42a0b58ba21ca7efb38c20ce25207f4816245bdf154e6b9a037a1cce930")
  endif()

  # cd /path/to/build && cmake /path/to/source
@@ -49,6 +49,7 @@ if(MUSL_OPTIMIZED_BUILD)
  add_definitions(-DMUSL_OPTIMIZED)
 endif()

+set(SCAP_BPF_PROBE_ENV_VAR_NAME "FALCO_BPF_PROBE")
 set(SCAP_HOST_ROOT_ENV_VAR_NAME "HOST_ROOT")

 if(NOT LIBSCAP_DIR)
@@ -60,9 +61,6 @@ set(LIBSINSP_DIR "${FALCOSECURITY_LIBS_SOURCE_DIR}")
 # configure gVisor support
 set(BUILD_LIBSCAP_GVISOR ${BUILD_FALCO_GVISOR} CACHE BOOL "")

-# configure modern BPF support
-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 "")
@@ -71,7 +69,6 @@ set(USE_BUNDLED_TBB ON CACHE BOOL "")
 set(USE_BUNDLED_B64 ON CACHE BOOL "")
 set(USE_BUNDLED_JSONCPP ON CACHE BOOL "")
 set(USE_BUNDLED_VALIJSON ON CACHE BOOL "")
-set(USE_BUNDLED_RE2 ON CACHE BOOL "")

 list(APPEND CMAKE_MODULE_PATH "${FALCOSECURITY_LIBS_SOURCE_DIR}/cmake/modules")

@@ -87,4 +84,4 @@ endif()

 include(driver)
 include(libscap)
-include(libsinsp)
+include(libsinsp)
--- a/cmake/modules/plugins.cmake
+++ b/cmake/modules/plugins.cmake
@@ -19,11 +19,11 @@ if(NOT DEFINED PLUGINS_COMPONENT_NAME)
    set(PLUGINS_COMPONENT_NAME "${CMAKE_PROJECT_NAME}-plugins")
 endif()

-set(PLUGIN_K8S_AUDIT_VERSION "0.4.0")
+set(PLUGIN_K8S_AUDIT_VERSION "0.3.0")
 if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(PLUGIN_K8S_AUDIT_HASH "ded0b5419f40084547620ccc48b19768e5e89457b85cfe8fbe496ca72267a3a4")
+    set(PLUGIN_K8S_AUDIT_HASH "214915fc2a61d147d64aaf4cb29c3fc6a513eda621dad1dfe77f2fd7099b31e1")
 else() # aarch64
-    set(PLUGIN_K8S_AUDIT_HASH "775cba666612114bc5b0c36f2e3c4557f5adbffcca2d77e72be87c6fcbf51ceb")
+    set(PLUGIN_K8S_AUDIT_HASH "d9b4610714df581043db76ecb4caf3a41aae5494cf61ab8740a3749bfac8457e")
 endif()

 ExternalProject_Add(
@@ -39,18 +39,18 @@ install(FILES "${PROJECT_BINARY_DIR}/k8saudit-plugin-prefix/src/k8saudit-plugin/
 ExternalProject_Add(
  k8saudit-rules
  URL "https://download.falco.org/plugins/stable/k8saudit-rules-${PLUGIN_K8S_AUDIT_VERSION}.tar.gz"
-  URL_HASH "SHA256=53948fac0345e718d673142a992ac820135f771141dfaa9719c7575ac8ae6878"
+  URL_HASH "SHA256=3913a8c6095794c7de6a97a2a64953a0fa4f87caab014d11b2c8f9221eb77591"
  CONFIGURE_COMMAND ""
  BUILD_COMMAND ""
  INSTALL_COMMAND "")

 install(FILES "${PROJECT_BINARY_DIR}/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml" DESTINATION "${FALCO_ETC_DIR}" COMPONENT "${PLUGINS_COMPONENT_NAME}")

-set(PLUGIN_CLOUDTRAIL_VERSION "0.6.0")
+set(PLUGIN_CLOUDTRAIL_VERSION "0.5.0")
 if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(PLUGIN_CLOUDTRAIL_HASH "80e0c33f30c01a90efb7e9a671d978ff9679c462e3105020238abf31230e49a9")
+    set(PLUGIN_CLOUDTRAIL_HASH "ca6c0d087b37090145ef0c92f10d1dd32bb2a08c7bae83cc6fb7a1ba712f3182")
 else() # aarch64
-    set(PLUGIN_CLOUDTRAIL_HASH "a3e739932e66d44be848a68857fa15f56134d5246a1b9ab912c81f91b68fb23f")
+    set(PLUGIN_CLOUDTRAIL_HASH "f6e12d3bd16ae0f504ed2bb56d13531d15b7d55beb1b63932cbe603cff941372")
 endif()

 ExternalProject_Add(
@@ -66,18 +66,18 @@ install(FILES "${PROJECT_BINARY_DIR}/cloudtrail-plugin-prefix/src/cloudtrail-plu
 ExternalProject_Add(
  cloudtrail-rules
  URL "https://download.falco.org/plugins/stable/cloudtrail-rules-${PLUGIN_CLOUDTRAIL_VERSION}.tar.gz"
-  URL_HASH "SHA256=e0dccb7b0f1d24b1e526a33ffd973ea5f2ac2879dbc999e119419ebfd24305ff"
+  URL_HASH "SHA256=7f88fb6b530f8ee739b65d38a36c69cdc70398576299b90118bd7324dbdb5f46"
  CONFIGURE_COMMAND ""
  BUILD_COMMAND ""
  INSTALL_COMMAND "")

  install(FILES "${PROJECT_BINARY_DIR}/cloudtrail-rules-prefix/src/cloudtrail-rules/aws_cloudtrail_rules.yaml" DESTINATION "${FALCO_ETC_DIR}" COMPONENT "${PLUGINS_COMPONENT_NAME}")

-set(PLUGIN_JSON_VERSION "0.6.0")
+set(PLUGIN_JSON_VERSION "0.5.0")
 if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
-    set(PLUGIN_JSON_HASH "15fb7eddd978e8bb03f05412e9446e264e4548d7423b3d724b99d6d87a8c1b27")
+    set(PLUGIN_JSON_HASH "b422c4f08bb54ccd384a87c5922e120d5731028c87742ef657cacf936447c202")
 else() # aarch64
-    set(PLUGIN_JSON_HASH "4db23f35a750e10a5b7b54c9aa469a7587705e7faa22927e941b41f3c5533e9f")
+    set(PLUGIN_JSON_HASH "8358f04325d8a9e9675f38fae8d13a250fb132dcf6741fd0f9830e8c39f48aed")
 endif()

 ExternalProject_Add(
--- a/cmake/modules/static-analysis.cmake
+++ b/cmake/modules/static-analysis.cmake
@@ -25,10 +25,11 @@ else()
      "--force"
      "--inconclusive"
      "--inline-suppr" # allows to specify suppressions directly in source code
+      "--project=${CMAKE_CURRENT_BINARY_DIR}/compile_commands.json" # use the compilation database as source
+      "--quiet"
      "--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

--- a/docker/builder/Dockerfile
+++ b/docker/builder/Dockerfile
@@ -22,7 +22,7 @@ ENV CMAKE_VERSION=${CMAKE_VERSION}

 # build toolchain
 RUN yum -y install centos-release-scl && \
-    INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel llvm-toolset-7.0 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel rpm-build libyaml-devel" && \
+    INSTALL_PKGS="devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-toolchain devtoolset-7-libstdc++-devel devtoolset-7-elfutils-libelf-devel llvm-toolset-7.0 glibc-static autoconf automake libtool createrepo expect git which libcurl-devel zlib-devel rpm-build libyaml-devel" && \
    yum -y install --setopt=tsflags=nodocs $INSTALL_PKGS && \
    rpm -V $INSTALL_PKGS

--- a/docker/builder/root/usr/bin/entrypoint
+++ b/docker/builder/root/usr/bin/entrypoint
@@ -9,10 +9,10 @@ shift

 # Build type can be "debug" or "release", fallbacks to "release" by default
 BUILD_TYPE=$(echo "$BUILD_TYPE" | tr "[:upper:]" "[:lower:]")
-FALCO_EXTRA_DEBUG_FLAGS=
+DRAIOS_DEBUG_FLAGS=
 case "$BUILD_TYPE" in
 "debug")
-    FALCO_EXTRA_DEBUG_FLAGS="-D_DEBUG -DNDEBUG"
+    DRAIOS_DEBUG_FLAGS="-D_DEBUG -DNDEBUG"
    ;;
 *)
    BUILD_TYPE="release"
@@ -37,7 +37,7 @@ case "$CMD" in
    -DBUILD_BPF="$BUILD_BPF" \
    -DBUILD_WARNINGS_AS_ERRORS="$BUILD_WARNINGS_AS_ERRORS" \
    -DFALCO_VERSION="$FALCO_VERSION" \
-    -DFALCO_EXTRA_DEBUG_FLAGS="$FALCO_EXTRA_DEBUG_FLAGS" \
+    -DDRAIOS_DEBUG_FLAGS="$DRAIOS_DEBUG_FLAGS" \
    -DUSE_BUNDLED_DEPS=ON \
    "$SOURCE_DIR/falco"
    exit "$(printf '%d\n' $?)"
--- a/falco.yaml
+++ b/falco.yaml
@@ -63,16 +63,6 @@ plugins:
 # load_plugins: [cloudtrail, json]
 load_plugins: []

-#
-# Enabling hashing instructs Falco to generate checksums of executable files,
-# which is used by malware detection rules.
-# Hashing can require substantial resources when many different files are executed, so
-# keep this disabled if performance is an issue.
-#
-hash_executables: false
-#hashing_checksum_files:
-#  - /etc/falco/malware_signatures.txt
-
 # Watch config file and rules files for modification.
 # When a file is modified, Falco will propagate new config,
 # by reloading itself.
@@ -179,61 +169,6 @@ syscall_event_drops:
 syscall_event_timeouts:
  max_consecutives: 1000

-# --- [Description]
-#
-# This is an index that controls the dimension of the syscall buffers.
-# The syscall buffer is the shared space between Falco and its drivers where all the syscall events
-# are stored.
-# Falco uses a syscall buffer for every online CPU, and all these buffers share the same dimension.
-# So this parameter allows you to control the size of all the buffers!
-#
-# --- [Usage]
-#
-# You can choose between different indexes: from `1` to `10` (`0` is reserved for future uses).
-# Every index corresponds to a dimension in bytes:
-#
-# [(*), 1 MB, 2 MB, 4 MB, 8 MB, 16 MB, 32 MB, 64 MB, 128 MB, 256 MB, 512 MB]
-#   ^    ^     ^     ^     ^     ^      ^      ^       ^       ^       ^
-#   |    |     |     |     |     |      |      |       |       |       |
-#   0    1     2     3     4     5      6      7       8       9       10
-#
-# As you can see the `0` index is reserved, while the index `1` corresponds to
-# `1 MB` and so on.
-#
-# These dimensions in bytes derive from the fact that the buffer size must be:
-# (1) a power of 2.
-# (2) a multiple of your system_page_dimension.
-# (3) greater than `2 * (system_page_dimension)`.
-#
-# According to these constraints is possible that sometimes you cannot use all the indexes, let's consider an
-# example to better understand it:
-# If you have a `page_size` of 1 MB the first available buffer size is 4 MB because 2 MB is exactly
-# `2 * (system_page_size)` -> `2 * 1 MB`, but this is not enough we need more than `2 * (system_page_size)`!
-# So from this example is clear that if you have a page size of 1 MB the first index that you can use is `3`.
-#
-# Please note: this is a very extreme case just to let you understand the mechanism, usually the page size is something
-# like 4 KB so you have no problem at all and you can use all the indexes (from `1` to `10`).
-#
-# To check your system page size use the Falco `--page-size` command line option. The output on a system with a page
-# size of 4096 Bytes (4 KB) should be the following:
-#
-# "Your system page size is: 4096 bytes."
-#
-# --- [Suggestions]
-#
-# Before the introduction of this param the buffer size was fixed to 8 MB (so index `4`, as you can see
-# in the default value below).
-# You can increase the buffer size when you face syscall drops. A size of 16 MB (so index `5`) can reduce
-# syscall drops in production-heavy systems without noticeable impact. Very large buffers however could
-# slow down the entire machine.
-# On the other side you can try to reduce the buffer size to speed up the system, but this could
-# increase the number of syscall drops!
-# As a final remark consider that the buffer size is mapped twice in the process' virtual memory so a buffer of 8 MB
-# will result in a 16 MB area in the process virtual memory.
-# Please pay attention when you use this parameter and change it only if the default size doesn't fit your use case.
-
-syscall_buf_size_preset: 4
-
 # Falco continuously monitors outputs performance. When an output channel does not allow
 # to deliver an alert within a given deadline, an error is reported indicating
 # which output is blocking notifications.
@@ -252,22 +187,19 @@ syscall_buf_size_preset: 4
 output_timeout: 2000

 # A throttling mechanism implemented as a token bucket limits the
-# rate of Falco notifications. One rate limiter is assigned to each event
-# source, so that alerts coming from one can't influence the throttling
-# mechanism of the others. This is controlled by the following options:
+# rate of falco notifications. This throttling is controlled by the following configuration
+# options:
 #  - rate: the number of tokens (i.e. right to send a notification)
-#    gained per second. When 0, the throttling mechanism is disabled.
-#    Defaults to 0.
+#    gained per second. Defaults to 1.
 #  - max_burst: the maximum number of tokens outstanding. Defaults to 1000.
 #
-# With these defaults, the throttling mechanism is disabled.
-# For example, by setting rate to 1 Falco could send up to 1000 notifications
-# after an initial quiet period, and then up to 1 notification per second
+# With these defaults, falco could send up to 1000 notifications after
+# an initial quiet period, and then up to 1 notification per second
 # afterward. It would gain the full burst back after 1000 seconds of
 # no activity.

 outputs:
-  rate: 0
+  rate: 1
  max_burst: 1000

 # Where security notifications should go.
@@ -292,10 +224,9 @@ file_output:
 stdout_output:
  enabled: true

-# Falco contains an embedded webserver that is used to implement an health
-# endpoint for checking if Falco is up and running. These config options control
-# the behavior of that webserver. By default, the webserver is enabled and
-# the endpoint is /healthz.
+# Falco contains an embedded webserver that can be used to accept K8s
+# Audit Events. These config options control the behavior of that
+# webserver. (By default, the webserver is enabled).
 #
 # The ssl_certificate is a combination SSL Certificate and corresponding
 # key contained in a single file. You can generate a key/cert as follows:
@@ -303,10 +234,11 @@ stdout_output:
 # $ openssl req -newkey rsa:2048 -nodes -keyout key.pem -x509 -days 365 -out certificate.pem
 # $ cat certificate.pem key.pem > falco.pem
 # $ sudo cp falco.pem /etc/falco/falco.pem
+#
+# It also exposes a healthy endpoint that can be used to check if Falco is up and running
+# By default the endpoint is /healthz
 webserver:
  enabled: true
-  # when threadiness is 0, Falco automatically guesses it depending on the number of online cores
-  threadiness: 0
  listen_port: 8765
  k8s_healthz_endpoint: /healthz
  ssl_enabled: false
@@ -361,7 +293,7 @@ http_output:
 # gRPC server using an unix socket
 grpc:
  enabled: false
-  bind_address: "unix:///run/falco/falco.sock"
+  bind_address: "unix:///var/run/falco.sock"
  # when threadiness is 0, Falco automatically guesses it depending on the number of online cores
  threadiness: 0

--- a/rules/falco_rules.yaml
+++ b/rules/falco_rules.yaml
@@ -15,9 +15,10 @@
 # limitations under the License.
 #

+# The latest Falco Engine version is 9.
 # Starting with version 8, the Falco engine supports exceptions.
 # However the Falco rules file does not use them by default.
- required_engine_version: 13
+- required_engine_version: 9

 # Currently disabled as read/write are ignored syscalls. The nearly
 # similar open_write/open_read check for files being opened for
@@ -28,20 +29,13 @@
 #   condition: (syscall.type=read and evt.dir=> and fd.type in (file, directory))

 - macro: open_write
-  condition: (evt.type in (open,openat,openat2) and evt.is_open_write=true and fd.typechar='f' and fd.num>=0)
+  condition: evt.type in (open,openat,openat2) and evt.is_open_write=true and fd.typechar='f' and fd.num>=0

 - macro: open_read
-  condition: (evt.type in (open,openat,openat2) and evt.is_open_read=true and fd.typechar='f' and fd.num>=0)
+  condition: evt.type in (open,openat,openat2) and evt.is_open_read=true and fd.typechar='f' and fd.num>=0

 - macro: open_directory
-  condition: (evt.type in (open,openat,openat2) and evt.is_open_read=true and fd.typechar='d' and fd.num>=0)
-
-# Failed file open attempts, useful to detect threat actors making mistakes
-# https://man7.org/linux/man-pages/man3/errno.3.html
-# evt.res=ENOENT - No such file or directory
-# evt.res=EACCESS - Permission denied
- macro: open_file_failed
-  condition: (evt.type in (open,openat,openat2) and fd.typechar='f' and fd.num=-1 and evt.res startswith E)
+  condition: evt.type in (open,openat,openat2) and evt.is_open_read=true and fd.typechar='d' and fd.num>=0

 - macro: never_true
  condition: (evt.num=0)
@@ -57,32 +51,32 @@
  condition: (proc.name!="<NA>")

 - macro: rename
-  condition: (evt.type in (rename, renameat, renameat2))
+  condition: evt.type in (rename, renameat, renameat2)

 - macro: mkdir
-  condition: (evt.type in (mkdir, mkdirat))
+  condition: evt.type in (mkdir, mkdirat)

 - macro: remove
-  condition: (evt.type in (rmdir, unlink, unlinkat))
+  condition: evt.type in (rmdir, unlink, unlinkat)

 - macro: modify
-  condition: (rename or remove)
+  condition: rename or remove

 - macro: spawned_process
-  condition: (evt.type in (execve, execveat) and evt.dir=<)
+  condition: evt.type in (execve, execveat) and evt.dir=<

 - macro: create_symlink
-  condition: (evt.type in (symlink, symlinkat) and evt.dir=<)
+  condition: evt.type in (symlink, symlinkat) and evt.dir=<

 - macro: create_hardlink
-  condition: (evt.type in (link, linkat) and evt.dir=<)
+  condition: evt.type in (link, linkat) and evt.dir=<

 - macro: chmod
  condition: (evt.type in (chmod, fchmod, fchmodat) and evt.dir=<)

 # File categories
 - macro: bin_dir
-  condition: (fd.directory in (/bin, /sbin, /usr/bin, /usr/sbin))
+  condition: fd.directory in (/bin, /sbin, /usr/bin, /usr/sbin)

 - macro: bin_dir_mkdir
  condition: >
@@ -111,7 +105,7 @@
     evt.arg.newpath startswith /usr/sbin/)

 - macro: etc_dir
-  condition: (fd.name startswith /etc/)
+  condition: fd.name startswith /etc/

 # This detects writes immediately below / or any write anywhere below /root
 - macro: root_dir
@@ -367,7 +361,7 @@
  desc: Detect any new ssh connection to a host other than those in an allowed group of hosts
  condition: (inbound_outbound) and ssh_port and not allowed_ssh_hosts
  enabled: false
-  output: Disallowed SSH Connection (command=%proc.cmdline pid=%proc.pid connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
+  output: Disallowed SSH Connection (command=%proc.cmdline connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network, mitre_remote_service]

@@ -375,9 +369,11 @@
 # use the fd.*ip and fd.*ip.name fields to match connection
 # information against ips, netmasks, and complete domain names.
 #
-# To use this rule, you should enable it and
+# To use this rule, you should modify consider_all_outbound_conns and
 # populate allowed_{source,destination}_{ipaddrs,networks,domains} with the
 # values that make sense for your environment.
+- macro: consider_all_outbound_conns
+  condition: (never_true)

 # Note that this can be either individual IPs or netmasks
 - list: allowed_outbound_destination_ipaddrs
@@ -392,15 +388,17 @@
 - rule: Unexpected outbound connection destination
  desc: Detect any outbound connection to a destination outside of an allowed set of ips, networks, or domain names
  condition: >
-    outbound and not
+    consider_all_outbound_conns and outbound and not
    ((fd.sip in (allowed_outbound_destination_ipaddrs)) or
     (fd.snet in (allowed_outbound_destination_networks)) or
     (fd.sip.name in (allowed_outbound_destination_domains)))
-  enabled: false
-  output: Disallowed outbound connection destination (command=%proc.cmdline pid=%proc.pid connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
+  output: Disallowed outbound connection destination (command=%proc.cmdline connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network]

+- macro: consider_all_inbound_conns
+  condition: (never_true)
+
 - list: allowed_inbound_source_ipaddrs
  items: ['"127.0.0.1"']

@@ -413,12 +411,11 @@
 - rule: Unexpected inbound connection source
  desc: Detect any inbound connection from a source outside of an allowed set of ips, networks, or domain names
  condition: >
-    inbound and not
+    consider_all_inbound_conns and inbound and not
    ((fd.cip in (allowed_inbound_source_ipaddrs)) or
     (fd.cnet in (allowed_inbound_source_networks)) or
     (fd.cip.name in (allowed_inbound_source_domains)))
-  enabled: false
-  output: Disallowed inbound connection source (command=%proc.cmdline pid=%proc.pid connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
+  output: Disallowed inbound connection source (command=%proc.cmdline connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network]

@@ -461,29 +458,36 @@
    and not exe_running_docker_save
    and not user_known_shell_config_modifiers
  output: >
-    a shell configuration file has been modified (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid pcmdline=%proc.pcmdline file=%fd.name container_id=%container.id image=%container.image.repository)
+    a shell configuration file has been modified (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pcmdline=%proc.pcmdline file=%fd.name container_id=%container.id image=%container.image.repository)
  priority:
    WARNING
  tags: [file, mitre_persistence]

 # This rule is not enabled by default, as there are many legitimate
-# readers of shell config files.
+# readers of shell config files. If you want to enable it, modify the
+# following macro.
+
+- macro: consider_shell_config_reads
+  condition: (never_true)

 - rule: Read Shell Configuration File
  desc: Detect attempts to read shell configuration files by non-shell programs
  condition: >
    open_read and
+    consider_shell_config_reads and
    (fd.filename in (shell_config_filenames) or
     fd.name in (shell_config_files) or
     fd.directory in (shell_config_directories)) and
    (not proc.name in (shell_binaries))
-  enabled: false
  output: >
-    a shell configuration file was read by a non-shell program (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid file=%fd.name container_id=%container.id image=%container.image.repository)
+    a shell configuration file was read by a non-shell program (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline file=%fd.name container_id=%container.id image=%container.image.repository)
  priority:
    WARNING
  tags: [file, mitre_discovery]

+- macro: consider_all_cron_jobs
+  condition: (never_true)
+
 - macro: user_known_cron_jobs
  condition: (never_true)

@@ -492,10 +496,10 @@
  condition: >
    ((open_write and fd.name startswith /etc/cron) or
     (spawned_process and proc.name = "crontab")) and
+    consider_all_cron_jobs and
    not user_known_cron_jobs
-  enabled: false
  output: >
-    Cron jobs were scheduled to run (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid
+    Cron jobs were scheduled to run (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline
    file=%fd.name container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority:
    NOTICE
@@ -507,7 +511,7 @@
 # %container.info, without any leading term (file=%fd.name
 # %container.info user=%user.name user_loginuid=%user.loginuid, and not file=%fd.name
 # container=%container.info user=%user.name user_loginuid=%user.loginuid). The output will change
-# based on the context and whether or not -pk/-pm/-pc was specified on
+# based on the context and whether or not -pk/-pc was specified on
 # the command line.
 - macro: container
  condition: (container.id != host)
@@ -874,7 +878,7 @@
    and not exe_running_docker_save
    and not user_known_update_package_registry
  output: >
-    Repository files get updated (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid pcmdline=%proc.pcmdline file=%fd.name newpath=%evt.arg.newpath container_id=%container.id image=%container.image.repository)
+    Repository files get updated (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pcmdline=%proc.pcmdline file=%fd.name newpath=%evt.arg.newpath container_id=%container.id image=%container.image.repository)
  priority:
    NOTICE
  tags: [filesystem, mitre_persistence]
@@ -896,7 +900,7 @@
    and not user_known_write_below_binary_dir_activities
  output: >
    File below a known binary directory opened for writing (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository)
  priority: ERROR
  tags: [filesystem, mitre_persistence]

@@ -908,10 +912,7 @@
  items: [/boot, /lib, /lib64, /usr/lib, /usr/local/lib, /usr/local/sbin, /usr/local/bin, /root/.ssh]

 - macro: user_ssh_directory
-  condition: (fd.name contains '/.ssh/' and fd.name glob '/home/*/.ssh/*')
-
- macro: directory_traversal
-  condition: (fd.nameraw contains '../' and fd.nameraw glob '*../*../*')
+  condition: (fd.name glob '/home/*/.ssh/*')

 # google_accounts_(daemon)
 - macro: google_accounts_daemon_writing_ssh
@@ -952,28 +953,10 @@
    and not user_known_write_monitored_dir_conditions
  output: >
    File below a monitored directory opened for writing (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository)
  priority: ERROR
  tags: [filesystem, mitre_persistence]

-# ******************************************************************************
-# * "Directory traversal monitored file read" requires FALCO_ENGINE_VERSION 13 *
-# ******************************************************************************
-
- rule: Directory traversal monitored file read
-  desc: >
-    Web applications can be vulnerable to directory traversal attacks that allow accessing files outside of the web app's root directory (e.g. Arbitrary File Read bugs).
-    System directories like /etc are typically accessed via absolute paths. Access patterns outside of this (here path traversal) can be regarded as suspicious.
-    This rule includes failed file open attempts.
-  condition: (open_read or open_file_failed) and (etc_dir or user_ssh_directory or fd.name startswith /root/.ssh or fd.name contains "id_rsa") and directory_traversal and not proc.pname in (shell_binaries)
-  enabled: true
-  output: >
-    Read monitored file via directory traversal (username=%user.name useruid=%user.uid user_loginuid=%user.loginuid program=%proc.name exe=%proc.exepath
-    command=%proc.cmdline pid=%proc.pid parent=%proc.pname file=%fd.name fileraw=%fd.nameraw parent=%proc.pname
-    gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository returncode=%evt.res cwd=%proc.cwd)
-  priority: WARNING
-  tags: [filesystem, mitre_discovery, mitre_exfiltration, mitre_credential_access]
-
 # This rule is disabled by default as many system management tools
 # like ansible, etc can read these files/paths. Enable it using this macro.

@@ -990,7 +973,7 @@
  enabled: false
  output: >
    ssh-related file/directory read by non-ssh program (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline container_id=%container.id image=%container.image.repository)
  priority: ERROR
  tags: [filesystem, mitre_discovery]

@@ -1276,7 +1259,7 @@
 - rule: Write below etc
  desc: an attempt to write to any file below /etc
  condition: write_etc_common
-  output: "File below /etc opened for writing (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent=%proc.pname pcmdline=%proc.pcmdline file=%fd.name program=%proc.name gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4] container_id=%container.id image=%container.image.repository)"
+  output: "File below /etc opened for writing (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent=%proc.pname pcmdline=%proc.pcmdline file=%fd.name program=%proc.name gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4] container_id=%container.id image=%container.image.repository)"
  priority: ERROR
  tags: [filesystem, mitre_persistence]

@@ -1373,7 +1356,7 @@
    and not known_root_conditions
    and not user_known_write_root_conditions
    and not user_known_write_below_root_activities
-  output: "File below / or /root opened for writing (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent=%proc.pname file=%fd.name program=%proc.name container_id=%container.id image=%container.image.repository)"
+  output: "File below / or /root opened for writing (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent=%proc.pname file=%fd.name program=%proc.name container_id=%container.id image=%container.image.repository)"
  priority: ERROR
  tags: [filesystem, mitre_persistence]

@@ -1391,7 +1374,7 @@
  condition: sensitive_files and open_read and server_procs and not proc_is_new and proc.name!="sshd" and not user_known_read_sensitive_files_activities
  output: >
    Sensitive file opened for reading by trusted program after startup (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid parent=%proc.pname file=%fd.name parent=%proc.pname gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline parent=%proc.pname file=%fd.name parent=%proc.pname gparent=%proc.aname[2] container_id=%container.id image=%container.image.repository)
  priority: WARNING
  tags: [filesystem, mitre_credential_access]

@@ -1461,7 +1444,7 @@
    and not user_read_sensitive_file_containers
  output: >
    Sensitive file opened for reading by non-trusted program (user=%user.name user_loginuid=%user.loginuid program=%proc.name
-    command=%proc.cmdline pid=%proc.pid file=%fd.name parent=%proc.pname gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4] container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline file=%fd.name parent=%proc.pname gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4] container_id=%container.id image=%container.image.repository)
  priority: WARNING
  tags: [filesystem, mitre_credential_access, mitre_discovery]

@@ -1485,7 +1468,7 @@
    and not exe_running_docker_save
    and not amazon_linux_running_python_yum
    and not user_known_write_rpm_database_activities
-  output: "Rpm database opened for writing by a non-rpm program (command=%proc.cmdline pid=%proc.pid file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline container_id=%container.id image=%container.image.repository)"
+  output: "Rpm database opened for writing by a non-rpm program (command=%proc.cmdline file=%fd.name parent=%proc.pname pcmdline=%proc.pcmdline container_id=%container.id image=%container.image.repository)"
  priority: ERROR
  tags: [filesystem, software_mgmt, mitre_persistence]

@@ -1524,7 +1507,7 @@
    and not user_known_db_spawned_processes
  output: >
    Database-related program spawned process other than itself (user=%user.name user_loginuid=%user.loginuid
-    program=%proc.cmdline pid=%proc.pid parent=%proc.pname container_id=%container.id image=%container.image.repository)
+    program=%proc.cmdline parent=%proc.pname container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [process, database, mitre_execution]

@@ -1535,7 +1518,7 @@
  desc: an attempt to modify any file below a set of binary directories.
  condition: bin_dir_rename and modify and not package_mgmt_procs and not exe_running_docker_save and not user_known_modify_bin_dir_activities
  output: >
-    File below known binary directory renamed/removed (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid
+    File below known binary directory renamed/removed (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline
    pcmdline=%proc.pcmdline operation=%evt.type file=%fd.name %evt.args container_id=%container.id image=%container.image.repository)
  priority: ERROR
  tags: [filesystem, mitre_persistence]
@@ -1553,7 +1536,7 @@
    and not exe_running_docker_save
  output: >
    Directory below known binary directory created (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid directory=%evt.arg.path container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline directory=%evt.arg.path container_id=%container.id image=%container.image.repository)
  priority: ERROR
  tags: [filesystem, mitre_persistence]

@@ -1594,7 +1577,7 @@
    and not user_known_change_thread_namespace_activities
  enabled: false
  output: >
-    Namespace change (setns) by unexpected program (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid
+    Namespace change (setns) by unexpected program (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline
    parent=%proc.pname %container.info container_id=%container.id image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [process, mitre_privilege_escalation, mitre_lateral_movement]
@@ -1741,7 +1724,7 @@
    and not user_shell_container_exclusions
  output: >
    Shell spawned by untrusted binary (user=%user.name user_loginuid=%user.loginuid shell=%proc.name parent=%proc.pname
-    cmdline=%proc.cmdline pid=%proc.pid pcmdline=%proc.pcmdline gparent=%proc.aname[2] ggparent=%proc.aname[3]
+    cmdline=%proc.cmdline pcmdline=%proc.pcmdline gparent=%proc.aname[2] ggparent=%proc.aname[3]
    aname[4]=%proc.aname[4] aname[5]=%proc.aname[5] aname[6]=%proc.aname[6] aname[7]=%proc.aname[7] container_id=%container.id image=%container.image.repository)
  priority: DEBUG
  tags: [shell, mitre_execution]
@@ -1925,7 +1908,7 @@
    and not falco_privileged_containers
    and not user_privileged_containers
    and not redhat_image
-  output: Privileged container started (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag)
+  output: Privileged container started (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag)
  priority: INFO
  tags: [container, cis, mitre_privilege_escalation, mitre_lateral_movement]

@@ -1949,7 +1932,7 @@
    and excessively_capable_container
    and not falco_privileged_containers
    and not user_privileged_containers
-  output: Excessively capable container started (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag cap_permitted=%thread.cap_permitted)
+  output: Excessively capable container started (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag cap_permitted=%thread.cap_permitted)
  priority: INFO
  tags: [container, cis, mitre_privilege_escalation, mitre_lateral_movement]

@@ -1995,7 +1978,7 @@
    and sensitive_mount
    and not falco_sensitive_mount_containers
    and not user_sensitive_mount_containers
-  output: Container with sensitive mount started (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag mounts=%container.mounts)
+  output: Container with sensitive mount started (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag mounts=%container.mounts)
  priority: INFO
  tags: [container, cis, mitre_lateral_movement]

@@ -2015,7 +1998,7 @@
  desc: >
    Detect the initial process started by a container that is not in a list of allowed containers.
  condition: container_started and container and not allowed_containers
-  output: Container started and not in allowed list (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag)
+  output: Container started and not in allowed list (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag)
  priority: WARNING
  tags: [container, mitre_lateral_movement]

@@ -2030,7 +2013,7 @@
 - rule: System user interactive
  desc: an attempt to run interactive commands by a system (i.e. non-login) user
  condition: spawned_process and system_users and interactive and not user_known_system_user_login
-  output: "System user ran an interactive command (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid container_id=%container.id image=%container.image.repository)"
+  output: "System user ran an interactive command (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline container_id=%container.id image=%container.image.repository)"
  priority: INFO
  tags: [users, mitre_remote_access_tools]

@@ -2048,7 +2031,7 @@
    and not user_expected_terminal_shell_in_container_conditions
  output: >
    A shell was spawned in a container with an attached terminal (user=%user.name user_loginuid=%user.loginuid %container.info
-    shell=%proc.name parent=%proc.pname cmdline=%proc.cmdline pid=%proc.pid terminal=%proc.tty container_id=%container.id image=%container.image.repository)
+    shell=%proc.name parent=%proc.pname cmdline=%proc.cmdline terminal=%proc.tty container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [container, shell, mitre_execution]

@@ -2097,7 +2080,7 @@
 # This list allows for easy additions to the set of commands allowed
 # to run shells in containers without having to without having to copy
 # and override the entire run shell in container macro. Once
-# https://github.com/falcosecurity/falco/issues/255 is fixed this will be a
+# https://github.com/draios/falco/issues/255 is fixed this will be a
 # bit easier, as someone could append of any of the existing lists.
 - list: user_known_shell_spawn_binaries
  items: []
@@ -2124,7 +2107,7 @@
    and not user_expected_system_procs_network_activity_conditions
  output: >
    Known system binary sent/received network traffic
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid connection=%fd.name container_id=%container.id image=%container.image.repository)
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline connection=%fd.name container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network, mitre_exfiltration]

@@ -2160,37 +2143,43 @@
    http_proxy_procs and
    not allowed_ssh_proxy_env and
    proc.env icontains HTTP_PROXY
-  enabled: false
  output: >
    Program run with disallowed HTTP_PROXY environment variable
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid env=%proc.env parent=%proc.pname container_id=%container.id image=%container.image.repository)
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline env=%proc.env parent=%proc.pname container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [host, users]

 # In some environments, any attempt by a interpreted program (perl,
 # python, ruby, etc) to listen for incoming connections or perform
 # outgoing connections might be suspicious. These rules are not
-# enabled by default.
+# enabled by default, but you can modify the following macros to
+# enable them.
+
+- macro: consider_interpreted_inbound
+  condition: (never_true)
+
+- macro: consider_interpreted_outbound
+  condition: (never_true)

 - rule: Interpreted procs inbound network activity
  desc: Any inbound network activity performed by any interpreted program (perl, python, ruby, etc.)
  condition: >
-    (inbound and interpreted_procs)
-  enabled: false
+    (inbound and consider_interpreted_inbound
+     and interpreted_procs)
  output: >
    Interpreted program received/listened for network traffic
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid connection=%fd.name container_id=%container.id image=%container.image.repository)
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline connection=%fd.name container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network, mitre_exfiltration]

 - rule: Interpreted procs outbound network activity
  desc: Any outbound network activity performed by any interpreted program (perl, python, ruby, etc.)
  condition: >
-    (outbound and interpreted_procs)
-  enabled: false
+    (outbound and consider_interpreted_outbound
+     and interpreted_procs)
  output: >
    Interpreted program performed outgoing network connection
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid connection=%fd.name container_id=%container.id image=%container.image.repository)
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline connection=%fd.name container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network, mitre_exfiltration]

@@ -2229,7 +2218,7 @@
  enabled: false
  output: >
    Unexpected UDP Traffic Seen
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid connection=%fd.name proto=%fd.l4proto evt=%evt.type %evt.args container_id=%container.id image=%container.image.repository)
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline connection=%fd.name proto=%fd.l4proto evt=%evt.type %evt.args container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network, mitre_exfiltration]

@@ -2289,7 +2278,7 @@
    and not user_known_non_sudo_setuid_conditions
  output: >
    Unexpected setuid call by non-sudo, non-root program (user=%user.name user_loginuid=%user.loginuid cur_uid=%user.uid parent=%proc.pname
-    command=%proc.cmdline pid=%proc.pid uid=%evt.arg.uid container_id=%container.id image=%container.image.repository)
+    command=%proc.cmdline uid=%evt.arg.uid container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [users, mitre_privilege_escalation]

@@ -2321,7 +2310,7 @@
    not user_known_user_management_activities
  output: >
    User management binary command run outside of container
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent=%proc.pname gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4])
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent=%proc.pname gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4])
  priority: NOTICE
  tags: [host, users, mitre_persistence]

@@ -2345,7 +2334,7 @@
    and not fd.name in (allowed_dev_files)
    and not fd.name startswith /dev/tty
    and not user_known_create_files_below_dev_activities
-  output: "File created below /dev by untrusted program (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid file=%fd.name container_id=%container.id image=%container.image.repository)"
+  output: "File created below /dev by untrusted program (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline file=%fd.name container_id=%container.id image=%container.image.repository)"
  priority: ERROR
  tags: [filesystem, mitre_persistence]

@@ -2367,13 +2356,16 @@
 - rule: Contact EC2 Instance Metadata Service From Container
  desc: Detect attempts to contact the EC2 Instance Metadata Service from a container
  condition: outbound and fd.sip="169.254.169.254" and container and not ec2_metadata_containers
-  output: Outbound connection to EC2 instance metadata service (command=%proc.cmdline pid=%proc.pid connection=%fd.name %container.info image=%container.image.repository:%container.image.tag)
+  output: Outbound connection to EC2 instance metadata service (command=%proc.cmdline connection=%fd.name %container.info image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [network, aws, container, mitre_discovery]


 # This rule is not enabled by default, since this rule is for cloud environment(GCP, AWS and Azure) only.
-# You can filter the container that you want to allow access to metadata by overwriting user_known_metadata_access macro.
+# If you want to enable this rule, overwrite the first macro,
+# And you can filter the container that you want to allow access to metadata by overwriting the second macro.
+- macro: consider_metadata_access
+  condition: (never_true)

 - macro: user_known_metadata_access
  condition: (k8s.ns.name = "kube-system")
@@ -2382,9 +2374,8 @@
 # metadata about the instance. The metadata could be used to get credentials by attackers.
 - rule: Contact cloud metadata service from container
  desc: Detect attempts to contact the Cloud Instance Metadata Service from a container
-  condition: outbound and fd.sip="169.254.169.254" and container and not user_known_metadata_access
-  enabled: false
-  output: Outbound connection to cloud instance metadata service (command=%proc.cmdline pid=%proc.pid connection=%fd.name %container.info image=%container.image.repository:%container.image.tag)
+  condition: outbound and fd.sip="169.254.169.254" and container and consider_metadata_access and not user_known_metadata_access
+  output: Outbound connection to cloud instance metadata service (command=%proc.cmdline connection=%fd.name %container.info image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [network, container, mitre_discovery]

@@ -2412,9 +2403,7 @@
     quay.io/prometheus-operator/prometheus-operator,
     k8s.gcr.io/ingress-nginx/kube-webhook-certgen, quay.io/spotahome/redis-operator,
     registry.opensource.zalan.do/acid/postgres-operator, registry.opensource.zalan.do/acid/postgres-operator-ui,
-     rabbitmqoperator/cluster-operator,
-     falcosecurity/falco-no-driver, docker.io/falcosecurity/falco-no-driver,
-     public.ecr.aws/falcosecurity/falco-no-driver)
+     rabbitmqoperator/cluster-operator)
     or (k8s.ns.name = "kube-system"))

 - macro: k8s_api_server
@@ -2432,7 +2421,7 @@
    not k8s_containers and
    k8s_api_server and
    not user_known_contact_k8s_api_server_activities
-  output: Unexpected connection to K8s API Server from container (command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag connection=%fd.name)
+  output: Unexpected connection to K8s API Server from container (command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag connection=%fd.name)
  priority: NOTICE
  tags: [network, k8s, container, mitre_discovery]

@@ -2448,7 +2437,7 @@
 - rule: Unexpected K8s NodePort Connection
  desc: Detect attempts to use K8s NodePorts from a container
  condition: (inbound_outbound) and fd.sport >= 30000 and fd.sport <= 32767 and container and not nodeport_containers
-  output: Unexpected K8s NodePort Connection (command=%proc.cmdline pid=%proc.pid connection=%fd.name container_id=%container.id image=%container.image.repository)
+  output: Unexpected K8s NodePort Connection (command=%proc.cmdline connection=%fd.name container_id=%container.id image=%container.image.repository)
  priority: NOTICE
  tags: [network, k8s, container, mitre_port_knocking]

@@ -2485,7 +2474,7 @@
    and not pkg_mgmt_in_kube_proxy
  output: >
    Package management process launched in container (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
+    command=%proc.cmdline container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority: ERROR
  tags: [process, mitre_persistence]

@@ -2499,7 +2488,7 @@
    )
  output: >
    Netcat runs inside container that allows remote code execution (user=%user.name user_loginuid=%user.loginuid
-    command=%proc.cmdline pid=%proc.pid container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
+    command=%proc.cmdline container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority: WARNING
  tags: [network, process, mitre_execution]

@@ -2511,7 +2500,7 @@
  condition: >
    spawned_process and container and network_tool_procs and not user_known_network_tool_activities
  output: >
-    Network tool launched in container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent_process=%proc.pname
+    Network tool launched in container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent_process=%proc.pname
    container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [network, process, mitre_discovery, mitre_exfiltration]
@@ -2531,7 +2520,7 @@
    network_tool_procs and
    not user_known_network_tool_activities
  output: >
-    Network tool launched on host (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent_process=%proc.pname)
+    Network tool launched on host (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent_process=%proc.pname)
  priority: NOTICE
  tags: [network, process, mitre_discovery, mitre_exfiltration]

@@ -2567,7 +2556,7 @@
    )
  output: >
    Grep private keys or passwords activities found
-    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid container_id=%container.id container_name=%container.name
+    (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline container_id=%container.id container_name=%container.name
    image=%container.image.repository:%container.image.tag)
  priority:
    WARNING
@@ -2601,7 +2590,7 @@
    not trusted_logging_images and
    not allowed_clear_log_files
  output: >
-    Log files were tampered (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid file=%fd.name container_id=%container.id image=%container.image.repository)
+    Log files were tampered (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline file=%fd.name container_id=%container.id image=%container.image.repository)
  priority:
    WARNING
  tags: [file, mitre_defense_evasion]
@@ -2619,7 +2608,7 @@
  desc: Detect process running to clear bulk data from disk
  condition: spawned_process and clear_data_procs and not user_known_remove_data_activities
  output: >
-    Bulk data has been removed from disk (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid file=%fd.name container_id=%container.id image=%container.image.repository)
+    Bulk data has been removed from disk (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline file=%fd.name container_id=%container.id image=%container.image.repository)
  priority:
    WARNING
  tags: [process, mitre_persistence]
@@ -2660,7 +2649,7 @@
       not var_lib_docker_filepath and
       not proc.name in (docker_binaries)
  output: >
-    Shell history had been deleted or renamed (user=%user.name user_loginuid=%user.loginuid type=%evt.type command=%proc.cmdline pid=%proc.pid fd.name=%fd.name name=%evt.arg.name path=%evt.arg.path oldpath=%evt.arg.oldpath %container.info)
+    Shell history had been deleted or renamed (user=%user.name user_loginuid=%user.loginuid type=%evt.type command=%proc.cmdline fd.name=%fd.name name=%evt.arg.name path=%evt.arg.path oldpath=%evt.arg.oldpath %container.info)
  priority:
    WARNING
  tags: [process, mitre_defense_evasion]
@@ -2673,11 +2662,14 @@
    ((spawned_process and proc.name in (shred, rm, mv) and proc.args contains "bash_history") or
     (open_write and fd.name contains "bash_history" and evt.arg.flags contains "O_TRUNC"))
  output: >
-    Shell history had been deleted or renamed (user=%user.name user_loginuid=%user.loginuid type=%evt.type command=%proc.cmdline pid=%proc.pid fd.name=%fd.name name=%evt.arg.name path=%evt.arg.path oldpath=%evt.arg.oldpath %container.info)
+    Shell history had been deleted or renamed (user=%user.name user_loginuid=%user.loginuid type=%evt.type command=%proc.cmdline fd.name=%fd.name name=%evt.arg.name path=%evt.arg.path oldpath=%evt.arg.oldpath %container.info)
  priority:
    WARNING
  tags: [process, mitre_defense_evasion]

+- macro: consider_all_chmods
+  condition: (always_true)
+
 - list: user_known_chmod_applications
  items: [hyperkube, kubelet, k3s-agent]

@@ -2693,14 +2685,14 @@
    this means that the application will run with the privileges of the owning user or group respectively.
    Detect setuid or setgid bits set via chmod
  condition: >
-    chmod and (evt.arg.mode contains "S_ISUID" or evt.arg.mode contains "S_ISGID")
+    consider_all_chmods and chmod and (evt.arg.mode contains "S_ISUID" or evt.arg.mode contains "S_ISGID")
    and not proc.name in (user_known_chmod_applications)
    and not exe_running_docker_save
    and not user_known_set_setuid_or_setgid_bit_conditions
  enabled: false
  output: >
    Setuid or setgid bit is set via chmod (fd=%evt.arg.fd filename=%evt.arg.filename mode=%evt.arg.mode user=%user.name user_loginuid=%user.loginuid process=%proc.name
-    command=%proc.cmdline pid=%proc.pid container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
+    command=%proc.cmdline container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority:
    NOTICE
  tags: [process, mitre_persistence]
@@ -2708,7 +2700,10 @@
 - list: exclude_hidden_directories
  items: [/root/.cassandra]

-# The rule is disabled by default.
+# To use this rule, you should modify consider_hidden_file_creation.
+- macro: consider_hidden_file_creation
+  condition: (never_true)
+
 - macro: user_known_create_hidden_file_activities
  condition: (never_true)

@@ -2718,11 +2713,11 @@
    ((modify and evt.arg.newpath contains "/.") or
     (mkdir and evt.arg.path contains "/.") or
     (open_write and evt.arg.flags contains "O_CREAT" and fd.name contains "/." and not fd.name pmatch (exclude_hidden_directories))) and
+    consider_hidden_file_creation and
    not user_known_create_hidden_file_activities
    and not exe_running_docker_save
-  enabled: false
  output: >
-    Hidden file or directory created (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid
+    Hidden file or directory created (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline
    file=%fd.name newpath=%evt.arg.newpath container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority:
    NOTICE
@@ -2747,7 +2742,7 @@
    and remote_file_copy_procs
    and not user_known_remote_file_copy_activities
  output: >
-    Remote file copy tool launched in container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent_process=%proc.pname
+    Remote file copy tool launched in container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent_process=%proc.pname
    container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [network, process, mitre_lateral_movement, mitre_exfiltration]
@@ -2758,7 +2753,7 @@
    create_symlink and
    (evt.arg.target in (sensitive_file_names) or evt.arg.target in (sensitive_directory_names))
  output: >
-    Symlinks created over sensitive files (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid target=%evt.arg.target linkpath=%evt.arg.linkpath parent_process=%proc.pname)
+    Symlinks created over sensitive files (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline target=%evt.arg.target linkpath=%evt.arg.linkpath parent_process=%proc.pname)
  priority: WARNING
  tags: [file, mitre_exfiltration]

@@ -2768,7 +2763,7 @@
    create_hardlink and
    (evt.arg.oldpath in (sensitive_file_names))
  output: >
-    Hardlinks created over sensitive files (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid target=%evt.arg.oldpath linkpath=%evt.arg.newpath parent_process=%proc.pname)
+    Hardlinks created over sensitive files (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline target=%evt.arg.oldpath linkpath=%evt.arg.newpath parent_process=%proc.pname)
  priority: WARNING
  tags: [file, mitre_exfiltration]

@@ -2873,14 +2868,14 @@
  desc: Miners typically connect to miner pools on common ports.
  condition: net_miner_pool and not trusted_images_query_miner_domain_dns
  enabled: false
-  output: Outbound connection to IP/Port flagged by https://cryptoioc.ch (command=%proc.cmdline pid=%proc.pid port=%fd.rport ip=%fd.rip container=%container.info image=%container.image.repository)
+  output: Outbound connection to IP/Port flagged by https://cryptoioc.ch (command=%proc.cmdline port=%fd.rport ip=%fd.rip container=%container.info image=%container.image.repository)
  priority: CRITICAL
  tags: [network, mitre_execution]

 - rule: Detect crypto miners using the Stratum protocol
  desc: Miners typically specify the mining pool to connect to with a URI that begins with 'stratum+tcp'
  condition: spawned_process and (proc.cmdline contains "stratum+tcp" or proc.cmdline contains "stratum2+tcp" or proc.cmdline contains "stratum+ssl" or proc.cmdline contains "stratum2+ssl")
-  output: Possible miner running (command=%proc.cmdline pid=%proc.pid container=%container.info image=%container.image.repository)
+  output: Possible miner running (command=%proc.cmdline container=%container.info image=%container.image.repository)
  priority: CRITICAL
  tags: [process, mitre_execution]

@@ -2910,20 +2905,30 @@
 - rule: The docker client is executed in a container
  desc: Detect a k8s client tool executed inside a container
  condition: spawned_process and container and not user_known_k8s_client_container_parens and proc.name in (k8s_client_binaries)
-  output: "Docker or kubernetes client executed in container (user=%user.name user_loginuid=%user.loginuid %container.info parent=%proc.pname cmdline=%proc.cmdline pid=%proc.pid image=%container.image.repository:%container.image.tag)"
+  output: "Docker or kubernetes client executed in container (user=%user.name user_loginuid=%user.loginuid %container.info parent=%proc.pname cmdline=%proc.cmdline image=%container.image.repository:%container.image.tag)"
  priority: WARNING
  tags: [container, mitre_execution]

+
+# This rule is enabled by default.
+# If you want to disable it, modify the following macro.
+- macro: consider_packet_socket_communication
+  condition: (always_true)
+
 - list: user_known_packet_socket_binaries
  items: []

 - rule: Packet socket created in container
  desc: Detect new packet socket at the device driver (OSI Layer 2) level in a container. Packet socket could be used for ARP Spoofing and privilege escalation(CVE-2020-14386) by attacker.
-  condition: evt.type=socket and evt.arg[0]=AF_PACKET and container and not proc.name in (user_known_packet_socket_binaries)
-  output: Packet socket was created in a container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid socket_info=%evt.args container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
+  condition: evt.type=socket and evt.arg[0]=AF_PACKET and consider_packet_socket_communication and container and not proc.name in (user_known_packet_socket_binaries)
+  output: Packet socket was created in a container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline socket_info=%evt.args container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [network, mitre_discovery]

+# Change to (always_true) to enable rule 'Network connection outside local subnet'
+- macro: enabled_rule_network_only_subnet
+  condition: (never_true)
+
 # Namespaces where the rule is enforce
 - list: namespace_scope_network_only_subnet
  items: []
@@ -2934,8 +2939,8 @@
    fd.ip = "0.0.0.0" or
    fd.net = "127.0.0.0/8"

-# # The rule is disabled by default.
 # # How to test:
+# # Change macro enabled_rule_network_only_subnet to condition: always_true
 # # Add 'default' to namespace_scope_network_only_subnet
 # # Run:
 # kubectl run --generator=run-pod/v1 -n default -i --tty busybox --image=busybox --rm -- wget google.com -O /var/google.html
@@ -2944,19 +2949,22 @@
 - rule: Network Connection outside Local Subnet
  desc: Detect traffic to image outside local subnet.
  condition: >
+    enabled_rule_network_only_subnet and
    inbound_outbound and
    container and
    not network_local_subnet and
    k8s.ns.name in (namespace_scope_network_only_subnet)
-  enabled: false
  output: >
    Network connection outside local subnet
-    (command=%proc.cmdline pid=%proc.pid connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id
+    (command=%proc.cmdline connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id
     image=%container.image.repository namespace=%k8s.ns.name
     fd.rip.name=%fd.rip.name fd.lip.name=%fd.lip.name fd.cip.name=%fd.cip.name fd.sip.name=%fd.sip.name)
  priority: WARNING
  tags: [network]

+- macro: allowed_port
+  condition: (never_true)
+
 - list: allowed_image
  items: [] # add image to monitor, i.e.: bitnami/nginx

@@ -2977,15 +2985,15 @@
 - rule: Outbound or Inbound Traffic not to Authorized Server Process and Port
  desc: Detect traffic that is not to authorized server process and port.
  condition: >
+    allowed_port and
    inbound_outbound and
    container and
    container.image.repository in (allowed_image) and
    not proc.name in (authorized_server_binary) and
    not fd.sport in (authorized_server_port)
-  enabled: false
  output: >
    Network connection outside authorized port and binary
-    (command=%proc.cmdline pid=%proc.pid connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id
+    (command=%proc.cmdline connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id
    image=%container.image.repository)
  priority: WARNING
  tags: [network]
@@ -3000,7 +3008,7 @@
  desc: Detect redirecting stdout/stdin to network connection in container (potential reverse shell).
  condition: dup and container and evt.rawres in (0, 1, 2) and fd.type in ("ipv4", "ipv6") and not user_known_stand_streams_redirect_activities
  output: >
-    Redirect stdout/stdin to network connection (user=%user.name user_loginuid=%user.loginuid %container.info process=%proc.name parent=%proc.pname cmdline=%proc.cmdline pid=%proc.pid terminal=%proc.tty container_id=%container.id image=%container.image.repository fd.name=%fd.name fd.num=%fd.num fd.type=%fd.type fd.sip=%fd.sip)
+    Redirect stdout/stdin to network connection (user=%user.name user_loginuid=%user.loginuid %container.info process=%proc.name parent=%proc.pname cmdline=%proc.cmdline terminal=%proc.tty container_id=%container.id image=%container.image.repository fd.name=%fd.name fd.num=%fd.num fd.type=%fd.type fd.sip=%fd.sip)
  priority: NOTICE

 # The two Container Drift rules below will fire when a new executable is created in a container.
@@ -3011,7 +3019,7 @@
 # Two things to pay attention to:
 #   1) In most cases, 'docker cp' will not be identified, but the assumption is that if an attacker gained access to the container runtime daemon, they are already privileged
 #   2) Drift rules will be noisy in environments in which containers are built (e.g. docker build)
-# These two rules are not enabled by default.
+# These two rules are not enabled by default. Use `never_true` in macro condition to enable them.

 - macro: user_known_container_drift_activities
  condition: (always_true)
@@ -3020,6 +3028,7 @@
  desc: New executable created in a container due to chmod
  condition: >
    chmod and
+    consider_all_chmods and
    container and
    not runc_writing_exec_fifo and
    not runc_writing_var_lib_docker and
@@ -3028,8 +3037,7 @@
    ((evt.arg.mode contains "S_IXUSR") or
    (evt.arg.mode contains "S_IXGRP") or
    (evt.arg.mode contains "S_IXOTH"))
-  enabled: false
-  output: Drift detected (chmod), new executable created in a container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid filename=%evt.arg.filename name=%evt.arg.name mode=%evt.arg.mode event=%evt.type)
+  output: Drift detected (chmod), new executable created in a container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline filename=%evt.arg.filename name=%evt.arg.name mode=%evt.arg.mode event=%evt.type)
  priority: ERROR

 # ****************************************************************************
@@ -3045,8 +3053,7 @@
    not runc_writing_var_lib_docker and
    not user_known_container_drift_activities and
    evt.rawres>=0
-  enabled: false
-  output: Drift detected (open+create), new executable created in a container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid filename=%evt.arg.filename name=%evt.arg.name mode=%evt.arg.mode event=%evt.type)
+  output: Drift detected (open+create), new executable created in a container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline filename=%evt.arg.filename name=%evt.arg.name mode=%evt.arg.mode event=%evt.type)
  priority: ERROR

 - list: c2_server_ip_list
@@ -3055,7 +3062,7 @@
 - rule: Outbound Connection to C2 Servers
  desc: Detect outbound connection to command & control servers
  condition: outbound and fd.sip in (c2_server_ip_list)
-  output: Outbound connection to C2 server (command=%proc.cmdline pid=%proc.pid connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
+  output: Outbound connection to C2 server (command=%proc.cmdline connection=%fd.name user=%user.name user_loginuid=%user.loginuid container_id=%container.id image=%container.image.repository)
  priority: WARNING
  tags: [network]

@@ -3090,7 +3097,7 @@
 - rule: Sudo Potential Privilege Escalation
  desc: Privilege escalation vulnerability affecting sudo (<= 1.9.5p2). Executing sudo using sudoedit -s or sudoedit -i command with command-line argument that ends with a single backslash character from an unprivileged user it's possible to elevate the user privileges to root.
  condition: spawned_process and user.uid != 0 and (proc.name=sudoedit or proc.name = sudo) and (proc.args contains -s or proc.args contains -i or proc.args contains --login) and (proc.args contains "\ " or proc.args endswith \)
-  output: "Detect Sudo Privilege Escalation Exploit (CVE-2021-3156) (user=%user.name parent=%proc.pname cmdline=%proc.cmdline pid=%proc.pid %container.info)"
+  output: "Detect Sudo Privilege Escalation Exploit (CVE-2021-3156) (user=%user.name parent=%proc.pname cmdline=%proc.cmdline %container.info)"
  priority: CRITICAL
  tags: [filesystem, mitre_privilege_escalation]

@@ -3100,18 +3107,13 @@
    spawned_process and container
    and container.privileged=true
    and proc.name=debugfs
-  output: Debugfs launched started in a privileged container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag)
+  output: Debugfs launched started in a privileged container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag)
  priority: WARNING
  tags: [container, cis, mitre_lateral_movement]

 - macro: mount_info
  condition: (proc.args="" or proc.args intersects ("-V", "-l", "-h"))

- macro: known_gke_mount_in_privileged_containers
-  condition:
-    (k8s.ns.name = kube-system
-    and container.image.repository = gke.gcr.io/gcp-compute-persistent-disk-csi-driver)
-
 - macro: user_known_mount_in_privileged_containers
  condition: (never_true)

@@ -3122,23 +3124,26 @@
    and container.privileged=true
    and proc.name=mount
    and not mount_info
-    and not known_gke_mount_in_privileged_containers
    and not user_known_mount_in_privileged_containers
-  output: Mount was executed inside a privileged container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag)
+  output: Mount was executed inside a privileged container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag)
  priority: WARNING
  tags: [container, cis, mitre_lateral_movement]

+- macro: consider_userfaultfd_activities
+  condition: (always_true)
+
 - list: user_known_userfaultfd_processes
  items: []

 - rule: Unprivileged Delegation of Page Faults Handling to a Userspace Process
  desc: Detect a successful unprivileged userfaultfd syscall which might act as an attack primitive to exploit other bugs
  condition: >
+    consider_userfaultfd_activities and
    evt.type = userfaultfd and
    user.uid != 0 and
    (evt.rawres >= 0 or evt.res != -1) and
    not proc.name in (user_known_userfaultfd_processes)
-  output: An userfaultfd syscall was successfully executed by an unprivileged user (user=%user.name user_loginuid=%user.loginuid process=%proc.name command=%proc.cmdline pid=%proc.pid %container.info image=%container.image.repository:%container.image.tag)
+  output: An userfaultfd syscall was successfully executed by an unprivileged user (user=%user.name user_loginuid=%user.loginuid process=%proc.name command=%proc.cmdline %container.info image=%container.image.repository:%container.image.tag)
  priority: CRITICAL
  tags: [syscall, mitre_defense_evasion]

@@ -3168,7 +3173,7 @@
    (ingress_remote_file_copy_procs or curl_download) and
    not user_known_ingress_remote_file_copy_activities
  output: >
-    Ingress remote file copy tool launched in container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline pid=%proc.pid parent_process=%proc.pname
+    Ingress remote file copy tool launched in container (user=%user.name user_loginuid=%user.loginuid command=%proc.cmdline parent_process=%proc.pname
    container_id=%container.id container_name=%container.name image=%container.image.repository:%container.image.tag)
  priority: NOTICE
  tags: [network, process, mitre_command_and_control]
@@ -3180,7 +3185,7 @@
  condition:
    spawned_process and user.uid != 0 and proc.name=pkexec and proc.args = ''
  output:
-    "Detect Polkit pkexec Local Privilege Escalation Exploit (CVE-2021-4034) (user=%user.loginname uid=%user.loginuid command=%proc.cmdline pid=%proc.pid args=%proc.args)"
+    "Detect Polkit pkexec Local Privilege Escalation Exploit (CVE-2021-4034) (user=%user.loginname uid=%user.loginuid command=%proc.cmdline args=%proc.args)"
  priority: CRITICAL
  tags: [process, mitre_privilege_escalation]

@@ -3203,40 +3208,10 @@
  desc: Detected Java process downloading a class file which could indicate a successful exploit of the log4shell Log4j vulnerability (CVE-2021-44228)
  condition: >
        java_network_read and evt.buffer bcontains cafebabe
-  output: Java process class file download (user=%user.name user_loginname=%user.loginname user_loginuid=%user.loginuid event=%evt.type connection=%fd.name server_ip=%fd.sip server_port=%fd.sport proto=%fd.l4proto process=%proc.name command=%proc.cmdline pid=%proc.pid parent=%proc.pname buffer=%evt.buffer container_id=%container.id image=%container.image.repository)
+  output: Java process class file download (user=%user.name user_loginname=%user.loginname user_loginuid=%user.loginuid event=%evt.type connection=%fd.name server_ip=%fd.sip server_port=%fd.sport proto=%fd.l4proto process=%proc.name command=%proc.cmdline parent=%proc.pname buffer=%evt.buffer container_id=%container.id image=%container.image.repository)
  priority: CRITICAL
  tags: [mitre_initial_access]

- list: docker_binaries
-  items: [dockerd, containerd-shim, "runc:[1:CHILD]", pause]
-
- macro: docker_procs
-  condition: proc.name in (docker_binaries)
-
- rule: Modify Container Entrypoint
-  desc: This rule detect an attempt to write on container entrypoint symlink (/proc/self/exe). Possible CVE-2019-5736 Container Breakout exploitation attempt.
-  condition: >
-    open_write and container and (fd.name=/proc/self/exe or fd.name startswith /proc/self/fd/) and not docker_procs and not proc.cmdline = "runc:[1:CHILD] init"
-  enabled: false
-  output: >
-    Detect Potential Container Breakout Exploit (CVE-2019-5736) (user=%user.name process=%proc.name file=%fd.name cmdline=%proc.cmdline pid=%proc.pid %container.info)
-  priority: WARNING
-  tags: [container, filesystem, mitre_initial_access]
-
 # Application rules have moved to application_rules.yaml. Please look
 # there if you want to enable them by adding to
 # falco_rules.local.yaml.
-
- list: known_binaries_to_read_environment_variables_from_proc_files
-  items: [scsi_id, argoexec]
-
- rule: Read environment variable from /proc files
-  desc: An attempt to read process environment variables from /proc files
-  condition: >
-    open_read and container and (fd.name glob /proc/*/environ)
-    and not proc.name in (known_binaries_to_read_environment_variables_from_proc_files)
-  output: >
-    Environment variables were retrieved from /proc files (user=%user.name user_loginuid=%user.loginuid program=%proc.name
-    command=%proc.cmdline pid=%proc.pid file=%fd.name parent=%proc.pname gparent=%proc.aname[2] ggparent=%proc.aname[3] gggparent=%proc.aname[4] container_id=%container.id image=%container.image.repository)
-  priority: WARNING
-  tags: [filesystem, mitre_credential_access, mitre_discovery]
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -22,9 +22,6 @@ configure_file(debian/prerm.in debian/prerm)
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/debian/falco.service"
 	DESTINATION "${PROJECT_BINARY_DIR}/scripts/debian")

-file(COPY "${PROJECT_SOURCE_DIR}/scripts/debian/falco_inject_kmod.service"
-	DESTINATION "${PROJECT_BINARY_DIR}/scripts/debian")
-
 configure_file(rpm/postinstall.in rpm/postinstall)
 configure_file(rpm/postuninstall.in rpm/postuninstall)
 configure_file(rpm/preuninstall.in rpm/preuninstall)
@@ -32,9 +29,6 @@ configure_file(rpm/preuninstall.in rpm/preuninstall)
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/rpm/falco.service"
 	DESTINATION "${PROJECT_BINARY_DIR}/scripts/rpm")

-file(COPY "${PROJECT_SOURCE_DIR}/scripts/rpm/falco_inject_kmod.service"
-	DESTINATION "${PROJECT_BINARY_DIR}/scripts/rpm")
-
 configure_file(falco-driver-loader falco-driver-loader @ONLY)

 if(CMAKE_SYSTEM_NAME MATCHES "Linux")
--- a/scripts/debian/falco.service
+++ b/scripts/debian/falco.service
@@ -1,12 +1,11 @@
 [Unit]
 Description=Falco: Container Native Runtime Security
 Documentation=https://falco.org/docs/
-After=falco_inject_kmod.service
-Requires=falco_inject_kmod.service

 [Service]
 Type=simple
 User=root
+ExecStartPre=/sbin/modprobe falco
 ExecStart=/usr/bin/falco --pidfile=/var/run/falco.pid
 ExecStopPost=/sbin/rmmod falco
 UMask=0077
@@ -18,7 +17,6 @@ NoNewPrivileges=yes
 ProtectHome=read-only
 ProtectSystem=full
 ProtectKernelTunables=true
-ReadWritePaths=/sys/module/falco
 RestrictRealtime=true
 RestrictAddressFamilies=~AF_PACKET

--- a/scripts/debian/falco_inject_kmod.service
+++ b/scripts/debian/falco_inject_kmod.service
@@ -1,13 +0,0 @@
-[Unit]
-Description=Falco: Container Native Runtime Security
-Documentation=https://falco.org/docs/
-Before=falco.service
-Wants=falco.service
-
-[Service]
-Type=oneshot
-User=root
-ExecStart=/sbin/modprobe falco
-
-[Install]
-WantedBy=multi-user.target
--- a/scripts/debian/postinst.in
+++ b/scripts/debian/postinst.in
@@ -41,34 +41,3 @@ case "$1" in
 		fi
 	;;
 esac
-
-# Based off what debhelper dh_systemd_enable/13.3.4 would have added
-# ref: https://www.debian.org/doc/manuals/debmake-doc/ch05.en.html#debhelper
-
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
-        # This will only remove masks created by d-s-h on package removal.
-        deb-systemd-helper unmask 'falco.service' >/dev/null || true
-
-        # was-enabled defaults to true, so new installations run enable.
-        if deb-systemd-helper --quiet was-enabled 'falco.service'; then
-                # Enables the unit on first installation, creates new
-                # symlinks on upgrades if the unit file has changed.
-                deb-systemd-helper enable 'falco.service' >/dev/null || true
-        else
-                # Update the statefile to add new symlinks (if any), which need to be
-                # cleaned up on purge. Also remove old symlinks.
-                deb-systemd-helper update-state 'falco.service' >/dev/null || true
-        fi
-fi
-
-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
-        if [ -d /run/systemd/system ]; then
-                systemctl --system daemon-reload >/dev/null || true
-                if [ -n "$2" ]; then
-                        _dh_action=restart
-                else
-                        _dh_action=start
-                fi
-                deb-systemd-invoke $_dh_action 'falco.service' >/dev/null || true
-        fi
-fi
--- a/scripts/debian/postrm.in
+++ b/scripts/debian/postrm.in
@@ -15,25 +15,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-# Based off what debhelper dh_systemd_enable/13.3.4 would have added
-# ref: https://www.debian.org/doc/manuals/debmake-doc/ch05.en.html#debhelper
-
-set -e
-
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
-        systemctl --system daemon-reload >/dev/null || true
-fi
-
-if [ "$1" = "remove" ]; then
-        if [ -x "/usr/bin/deb-systemd-helper" ]; then
-                deb-systemd-helper mask 'falco.service' >/dev/null || true
-        fi
-fi
-
-if [ "$1" = "purge" ]; then
-        if [ -x "/usr/bin/deb-systemd-helper" ]; then
-                deb-systemd-helper purge 'falco.service' >/dev/null || true
-                deb-systemd-helper unmask 'falco.service' >/dev/null || true
-        fi
-fi
--- a/scripts/debian/prerm.in
+++ b/scripts/debian/prerm.in
@@ -17,14 +17,6 @@
 #
 set -e

-# Based off what debhelper dh_systemd_enable/13.3.4 would have added
-# ref: https://www.debian.org/doc/manuals/debmake-doc/ch05.en.html#debhelper
-# Currently running falco service uses the driver, so stop it before driver cleanup
-
-if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
-        deb-systemd-invoke stop 'falco.service' >/dev/null || true
-fi
-
 case "$1" in
 	remove|upgrade|deconfigure)
 		/usr/bin/falco-driver-loader --clean
--- a/scripts/falco-driver-loader
+++ b/scripts/falco-driver-loader
@@ -113,14 +113,11 @@ get_target_id() {
 	elif [ -f "${HOST_ROOT}/etc/centos-release" ]; then
 		# Older CentOS distros
 		OS_ID=centos
-	else
-		return 1
-	fi
-
-	# Overwrite the OS_ID if /etc/VERSION file is present.
-	# Not sure if there is a better way to detect minikube.
-	if [ -f "${HOST_ROOT}/etc/VERSION" ]; then
+	elif [ -f "${HOST_ROOT}/etc/VERSION" ]; then
 		OS_ID=minikube
+	else
+		>&2 echo "Detected an unsupported target system, please get in touch with the Falco community"
+		exit 1
 	fi

 	case "${OS_ID}" in
@@ -132,13 +129,8 @@ get_target_id() {
 		fi
 		;;
 	("ubuntu")
-		# Extract the flavor from the kernelrelease
-		# Examples:
-		# 5.0.0-1028-aws-5.0 -> ubuntu-aws-5.0
-		# 5.15.0-1009-aws -> ubuntu-aws
-		if [[ $KERNEL_RELEASE =~ -([a-zA-Z]+)(-.*)?$ ]];
-		then
-			TARGET_ID="ubuntu-${BASH_REMATCH[1]}${BASH_REMATCH[2]}"
+		if [[ $KERNEL_RELEASE == *"aws"* ]]; then
+			TARGET_ID="ubuntu-aws"
 		else
 			TARGET_ID="ubuntu-generic"
 		fi
@@ -147,23 +139,10 @@ get_target_id() {
 		KERNEL_RELEASE="${VERSION_ID}"
 		TARGET_ID=$(echo "${OS_ID}" | tr '[:upper:]' '[:lower:]')
 		;;
-	("minikube")
-		TARGET_ID="${OS_ID}"
-		# Extract the minikube version. Ex. With minikube version equal to "v1.26.0-1655407986-14197" the extracted version
-		# will be "1.26.0"
-		if [[ $(cat ${HOST_ROOT}/etc/VERSION) =~ ([0-9]+(\.[0-9]+){2}) ]]; then
-			# kernel version for minikube is always in "1_minikubeversion" format. Ex "1_1.26.0".
-			KERNEL_VERSION="1_${BASH_REMATCH[1]}"
-		else
-			echo "* Unable to extract minikube version from ${HOST_ROOT}/etc/VERSION"
-			exit 1
-		fi
-		;;
 	(*)
 		TARGET_ID=$(echo "${OS_ID}" | tr '[:upper:]' '[:lower:]')
 		;;
 	esac
-	return 0
 }

 flatcar_relocate_tools() {
@@ -253,14 +232,16 @@ load_kernel_module_compile() {
 }

 load_kernel_module_download() {
+	get_target_id
+
 	local FALCO_KERNEL_MODULE_FILENAME="${DRIVER_NAME}_${TARGET_ID}_${KERNEL_RELEASE}_${KERNEL_VERSION}.ko"
-	local URL=$(echo "${1}/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" | sed s/+/%2B/g)
+	local URL=$(echo "${DRIVERS_REPO}/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" | sed s/+/%2B/g)

 	echo "* Trying to download a prebuilt ${DRIVER_NAME} module from ${URL}"
-	if curl -L --create-dirs "${FALCO_DRIVER_CURL_OPTIONS}" -o "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" "${URL}"; then
+	if curl -L --create-dirs "${FALCO_DRIVER_CURL_OPTIONS}" -o "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" "${URL}"; then
 		echo "* Download succeeded"
-		chcon -t modules_object_t "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" > /dev/null 2>&1 || true
-		if insmod "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}"; then
+		chcon -t modules_object_t "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" > /dev/null 2>&1 || true
+		if insmod "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}"; then
 			echo "* Success: ${DRIVER_NAME} module found and inserted"
 			exit 0
 		else
@@ -372,22 +353,21 @@ load_kernel_module() {

 	echo "* Looking for a ${DRIVER_NAME} module locally (kernel ${KERNEL_RELEASE})"

+	get_target_id
+
 	local FALCO_KERNEL_MODULE_FILENAME="${DRIVER_NAME}_${TARGET_ID}_${KERNEL_RELEASE}_${KERNEL_VERSION}.ko"
 	echo "* Filename '${FALCO_KERNEL_MODULE_FILENAME}' is composed of:"
 	print_filename_components

-	if [ -f "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" ]; then
-		echo "* Found a prebuilt ${DRIVER_NAME} module at ${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}, loading it"
-		chcon -t modules_object_t "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" > /dev/null 2>&1 || true
-		insmod "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${FALCO_KERNEL_MODULE_FILENAME}" && echo "* Success: ${DRIVER_NAME} module found and inserted"
+	if [ -f "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" ]; then
+		echo "* Found a prebuilt ${DRIVER_NAME} module at ${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}, loading it"
+		chcon -t modules_object_t "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" > /dev/null 2>&1 || true
+		insmod "${HOME}/.falco/${FALCO_KERNEL_MODULE_FILENAME}" && echo "* Success: ${DRIVER_NAME} module found and inserted"
 		exit $?
 	fi

 	if [ -n "$ENABLE_DOWNLOAD" ]; then
-		IFS=", " read -r -a urls <<< "${DRIVERS_REPO}"
-		for url in "${urls[@]}"; do
-			load_kernel_module_download $url
-		done
+		load_kernel_module_download
 	fi

 	if [ -n "$ENABLE_COMPILE" ]; then
@@ -511,8 +491,8 @@ load_bpf_probe_compile() {

 	make -C "/usr/src/${DRIVER_NAME}-${DRIVER_VERSION}/bpf" > /dev/null

-	mkdir -p "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}"
-	mv "/usr/src/${DRIVER_NAME}-${DRIVER_VERSION}/bpf/probe.o" "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}"
+	mkdir -p "${HOME}/.falco"
+	mv "/usr/src/${DRIVER_NAME}-${DRIVER_VERSION}/bpf/probe.o" "${HOME}/.falco/${BPF_PROBE_FILENAME}"

 	if [ -n "${BPF_KERNEL_SOURCES_URL}" ]; then
 		rm -r /tmp/kernel
@@ -522,15 +502,14 @@ load_bpf_probe_compile() {

 load_bpf_probe_download() {
 	local URL
-	URL=$(echo "${1}/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" | sed s/+/%2B/g)
+	URL=$(echo "${DRIVERS_REPO}/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" | sed s/+/%2B/g)

 	echo "* Trying to download a prebuilt eBPF probe from ${URL}"

-	if ! curl -L --create-dirs "${FALCO_DRIVER_CURL_OPTIONS}" -o "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" "${URL}"; then
+	if ! curl -L --create-dirs "${FALCO_DRIVER_CURL_OPTIONS}" -o "${HOME}/.falco/${BPF_PROBE_FILENAME}" "${URL}"; then
 		>&2 echo "Unable to find a prebuilt ${DRIVER_NAME} eBPF probe"
-		return 1
+		return
 	fi
-	return 0
 }

 load_bpf_probe() {
@@ -540,36 +519,32 @@ load_bpf_probe() {
 		mount -t debugfs nodev /sys/kernel/debug
 	fi

+	get_target_id
+
 	BPF_PROBE_FILENAME="${DRIVER_NAME}_${TARGET_ID}_${KERNEL_RELEASE}_${KERNEL_VERSION}.o"
 	echo "* Filename '${BPF_PROBE_FILENAME}' is composed of:"
 	print_filename_components

 	if [ -n "$ENABLE_DOWNLOAD" ]; then
-		if [ -f "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" ]; then
-			echo "* Skipping download, eBPF probe is already present in ${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}"
+		if [ -f "${HOME}/.falco/${BPF_PROBE_FILENAME}" ]; then
+			echo "* Skipping download, eBPF probe is already present in ${HOME}/.falco/${BPF_PROBE_FILENAME}"
 		else
-			IFS=", " read -r -a urls <<< "${DRIVERS_REPO}"
-			for url in "${urls[@]}"; do
-				load_bpf_probe_download $url
-				if [ $? -eq 0 ]; then
-                	break
-                fi
-			done
+			load_bpf_probe_download
 		fi
 	fi

 	if [ -n "$ENABLE_COMPILE" ]; then
-		if [ -f "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" ]; then
-			echo "* Skipping compilation, eBPF probe is already present in ${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}"
+		if [ -f "${HOME}/.falco/${BPF_PROBE_FILENAME}" ]; then
+			echo "* Skipping compilation, eBPF probe is already present in ${HOME}/.falco/${BPF_PROBE_FILENAME}"
 		else
 			load_bpf_probe_compile
 		fi
 	fi

-	if [ -f "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" ]; then
-		echo "* eBPF probe located in ${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}"
+	if [ -f "${HOME}/.falco/${BPF_PROBE_FILENAME}" ]; then
+		echo "* eBPF probe located in ${HOME}/.falco/${BPF_PROBE_FILENAME}"

-		ln -sf "${HOME}/.falco/${DRIVER_VERSION}/${ARCH}/${BPF_PROBE_FILENAME}" "${HOME}/.falco/${DRIVER_NAME}-bpf.o" \
+		ln -sf "${HOME}/.falco/${BPF_PROBE_FILENAME}" "${HOME}/.falco/${DRIVER_NAME}-bpf.o" \
 			&& echo "* Success: eBPF probe symlinked to ${HOME}/.falco/${DRIVER_NAME}-bpf.o"
 		exit $?
 	else
@@ -595,7 +570,7 @@ print_usage() {
 	echo "  --source-only  skip execution and allow sourcing in another script"
 	echo ""
 	echo "Environment variables:"
-	echo "  DRIVERS_REPO             specify different URL(s) where to look for prebuilt Falco drivers (comma separated)"
+	echo "  DRIVERS_REPO             specify a different URL where to look for prebuilt Falco drivers"
 	echo "  DRIVER_NAME              specify a different name for the driver"
 	echo "  DRIVER_INSECURE_DOWNLOAD whether you want to allow insecure downloads or not"
 	echo ""
@@ -628,12 +603,10 @@ if [[ -z "$MAX_RMMOD_WAIT" ]]; then
 	MAX_RMMOD_WAIT=60
 fi

-DRIVER_VERSION=${DRIVER_VERSION:-"@DRIVER_VERSION@"}
+DRIVER_VERSION="@DRIVER_VERSION@"
 DRIVER_NAME=${DRIVER_NAME:-"@DRIVER_NAME@"}
 FALCO_VERSION="@FALCO_VERSION@"

-TARGET_ID="placeholder" # when no target id can be fetched, we try to build the driver from source anyway, using a placeholder name
-
 DRIVER="module"
 if [ -v FALCO_BPF_PROBE ]; then
 	DRIVER="bpf"
@@ -707,18 +680,6 @@ if [ -z "$source_only" ]; then
 		exit 1
 	fi

-	get_target_id
-	res=$?
-	if [ $res != 0 ]; then
-		if [ -n "$ENABLE_COMPILE" ]; then
-			ENABLE_DOWNLOAD=
-			>&2 echo "Detected an unsupported target system, please get in touch with the Falco community. Trying to compile anyway."
-		else
-			>&2 echo "Detected an unsupported target system, please get in touch with the Falco community."
-			exit 1
-		fi
-	fi
-
 	if [ -n "$clean" ]; then
 		if [ -n "$has_opts" ]; then
 			>&2 echo "Cannot use --clean with other options"
--- a/scripts/rpm/falco.service
+++ b/scripts/rpm/falco.service
@@ -1,12 +1,11 @@
 [Unit]
 Description=Falco: Container Native Runtime Security
 Documentation=https://falco.org/docs/
-After=falco_inject_kmod.service
-Requires=falco_inject_kmod.service

 [Service]
 Type=simple
 User=root
+ExecStartPre=/sbin/modprobe falco
 ExecStart=/usr/bin/falco --pidfile=/var/run/falco.pid
 ExecStopPost=/sbin/rmmod falco
 UMask=0077
@@ -18,7 +17,6 @@ NoNewPrivileges=yes
 ProtectHome=read-only
 ProtectSystem=full
 ProtectKernelTunables=true
-ReadWritePaths=/sys/module/falco
 RestrictRealtime=true
 RestrictAddressFamilies=~AF_PACKET
 StandardOutput=null
--- a/scripts/rpm/falco_inject_kmod.service
+++ b/scripts/rpm/falco_inject_kmod.service
@@ -1,13 +0,0 @@
-[Unit]
-Description=Falco: Container Native Runtime Security
-Documentation=https://falco.org/docs/
-Before=falco.service
-Wants=falco.service
-
-[Service]
-Type=oneshot
-User=root
-ExecStart=/sbin/modprobe falco
-
-[Install]
-WantedBy=multi-user.target
--- a/scripts/rpm/postinstall.in
+++ b/scripts/rpm/postinstall.in
@@ -14,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-set -e

 mod_version="@DRIVER_VERSION@"
 dkms add -m falco -v $mod_version --rpm_safe_upgrade
@@ -30,35 +29,3 @@ else
 	echo -e "Module build for the currently running kernel was skipped since the"
 	echo -e "kernel source for this kernel does not seem to be installed."
 fi
-
-# validate rpm macros by `rpm -qp --scripts <rpm>`
-# RPM scriptlets: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_systemd
-#                 https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
-
-# systemd_post macro expands to
-# if postinst:
-#   `systemd-update-helper install-system-units <service>`
-%systemd_post 'falco.service'
-
-# post install mirrored from .deb
-if [ $1 -eq 1 ]; then
-        # This will only remove masks created on package removal.
-        /usr/bin/systemctl --system unmask 'falco.service' >/dev/null || true
-
-        # enable falco on installation
-        # note: DEB postinstall script checks for changed symlinks
-        /usr/bin/systemctl --system enable 'falco.service' >/dev/null || true
-
-        # start falco on installation
-        /usr/bin/systemctl --system start 'falco.service' >/dev/null || true
-fi
-
-# post upgrade mirrored from .deb
-if [ $1 -gt 1 ]; then
-    if [ -d /run/systemd/system ]; then
-        /usr/bin/systemctl --system daemon-reload >/dev/null || true
-
-        # restart falco on upgrade if service is already running
-        /usr/bin/systemctl --system condrestart 'falco.service' >/dev/null || true
-    fi
-fi
--- a/scripts/rpm/postuninstall.in
+++ b/scripts/rpm/postuninstall.in
@@ -14,20 +14,3 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-set -e
-
-# post uninstall mirrored from .deb
-if [ -d /run/systemd/system ] && [ "$1" = 0 ]; then
-        /usr/bin/systemctl --system daemon-reload >/dev/null || true
-        /usr/bin/systemctl --system mask 'falco.service' >/dev/null || true
-fi
-
-# validate rpm macros by `rpm -qp --scripts <rpm>`
-# RPM scriptlets: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_systemd
-#                 https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
-
-# systemd_postun_with_restart macro expands to
-# if package upgrade, not uninstall:
-#   `systemd-update-helper mark-restart-system-units <service>`
-%systemd_postun_with_restart 'falco.service'
--- a/scripts/rpm/preuninstall.in
+++ b/scripts/rpm/preuninstall.in
@@ -14,22 +14,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-set -e
-
-# pre uninstall mirrored from .deb
-# Currently running falco service uses the driver, so stop it before driver cleanup
-if [ -d /run/systemd/system ] && [ $1 -eq 0 ]; then
-        # stop falco service before uninstall
-        /usr/bin/systemctl --system stop 'falco.service' >/dev/null || true
-fi

 /usr/bin/falco-driver-loader --clean
-
-# validate rpm macros by `rpm -qp --scripts <rpm>`
-# RPM scriptlets: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_systemd
-#                 https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_syntax
-
-# systemd_preun macro expands to
-# if preuninstall:
-#  `systemd-update-helper remove-system-units <service>`
-%systemd_preun 'falco.service'
--- a/test/confs/plugins/multiple_source_plugins.yaml
+++ b/test/confs/plugins/multiple_source_plugins.yaml
@@ -0,0 +1,15 @@
+stdout_output:
+  enabled: true
+
+plugins:
+  - name: cloudtrail
+    library_path: BUILD_DIR/cloudtrail-plugin-prefix/src/cloudtrail-plugin/libcloudtrail.so
+    init_config: ""
+    open_params: "BUILD_DIR/test/trace_files/plugins/alice_start_instances.json"
+  - name: test_source
+    library_path: BUILD_DIR/test/plugins/libtest_source.so
+    init_config: ""
+    open_params: ""
+
+# Optional
+load_plugins: [cloudtrail, test_source]
--- a/test/falco_k8s_audit_tests.yaml
+++ b/test/falco_k8s_audit_tests.yaml
@@ -19,7 +19,6 @@ trace_files: !mux
  compat_engine_v4_create_disallowed_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - ./rules/k8s_audit/engine_v4_k8s_audit_rules.yaml
@@ -31,7 +30,6 @@ trace_files: !mux

  compat_engine_v4_create_allowed_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - ./rules/k8s_audit/engine_v4_k8s_audit_rules.yaml
@@ -42,7 +40,6 @@ trace_files: !mux
  compat_engine_v4_create_privileged_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - ./rules/k8s_audit/engine_v4_k8s_audit_rules.yaml
@@ -53,7 +50,6 @@ trace_files: !mux

  compat_engine_v4_create_privileged_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -64,7 +60,6 @@ trace_files: !mux

  compat_engine_v4_create_unprivileged_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - ./rules/k8s_audit/engine_v4_k8s_audit_rules.yaml
@@ -74,7 +69,6 @@ trace_files: !mux
  compat_engine_v4_create_hostnetwork_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - ./rules/k8s_audit/engine_v4_k8s_audit_rules.yaml
@@ -85,7 +79,6 @@ trace_files: !mux

  compat_engine_v4_create_hostnetwork_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -97,7 +90,6 @@ trace_files: !mux
  user_outside_allowed_set:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -109,7 +101,6 @@ trace_files: !mux

  user_in_allowed_set:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -122,7 +113,6 @@ trace_files: !mux
  create_disallowed_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -134,7 +124,6 @@ trace_files: !mux

  create_allowed_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -145,7 +134,6 @@ trace_files: !mux
  create_privileged_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -157,7 +145,6 @@ trace_files: !mux
  create_privileged_no_secctx_1st_container_2nd_container_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -169,7 +156,6 @@ trace_files: !mux
  create_privileged_2nd_container_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -180,7 +166,6 @@ trace_files: !mux

  create_privileged_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -190,7 +175,6 @@ trace_files: !mux

  create_unprivileged_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -199,7 +183,6 @@ trace_files: !mux

  create_unprivileged_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -210,7 +193,6 @@ trace_files: !mux
  create_sensitive_mount_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -222,7 +204,6 @@ trace_files: !mux
  create_sensitive_mount_2nd_container_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -233,7 +214,6 @@ trace_files: !mux

  create_sensitive_mount_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -243,7 +223,6 @@ trace_files: !mux

  create_unsensitive_mount_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -252,7 +231,6 @@ trace_files: !mux

  create_unsensitive_mount_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -263,7 +241,6 @@ trace_files: !mux
  create_hostnetwork_pod:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -274,7 +251,6 @@ trace_files: !mux

  create_hostnetwork_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -284,7 +260,6 @@ trace_files: !mux

  create_nohostnetwork_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -293,7 +268,6 @@ trace_files: !mux

  create_nohostnetwork_trusted_pod:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -304,7 +278,6 @@ trace_files: !mux
  create_nodeport_service:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -316,7 +289,6 @@ trace_files: !mux

  create_nonodeport_service:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -327,7 +299,6 @@ trace_files: !mux
  create_configmap_private_creds:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -339,7 +310,6 @@ trace_files: !mux

  create_configmap_no_private_creds:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -350,7 +320,6 @@ trace_files: !mux
  anonymous_user:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -362,7 +331,6 @@ trace_files: !mux
  pod_exec:
    detect: True
    detect_level: NOTICE
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -374,7 +342,6 @@ trace_files: !mux
  pod_attach:
    detect: True
    detect_level: NOTICE
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -386,7 +353,6 @@ trace_files: !mux
  namespace_outside_allowed_set:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -398,7 +364,6 @@ trace_files: !mux

  namespace_in_allowed_set:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -410,7 +375,6 @@ trace_files: !mux
  create_pod_in_kube_system_namespace:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -422,7 +386,6 @@ trace_files: !mux
  create_pod_in_kube_public_namespace:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -434,7 +397,6 @@ trace_files: !mux
  create_serviceaccount_in_kube_system_namespace:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -446,7 +408,6 @@ trace_files: !mux
  create_serviceaccount_in_kube_public_namespace:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -458,7 +419,6 @@ trace_files: !mux
  system_clusterrole_deleted:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -470,7 +430,6 @@ trace_files: !mux
  system_clusterrole_modified:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -482,7 +441,6 @@ trace_files: !mux
  attach_cluster_admin_role:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -494,7 +452,6 @@ trace_files: !mux
  create_cluster_role_wildcard_resources:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -506,7 +463,6 @@ trace_files: !mux
  create_cluster_role_wildcard_verbs:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -518,7 +474,6 @@ trace_files: !mux
  create_writable_cluster_role:
    detect: True
    detect_level: NOTICE
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -530,7 +485,6 @@ trace_files: !mux
  create_pod_exec_cluster_role:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -542,7 +496,6 @@ trace_files: !mux
  create_deployment:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -554,7 +507,6 @@ trace_files: !mux
  delete_deployment:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -566,7 +518,6 @@ trace_files: !mux
  create_service:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -578,7 +529,6 @@ trace_files: !mux
  delete_service:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -590,7 +540,6 @@ trace_files: !mux
  create_configmap:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -602,7 +551,6 @@ trace_files: !mux
  delete_configmap:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -614,7 +562,6 @@ trace_files: !mux
  create_namespace:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -628,7 +575,6 @@ trace_files: !mux
  delete_namespace:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -640,7 +586,6 @@ trace_files: !mux
  create_serviceaccount:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -652,7 +597,6 @@ trace_files: !mux
  delete_serviceaccount:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -664,7 +608,6 @@ trace_files: !mux
  create_clusterrole:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -676,7 +619,6 @@ trace_files: !mux
  delete_clusterrole:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -688,7 +630,6 @@ trace_files: !mux
  create_clusterrolebinding:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -700,7 +641,6 @@ trace_files: !mux
  delete_clusterrolebinding:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -712,7 +652,6 @@ trace_files: !mux
  create_secret:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -725,7 +664,6 @@ trace_files: !mux
  create_service_account_token_secret:
    detect: False
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -735,7 +673,6 @@ trace_files: !mux
  create_kube_system_secret:
    detect: False
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -745,7 +682,6 @@ trace_files: !mux
  delete_secret:
    detect: True
    detect_level: INFO
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -756,7 +692,6 @@ trace_files: !mux

  fal_01_003:
    detect: False
-    enable_source: k8s_audit
    rules_file:
      - ../rules/falco_rules.yaml
      - BUILD_DIR/k8saudit-rules-prefix/src/k8saudit-rules/k8s_audit_rules.yaml
@@ -767,7 +702,6 @@ trace_files: !mux
  json_pointer_correct_parse:
    detect: True
    detect_level: WARNING
-    enable_source: k8s_audit
    rules_file:
      - ./rules/k8s_audit/single_rule_with_json_pointer.yaml
    detect_counts:
--- a/test/falco_test.py
+++ b/test/falco_test.py
@@ -97,7 +97,6 @@ class FalcoTest(Test):
        self.all_events = self.params.get('all_events', '*', default=False)
        self.priority = self.params.get('priority', '*', default='debug')
        self.addl_cmdline_opts = self.params.get('addl_cmdline_opts', '*', default='')
-        self.enable_source = self.params.get('enable_source', '*', default='')
        self.rules_file = self.params.get(
            'rules_file', '*', default=os.path.join(self.basedir, '../rules/falco_rules.yaml'))

@@ -115,13 +114,6 @@ class FalcoTest(Test):
            self.json_output = True
            if not isinstance(self.validate_rules_file, list):
                self.validate_rules_file = [self.validate_rules_file]
-        
-        # can be either empty, a string, or a list
-        if self.enable_source == '':
-            self.enable_source = []
-        else:
-            if not isinstance(self.enable_source, list):
-                self.enable_source = [self.enable_source]

        self.rules_args = ""

@@ -240,7 +232,7 @@ class FalcoTest(Test):
        self.grpcurl_res = None
        self.grpc_observer = None
        self.grpc_address = self.params.get(
-            'address', 'grpc/*', default='/run/falco/falco.sock')
+            'address', 'grpc/*', default='/var/run/falco.sock')
        if self.grpc_address.startswith("unix://"):
            self.is_grpc_using_unix_socket = True
            self.grpc_address = self.grpc_address[len("unix://"):]
@@ -638,15 +630,10 @@ class FalcoTest(Test):
        if self.trace_file:
            trace_arg = "-e {}".format(self.trace_file)

-        extra_cmdline = ''
-        for source in self.enable_source:
-            extra_cmdline += ' --enable-source="{}"'.format(source)
-        extra_cmdline += ' ' + self.addl_cmdline_opts
-
        # Run falco
        cmd = '{} {} {} -c {} {} -o json_output={} -o json_include_output_property={} -o json_include_tags_property={} -o priority={} -v {}'.format(
            self.falco_binary_path, self.rules_args, self.disabled_args, self.conf_file, trace_arg, self.json_output,
-            self.json_include_output_property, self.json_include_tags_property, self.priority, extra_cmdline)
+            self.json_include_output_property, self.json_include_tags_property, self.priority, self.addl_cmdline_opts)

        for tag in self.disable_tags:
            cmd += ' -T {}'.format(tag)
@@ -663,7 +650,7 @@ class FalcoTest(Test):
        if self.time_iso_8601:
            cmd += ' -o time_format_iso_8601=true'

-        self.falco_proc = process.SubProcess(cmd, env=dict(os.environ, FALCO_HOSTNAME="test-falco-hostname"))
+        self.falco_proc = process.SubProcess(cmd)

        res = self.falco_proc.run(timeout=180, sig=9)

--- a/test/falco_tests.yaml
+++ b/test/falco_tests.yaml
@@ -285,7 +285,7 @@ trace_files: !mux
  invalid_not_yaml:
    exit_status: 1
    validate_errors:
-      - item_type: rules content
+      - item_type: file
        item_name: ""
        code: LOAD_ERR_YAML_VALIDATE
        message: "Rules content is not yaml"
@@ -296,7 +296,7 @@ trace_files: !mux
  invalid_not_array:
    exit_status: 1
    validate_errors:
-      - item_type: rules content
+      - item_type: file
        item_name: ""
        code: LOAD_ERR_YAML_VALIDATE
        message: "Rules content is not yaml array of objects"
@@ -307,7 +307,7 @@ trace_files: !mux
  invalid_array_item_not_object:
    exit_status: 1
    validate_errors:
-      - item_type: rules content item
+      - item_type: item
        item_name: ""
        code: LOAD_ERR_YAML_VALIDATE
        message: "Unexpected element type. Each element should be a yaml associative array."
@@ -329,7 +329,7 @@ trace_files: !mux
  invalid_yaml_parse_error:
    exit_status: 1
    validate_errors:
-      - item_type: rules content
+      - item_type: file
        item_name: ""
        code: LOAD_ERR_YAML_PARSE
        message: "yaml-cpp: error at line 1, column 11: illegal map value"
@@ -457,6 +457,11 @@ trace_files: !mux
        item_name: some macro
        code: LOAD_ERR_VALIDATE
        message: "Undefined macro 'foo' used in filter."
+    validate_warnings:
+      - item_type: macro
+        item_name: some macro
+        code: LOAD_UNUSED_MACRO
+        message: "Macro not referred to by any other rule/macro"
    validate_rules_file:
      - rules/invalid_overwrite_macro_multiple_docs.yaml
    trace_file: trace_files/cat_write.scap
@@ -719,7 +724,7 @@ trace_files: !mux
      - "Write below etc": 1
      - "System procs network activity": 1
      - "Mkdir binary dirs": 1
-      - "System user interactive": 0
+      - "System user interactive": 1
      - "DB program spawned process": 1
      - "Non sudo setuid": 1
      - "Create files below dev": 1
@@ -1093,7 +1098,7 @@ trace_files: !mux
      - rules/catchall_order.yaml
    detect_counts:
      - open_dev_null: 1
-        dev_null: 6
+        dev_null: 0
    trace_file: trace_files/cat_write.scap

  validate_skip_unknown_noevt:
--- a/test/falco_tests_plugins.yaml
+++ b/test/falco_tests_plugins.yaml
@@ -35,7 +35,6 @@ trace_files: !mux
    stdout_contains: "ct.id"

  detect_create_instance:
-    enable_source: aws_cloudtrail
    detect: True
    detect_level: INFO
    rules_file:
@@ -45,7 +44,6 @@ trace_files: !mux
    conf_file: BUILD_DIR/test/confs/plugins/cloudtrail_json_create_instances.yaml

  detect_create_instance_bigevent:
-    enable_source: aws_cloudtrail
    detect: True
    detect_level: INFO
    rules_file:
@@ -54,9 +52,16 @@ trace_files: !mux
      - 'Cloudtrail Create Instance': 1
    conf_file: BUILD_DIR/test/confs/plugins/cloudtrail_json_create_instances_bigevent.yaml

+  multiple_source_plugins:
+    exit_status: 1
+    stderr_contains: "Can not load multiple plugins with event sourcing capability: 'cloudtrail' already loaded."
+    conf_file: BUILD_DIR/test/confs/plugins/multiple_source_plugins.yaml
+    rules_file:
+      - rules/plugins/cloudtrail_create_instances.yaml
+
  incompatible_extract_sources:
    exit_status: 1
-    stderr_contains: "Plugin '.*' has field extraction capability but is not compatible with any known event source"
+    stderr_contains: "Plugin '.*' has field extraction capability but is not compatible with any enabled event source"
    conf_file: BUILD_DIR/test/confs/plugins/incompatible_extract_sources.yaml
    rules_file:
      - rules/plugins/cloudtrail_create_instances.yaml
--- a/test/falco_traces.yaml.in
+++ b/test/falco_traces.yaml.in
@@ -62,7 +62,7 @@ traces: !mux
  falco-event-generator:
    trace_file: traces-positive/falco-event-generator.scap
    detect: True
-    detect_level: [ERROR, WARNING, NOTICE, DEBUG]
+    detect_level: [ERROR, WARNING, INFO, NOTICE, DEBUG]
    detect_counts:
      - "Write below binary dir": 1
      - "Read sensitive file untrusted": 3
@@ -71,7 +71,7 @@ traces: !mux
      - "Write below etc": 1
      - "System procs network activity": 1
      - "Mkdir binary dirs": 1
-      - "System user interactive": 0
+      - "System user interactive": 1
      - "DB program spawned process": 1
      - "Non sudo setuid": 1
      - "Create files below dev": 1
@@ -123,10 +123,8 @@ traces: !mux
  # falco-event-generator.scap so the rule is still being tested.
  run-shell-untrusted:
    trace_file: traces-positive/run-shell-untrusted.scap
-    detect: True
+    detect: False
    detect_level: DEBUG
-    detect_counts:
-      - "Run shell untrusted": 1

  system-binaries-network-activity:
    trace_file: traces-positive/system-binaries-network-activity.scap
--- a/test/output_files/single_rule_with_cat_write.json
+++ b/test/output_files/single_rule_with_cat_write.json
@@ -1,8 +1,8 @@
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.881781397+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881781397Z", "output_fields": {"evt.time.iso8601":1470327477881781397,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.881785348+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881785348Z", "output_fields": {"evt.time.iso8601":1470327477881785348,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.881796705+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881796705Z", "output_fields": {"evt.time.iso8601":1470327477881796705,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.881799840+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881799840Z", "output_fields": {"evt.time.iso8601":1470327477881799840,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.882003104+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882003104Z", "output_fields": {"evt.time.iso8601":1470327477882003104,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.882008208+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882008208Z", "output_fields": {"evt.time.iso8601":1470327477882008208,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.882045694+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882045694Z", "output_fields": {"evt.time.iso8601":1470327477882045694,"proc.cmdline":"cat /dev/null"}}
-{"hostname":"test-falco-hostname","output":"2016-08-04T16:17:57.882054739+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882054739Z", "output_fields": {"evt.time.iso8601":1470327477882054739,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.881781397+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881781397Z", "output_fields": {"evt.time.iso8601":1470327477881781397,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.881785348+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881785348Z", "output_fields": {"evt.time.iso8601":1470327477881785348,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.881796705+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881796705Z", "output_fields": {"evt.time.iso8601":1470327477881796705,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.881799840+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.881799840Z", "output_fields": {"evt.time.iso8601":1470327477881799840,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.882003104+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882003104Z", "output_fields": {"evt.time.iso8601":1470327477882003104,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.882008208+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882008208Z", "output_fields": {"evt.time.iso8601":1470327477882008208,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.882045694+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882045694Z", "output_fields": {"evt.time.iso8601":1470327477882045694,"proc.cmdline":"cat /dev/null"}}
+{"output":"2016-08-04T16:17:57.882054739+0000: Warning An open was seen (command=cat /dev/null)","priority":"Warning","rule":"open_from_cat","source":"syscall","tags":["filesystem","process","testing"],"time":"2016-08-04T16:17:57.882054739Z", "output_fields": {"evt.time.iso8601":1470327477882054739,"proc.cmdline":"cat /dev/null"}}
--- a/test/plugins/test_extract.cpp
+++ b/test/plugins/test_extract.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 #include <string.h>
 #include <plugin_info.h>

-static const char *pl_required_api_version = PLUGIN_API_VERSION_STR;
+static const char *pl_required_api_version = "1.0.0";
 static const char *pl_name_base            = "test_extract";
 static char pl_name[1024];
 static const char *pl_desc                 = "Test Plugin For Regression Tests";
--- a/test/plugins/test_source.cpp
+++ b/test/plugins/test_source.cpp
@@ -20,7 +20,7 @@ limitations under the License.

 #include <plugin_info.h>

-static const char *pl_required_api_version = PLUGIN_API_VERSION_STR;
+static const char *pl_required_api_version = "1.0.0";
 static uint32_t    pl_id                   = 999;
 static const char *pl_name                 = "test_source";
 static const char *pl_desc                 = "Test Plugin For Regression Tests";
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,7 +22,6 @@ set(
  engine/test_filter_macro_resolver.cpp
  engine/test_filter_evttype_resolver.cpp
  engine/test_filter_warning_resolver.cpp
-  engine/test_plugin_requirements.cpp
  falco/test_configuration.cpp
 )

--- a/tests/engine/test_falco_utils.cpp
+++ b/tests/engine/test_falco_utils.cpp
@@ -14,26 +14,27 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 #include "falco_utils.h"
+#include <nonstd/string_view.hpp>
 #include <catch.hpp>

 TEST_CASE("is_unix_scheme matches", "[utils]")
 {
 	SECTION("rvalue")
 	{
-		bool res = falco::utils::network::is_unix_scheme("unix:///run/falco/falco.sock");
+		bool res = falco::utils::network::is_unix_scheme("unix:///var/run/falco.sock");
 		REQUIRE(res);
 	}

 	SECTION("std::string")
 	{
-		std::string url("unix:///run/falco/falco.sock");
+		std::string url("unix:///var/run/falco.sock");
 		bool res = falco::utils::network::is_unix_scheme(url);
 		REQUIRE(res);
 	}

 	SECTION("char[]")
 	{
-		char url[] = "unix:///run/falco/falco.sock";
+		char url[] = "unix:///var/run/falco.sock";
 		bool res = falco::utils::network::is_unix_scheme(url);
 		REQUIRE(res);
 	}
@@ -41,7 +42,7 @@ TEST_CASE("is_unix_scheme matches", "[utils]")

 TEST_CASE("is_unix_scheme does not match", "[utils]")
 {
-	bool res = falco::utils::network::is_unix_scheme("something:///run/falco/falco.sock");
+	bool res = falco::utils::network::is_unix_scheme("something:///var/run/falco.sock");
 	REQUIRE_FALSE(res);
 }

--- a/tests/engine/test_filter_evttype_resolver.cpp
+++ b/tests/engine/test_filter_evttype_resolver.cpp
@@ -35,10 +35,10 @@ string to_string(set<uint16_t> s)
 	return out;
 }

-void compare_evttypes(std::unique_ptr<ast::expr> f, set<uint16_t> &expected)
+void compare_evttypes(ast::expr* f, set<uint16_t> &expected)
 {
    set<uint16_t> actual;
-    filter_evttype_resolver().evttypes(f.get(), actual);
+    filter_evttype_resolver().evttypes(f, actual);
    for(auto &etype : expected)
    {
        REQUIRE(actual.find(etype) != actual.end());
@@ -49,7 +49,7 @@ void compare_evttypes(std::unique_ptr<ast::expr> f, set<uint16_t> &expected)
    }
 }

-std::unique_ptr<ast::expr> compile(const string &fltstr)
+ast::expr* compile(const string &fltstr)
 {
    return libsinsp::filter::parser(fltstr).parse();
 }
@@ -73,15 +73,13 @@ TEST_CASE("Should find event types from filter", "[rule_loader]")
 	set<uint16_t> not_close;
 	set<uint16_t> all_events;
 	set<uint16_t> no_events;
-
    for(uint32_t i = 2; i < PPM_EVENT_MAX; i++)
    {
        // Skip events that are unused.
-        if(sinsp::is_unused_event(i))
+        if(g_infotables.m_event_info[i].flags & EF_UNUSED)
        {
            continue;
        }
-
        all_events.insert(i);
        if(openat_only.find(i) == openat_only.end())
        {
@@ -100,138 +98,138 @@ TEST_CASE("Should find event types from filter", "[rule_loader]")
    SECTION("evt_type_eq")
    {
        auto f = compile("evt.type=openat");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }

    SECTION("evt_type_in")
    {
        auto f = compile("evt.type in (openat, close)");
-        compare_evttypes(std::move(f), openat_close);
+        compare_evttypes(f, openat_close);
    }

    SECTION("evt_type_ne")
    {
        auto f = compile("evt.type!=openat");
-        compare_evttypes(std::move(f), not_openat);
+        compare_evttypes(f, not_openat);
    }

    SECTION("not_evt_type_eq")
    {
        auto f = compile("not evt.type=openat");
-        compare_evttypes(std::move(f), not_openat);
+        compare_evttypes(f, not_openat);
    }

    SECTION("not_evt_type_in")
    {
        auto f = compile("not evt.type in (openat, close)");
-        compare_evttypes(std::move(f), not_openat_close);
+        compare_evttypes(f, not_openat_close);
    }

    SECTION("not_evt_type_ne")
    {
        auto f = compile("not evt.type != openat");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }

    SECTION("evt_type_or")
    {
        auto f = compile("evt.type=openat or evt.type=close");
-        compare_evttypes(std::move(f), openat_close);
+        compare_evttypes(f, openat_close);
    }

    SECTION("not_evt_type_or")
    {
        auto f = compile("evt.type!=openat or evt.type!=close");
-        compare_evttypes(std::move(f), all_events);
+        compare_evttypes(f, all_events);
    }

    SECTION("evt_type_or_ne")
    {
        auto f = compile("evt.type=close or evt.type!=openat");
-        compare_evttypes(std::move(f), not_openat);
+        compare_evttypes(f, not_openat);
    }

    SECTION("evt_type_and")
    {
        auto f = compile("evt.type=close and evt.type=openat");
-        compare_evttypes(std::move(f), no_events);
+        compare_evttypes(f, no_events);
    }

    SECTION("evt_type_and_non_evt_type")
    {
        auto f = compile("evt.type=openat and proc.name=nginx");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }

    SECTION("evt_type_and_non_evt_type_not")
    {
        auto f = compile("evt.type=openat and not proc.name=nginx");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }

    SECTION("evt_type_and_nested")
    {
        auto f = compile("evt.type=openat and (proc.name=nginx)");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }

    SECTION("evt_type_and_nested_multi")
    {
        auto f = compile("evt.type=openat and (evt.type=close and proc.name=nginx)");
-        compare_evttypes(std::move(f), no_events);
+        compare_evttypes(f, no_events);
    }

    SECTION("non_evt_type")
    {
        auto f = compile("proc.name=nginx");
-        compare_evttypes(std::move(f), all_events);
+        compare_evttypes(f, all_events);
    }

    SECTION("non_evt_type_or")
    {
        auto f = compile("evt.type=openat or proc.name=nginx");
-        compare_evttypes(std::move(f), all_events);
+        compare_evttypes(f, all_events);
    }

    SECTION("non_evt_type_or_nested_first")
    {
        auto f = compile("(evt.type=openat) or proc.name=nginx");
-        compare_evttypes(std::move(f), all_events);
+        compare_evttypes(f, all_events);
    }

    SECTION("non_evt_type_or_nested_second")
    {
        auto f = compile("evt.type=openat or (proc.name=nginx)");
-        compare_evttypes(std::move(f), all_events);
+        compare_evttypes(f, all_events);
    }

    SECTION("non_evt_type_or_nested_multi")
    {
        auto f = compile("evt.type=openat or (evt.type=close and proc.name=nginx)");
-        compare_evttypes(std::move(f), openat_close);
+        compare_evttypes(f, openat_close);
    }

    SECTION("non_evt_type_or_nested_multi_not")
    {
        auto f = compile("evt.type=openat or not (evt.type=close and proc.name=nginx)");
-        compare_evttypes(std::move(f), not_close);
+        compare_evttypes(f, not_close);
    }

    SECTION("non_evt_type_and_nested_multi_not")
    {
        auto f = compile("evt.type=openat and not (evt.type=close and proc.name=nginx)");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }

    SECTION("ne_and_and")
    {
        auto f = compile("evt.type!=openat and evt.type!=close");
-        compare_evttypes(std::move(f), not_openat_close);
+        compare_evttypes(f, not_openat_close);
    }

    SECTION("not_not")
    {
        auto f = compile("not (not evt.type=openat)");
-        compare_evttypes(std::move(f), openat_only);
+        compare_evttypes(f, openat_only);
    }
 }
--- a/tests/engine/test_filter_macro_resolver.cpp
+++ b/tests/engine/test_filter_macro_resolver.cpp
@@ -26,18 +26,19 @@ TEST_CASE("Should resolve macros on a filter AST", "[rule_loader]")

 	SECTION("in the general case")
 	{
-		std::shared_ptr<expr> macro = std::move(
-			unary_check_expr::create("test.field", "", "exists"));
+		shared_ptr<expr> macro(
+			new unary_check_expr("test.field", "", "exists"));

-		std::vector<std::unique_ptr<expr>> filter_and;
-		filter_and.push_back(unary_check_expr::create("evt.name", "", "exists"));
-		filter_and.push_back(not_expr::create(value_expr::create(macro_name)));
-		std::shared_ptr<expr> filter = std::move(and_expr::create(filter_and));
-
-		std::vector<std::unique_ptr<expr>> expected_and;
-		expected_and.push_back(unary_check_expr::create("evt.name", "", "exists"));
-		expected_and.push_back(not_expr::create(clone(macro.get())));
-		std::shared_ptr<expr> expected = std::move(and_expr::create(expected_and));
+		expr* filter = new and_expr({
+			new unary_check_expr("evt.name", "", "exists"), 
+			new not_expr(
+				new value_expr(macro_name)
+			),
+		});
+		expr* expected_filter = new and_expr({
+			new unary_check_expr("evt.name", "", "exists"), 
+			new not_expr(clone(macro.get())),
+		});

 		filter_macro_resolver resolver;
 		resolver.set_macro(macro_name, macro);
@@ -47,41 +48,46 @@ TEST_CASE("Should resolve macros on a filter AST", "[rule_loader]")
 		REQUIRE(resolver.get_resolved_macros().size() == 1);
 		REQUIRE(*resolver.get_resolved_macros().begin() == macro_name);
 		REQUIRE(resolver.get_unknown_macros().empty());
-		REQUIRE(filter->is_equal(expected.get()));
+		REQUIRE(filter->is_equal(expected_filter));

 		// second run
 		REQUIRE(resolver.run(filter) == false);
 		REQUIRE(resolver.get_resolved_macros().empty());
 		REQUIRE(resolver.get_unknown_macros().empty());
-		REQUIRE(filter->is_equal(expected.get()));
+		REQUIRE(filter->is_equal(expected_filter));
+
+		delete filter;
+		delete expected_filter;
 	}

 	SECTION("with a single node")
 	{
-		std::shared_ptr<expr> macro = std::move(
-			unary_check_expr::create("test.field", "", "exists"));
+		shared_ptr<expr> macro(
+			new unary_check_expr("test.field", "", "exists"));

-		std::shared_ptr<expr> filter = std::move(value_expr::create(macro_name));
+		expr* filter = new value_expr(macro_name);

 		filter_macro_resolver resolver;
 		resolver.set_macro(macro_name, macro);

 		// first run
-		expr* old_filter_ptr = filter.get();
+		expr* old_filter_ptr = filter;
 		REQUIRE(resolver.run(filter) == true);
-		REQUIRE(filter.get() != old_filter_ptr);
+		REQUIRE(filter != old_filter_ptr);
 		REQUIRE(resolver.get_resolved_macros().size() == 1);
 		REQUIRE(*resolver.get_resolved_macros().begin() == macro_name);
 		REQUIRE(resolver.get_unknown_macros().empty());
 		REQUIRE(filter->is_equal(macro.get()));

 		// second run
-		old_filter_ptr = filter.get();
+		old_filter_ptr = filter;
 		REQUIRE(resolver.run(filter) == false);
-		REQUIRE(filter.get() == old_filter_ptr);
+		REQUIRE(filter == old_filter_ptr);
 		REQUIRE(resolver.get_resolved_macros().empty());
 		REQUIRE(resolver.get_unknown_macros().empty());
 		REQUIRE(filter->is_equal(macro.get()));
+
+		delete filter;
 	}

 	SECTION("with multiple macros")
@@ -89,20 +95,19 @@ TEST_CASE("Should resolve macros on a filter AST", "[rule_loader]")
 		string a_macro_name = macro_name + "_1";
 		string b_macro_name = macro_name + "_2";

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

-		std::vector<std::unique_ptr<expr>> filter_or;
-		filter_or.push_back(value_expr::create(a_macro_name));
-		filter_or.push_back(value_expr::create(b_macro_name));
-		std::shared_ptr<expr> filter = std::move(or_expr::create(filter_or));
-
-		std::vector<std::unique_ptr<expr>> expected_or;
-		expected_or.push_back(clone(a_macro.get()));
-		expected_or.push_back(clone(b_macro.get()));
-		std::shared_ptr<expr>  expected_filter = std::move(or_expr::create(expected_or));
+		expr* filter = new or_expr({
+			new value_expr(a_macro_name),
+			new value_expr(b_macro_name),
+		});
+		expr* expected_filter = new or_expr({
+			clone(a_macro.get()),
+			clone(b_macro.get()),
+		});

 		filter_macro_resolver resolver;
 		resolver.set_macro(a_macro_name, a_macro);
@@ -116,13 +121,16 @@ TEST_CASE("Should resolve macros on a filter AST", "[rule_loader]")
 		REQUIRE(resolver.get_resolved_macros().find(b_macro_name)
 				!= resolver.get_resolved_macros().end());
 		REQUIRE(resolver.get_unknown_macros().empty());
-		REQUIRE(filter->is_equal(expected_filter.get()));
+		REQUIRE(filter->is_equal(expected_filter));

 		// second run
 		REQUIRE(resolver.run(filter) == false);
 		REQUIRE(resolver.get_resolved_macros().empty());
 		REQUIRE(resolver.get_unknown_macros().empty());
-		REQUIRE(filter->is_equal(expected_filter.get()));
+		REQUIRE(filter->is_equal(expected_filter));
+
+		delete filter;
+		delete expected_filter;
 	}

 	SECTION("with nested macros")
@@ -130,20 +138,18 @@ TEST_CASE("Should resolve macros on a filter AST", "[rule_loader]")
 		string a_macro_name = macro_name + "_1";
 		string b_macro_name = macro_name + "_2";

-		std::vector<std::unique_ptr<expr>> a_macro_and;
-		a_macro_and.push_back(unary_check_expr::create("one.field", "", "exists"));
-		a_macro_and.push_back(value_expr::create(b_macro_name));
-		std::shared_ptr<expr> a_macro = std::move(and_expr::create(a_macro_and));
+		shared_ptr<expr> a_macro(new and_expr({
+			new unary_check_expr("one.field", "", "exists"),
+			new value_expr(b_macro_name),
+		}));
+		shared_ptr<expr> b_macro(
+			new unary_check_expr("another.field", "", "exists"));

-		std::shared_ptr<expr> b_macro = std::move(
-			unary_check_expr::create("another.field", "", "exists"));
-
-		std::shared_ptr<expr> filter = std::move(value_expr::create(a_macro_name));
-
-		std::vector<std::unique_ptr<expr>> expected_and;
-		expected_and.push_back(unary_check_expr::create("one.field", "", "exists"));
-		expected_and.push_back(unary_check_expr::create("another.field", "", "exists"));
-		std::shared_ptr<expr> expected_filter = std::move(and_expr::create(expected_and));
+		expr* filter = new value_expr(a_macro_name);
+		expr* expected_filter = new and_expr({
+			new unary_check_expr("one.field", "", "exists"),
+			new unary_check_expr("another.field", "", "exists"),
+		});

 		filter_macro_resolver resolver;
 		resolver.set_macro(a_macro_name, a_macro);
@@ -157,13 +163,16 @@ TEST_CASE("Should resolve macros on a filter AST", "[rule_loader]")
 		REQUIRE(resolver.get_resolved_macros().find(b_macro_name)
 				!= resolver.get_resolved_macros().end());
 		REQUIRE(resolver.get_unknown_macros().empty());
-		REQUIRE(filter->is_equal(expected_filter.get()));
+		REQUIRE(filter->is_equal(expected_filter));

 		// second run
 		REQUIRE(resolver.run(filter) == false);
 		REQUIRE(resolver.get_resolved_macros().empty());
 		REQUIRE(resolver.get_unknown_macros().empty());
-		REQUIRE(filter->is_equal(expected_filter.get()));
+		REQUIRE(filter->is_equal(expected_filter));
+
+		delete filter;
+		delete expected_filter;
 	}
 }

@@ -173,16 +182,20 @@ TEST_CASE("Should find unknown macros", "[rule_loader]")

 	SECTION("in the general case")
 	{
-		std::vector<std::unique_ptr<expr>> filter_and;
-		filter_and.push_back(unary_check_expr::create("evt.name", "", "exists"));
-		filter_and.push_back(not_expr::create(value_expr::create(macro_name)));
-		std::shared_ptr<expr> filter = std::move(and_expr::create(filter_and));
+		expr* filter = new and_expr({
+			new unary_check_expr("evt.name", "", "exists"), 
+			new not_expr(
+				new value_expr(macro_name)
+			),
+		});

 		filter_macro_resolver resolver;
 		REQUIRE(resolver.run(filter) == false);
 		REQUIRE(resolver.get_unknown_macros().size() == 1);
 		REQUIRE(*resolver.get_unknown_macros().begin() == macro_name);
 		REQUIRE(resolver.get_resolved_macros().empty());
+
+		delete filter;
 	}

 	SECTION("with nested macros")
@@ -190,13 +203,13 @@ TEST_CASE("Should find unknown macros", "[rule_loader]")
 		string a_macro_name = macro_name + "_1";
 		string b_macro_name = macro_name + "_2";

-		std::vector<std::unique_ptr<expr>> a_macro_and;
-		a_macro_and.push_back(unary_check_expr::create("one.field", "", "exists"));
-		a_macro_and.push_back(value_expr::create(b_macro_name));
-		std::shared_ptr<expr> a_macro = std::move(and_expr::create(a_macro_and));
+		shared_ptr<expr> a_macro(new and_expr({
+			new unary_check_expr("one.field", "", "exists"),
+			new value_expr(b_macro_name),
+		}));

-		std::shared_ptr<expr> filter = std::move(value_expr::create(a_macro_name));
-		auto expected_filter = clone(a_macro.get());
+		expr* filter = new value_expr(a_macro_name);
+		expr* expected_filter = clone(a_macro.get());

 		filter_macro_resolver resolver;
 		resolver.set_macro(a_macro_name, a_macro);
@@ -207,16 +220,19 @@ TEST_CASE("Should find unknown macros", "[rule_loader]")
 		REQUIRE(*resolver.get_resolved_macros().begin() == a_macro_name);
 		REQUIRE(resolver.get_unknown_macros().size() == 1);
 		REQUIRE(*resolver.get_unknown_macros().begin() == b_macro_name);
-		REQUIRE(filter->is_equal(expected_filter.get()));
+		REQUIRE(filter->is_equal(expected_filter));
+
+		delete filter;
+		delete expected_filter;
 	}
 }

 TEST_CASE("Should undefine macro", "[rule_loader]")
 {
 	string macro_name = "test_macro";
-	std::shared_ptr<expr> macro = std::move(unary_check_expr::create("test.field", "", "exists"));
-	std::shared_ptr<expr> a_filter = std::move(value_expr::create(macro_name));
-	std::shared_ptr<expr> b_filter = std::move(value_expr::create(macro_name));
+	shared_ptr<expr> macro(new unary_check_expr("test.field", "", "exists"));
+	expr* a_filter = new value_expr(macro_name);
+	expr* b_filter = new value_expr(macro_name);
 	filter_macro_resolver resolver;

 	resolver.set_macro(macro_name, macro);
@@ -231,14 +247,18 @@ TEST_CASE("Should undefine macro", "[rule_loader]")
 	REQUIRE(resolver.get_resolved_macros().empty());
 	REQUIRE(resolver.get_unknown_macros().size() == 1);
 	REQUIRE(*resolver.get_unknown_macros().begin() == macro_name);
+
+	delete a_filter;
+	delete b_filter;
 }

 // checks that the macro AST is cloned and not shared across resolved filters
 TEST_CASE("Should clone macro AST", "[rule_loader]")
 {
 	string macro_name = "test_macro";
-	std::shared_ptr<unary_check_expr> macro = std::move(unary_check_expr::create("test.field", "", "exists"));
-	std::shared_ptr<expr> filter = std::move(value_expr::create(macro_name));
+	shared_ptr<unary_check_expr> macro(
+		new unary_check_expr("test.field", "", "exists"));
+	expr* filter = new value_expr(macro_name);
 	filter_macro_resolver resolver;
 	
 	resolver.set_macro(macro_name, macro);
@@ -248,6 +268,8 @@ TEST_CASE("Should clone macro AST", "[rule_loader]")
 	REQUIRE(resolver.get_unknown_macros().empty());
 	REQUIRE(filter->is_equal(macro.get()));

-	macro->field = "another.field";
+	macro.get()->field = "another.field";
 	REQUIRE(!filter->is_equal(macro.get()));
+
+	delete filter;
 }
--- a/tests/engine/test_filter_warning_resolver.cpp
+++ b/tests/engine/test_filter_warning_resolver.cpp
@@ -21,7 +21,8 @@ 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);
+	filter_warning_resolver().run(ast, w);
+	delete ast;
 	return !w.empty();
 }

--- a/tests/engine/test_plugin_requirements.cpp
+++ b/tests/engine/test_plugin_requirements.cpp
@@ -1,269 +0,0 @@
-/*
-Copyright (C) 2022 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 <memory>
-#include <catch.hpp>
-#include "falco_engine.h"
-
-static void check_requirements(
-        bool expect_success,
-        const std::vector<falco_engine::plugin_version_requirement>& plugins,
-        const std::string& ruleset_content)
-{
-    std::string err;
-    std::unique_ptr<falco_engine> e(new falco_engine());
-    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 (expect_success)
-        {
-            FAIL(res->as_string(false, c));
-        }
-        return;
-    }
-
-    if (!e->check_plugin_requirements(plugins, err))
-    {
-        if (expect_success)
-        {
-            FAIL(err);
-        }
-    }
-    else if (!expect_success)
-    {
-        FAIL("unexpected successful plugin requirements check");
-    }
-}
-
-TEST_CASE("check_plugin_requirements must accept", "[rule_loader]")
-{
-    SECTION("no requirement")
-    {
-        check_requirements(true, {{"k8saudit", "0.1.0"}}, "");
-    }
-
-    SECTION("single plugin")
-    {
-        check_requirements(true, {{"k8saudit", "0.1.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-        )");
-    }
-
-    SECTION("single plugin newer version")
-    {
-        check_requirements(true, {{"k8saudit", "0.2.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-        )");
-    }
-
-    SECTION("multiple plugins")
-    {
-        check_requirements(true, {{"k8saudit", "0.1.0"}, {"json", "0.3.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-  - name: json
-    version: 0.3.0
-        )");
-    }
-
-    SECTION("single plugin multiple versions")
-    {
-        check_requirements(true, {{"k8saudit", "0.2.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.2.0
-        )");
-    }
-
-    SECTION("single plugin with alternatives")
-    {
-        check_requirements(true, {{"k8saudit-other", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.4.0
-        )");
-    }
-
-    SECTION("multiple plugins with alternatives")
-    {
-        check_requirements(true, {{"k8saudit-other", "0.5.0"}, {"json2", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.4.0
-  - name: json
-    version: 0.3.0
-    alternatives:
-      - name: json2
-        version: 0.1.0
-        )");
-    }
-
-    SECTION("multiple plugins with alternatives with multiple versions")
-    {
-        check_requirements(true, {{"k8saudit-other", "0.7.0"}, {"json2", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.4.0
-  - name: json
-    version: 0.3.0
-    alternatives:
-      - name: json2
-        version: 0.1.0
- required_plugin_versions:
-  - name: k8saudit
-    version: 1.0.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.7.0
-        )");
-    }
-}
-
-TEST_CASE("check_plugin_requirements must reject", "[rule_loader]")
-{
-    SECTION("no plugin loaded")
-    {
-        check_requirements(false, {}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-        )");
-    }
-    
-    SECTION("single plugin wrong name")
-    {
-        check_requirements(false, {{"k8saudit", "0.1.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit2
-    version: 0.1.0
-        )");
-    }
-
-    SECTION("single plugin wrong version")
-    {
-        check_requirements(false, {{"k8saudit", "0.1.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.2.0
-        )");
-    }
-
-    SECTION("multiple plugins")
-    {
-        check_requirements(false, {{"k8saudit", "0.1.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-  - name: json
-    version: 0.3.0
-        )");
-    }
-
-    SECTION("single plugin multiple versions")
-    {
-        check_requirements(false, {{"k8saudit", "0.1.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.2.0
-        )");
-    }
-
-    SECTION("single plugin with alternatives")
-    {
-        check_requirements(false, {{"k8saudit2", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.4.0
-        )");
-    }
-
-    SECTION("single plugin with overlapping alternatives")
-    {
-        check_requirements(false, {{"k8saudit", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-    alternatives:
-      - name: k8saudit
-        version: 0.4.0
-        )");
-    }
-
-    SECTION("multiple plugins with alternatives")
-    {
-        check_requirements(false, {{"k8saudit-other", "0.5.0"}, {"json3", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.1.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.4.0
-  - name: json
-    version: 0.3.0
-    alternatives:
-      - name: json2
-        version: 0.1.0
-        )");
-    }
-
-    SECTION("multiple plugins with alternatives with multiple versions")
-    {
-        check_requirements(false, {{"k8saudit", "0.7.0"}, {"json2", "0.5.0"}}, R"(
- required_plugin_versions:
-  - name: k8saudit
-    version: 0.4.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.4.0
-  - name: json
-    version: 0.3.0
-    alternatives:
-      - name: json2
-        version: 0.1.0
- required_plugin_versions:
-  - name: k8saudit
-    version: 1.0.0
-    alternatives:
-      - name: k8saudit-other
-        version: 0.7.0
-        )");
-    }
-}
--- a/userspace/engine/CMakeLists.txt
+++ b/userspace/engine/CMakeLists.txt
@@ -21,13 +21,12 @@ set(FALCO_ENGINE_SOURCE_FILES
    filter_macro_resolver.cpp
    filter_evttype_resolver.cpp
    filter_warning_resolver.cpp
-    stats_manager.cpp
    rule_loader.cpp
-    rule_loader_reader.cpp
-    rule_loader_collector.cpp
-    rule_loader_compiler.cpp)
+    rule_reader.cpp
+    stats_manager.cpp)

 add_library(falco_engine STATIC ${FALCO_ENGINE_SOURCE_FILES})
+add_dependencies(falco_engine njson string-view-lite)

 if(USE_BUNDLED_DEPS)
  add_dependencies(falco_engine yamlcpp)
@@ -39,6 +38,7 @@ if(MINIMAL_BUILD)
    PUBLIC
      "${NJSON_INCLUDE}"
      "${TBB_INCLUDE_DIR}"
+      "${STRING_VIEW_LITE_INCLUDE}"
      "${LIBSCAP_INCLUDE_DIRS}"
      "${LIBSINSP_INCLUDE_DIRS}"
      "${YAMLCPP_INCLUDE_DIR}"
@@ -49,6 +49,7 @@ else()
    PUBLIC
      "${NJSON_INCLUDE}"
      "${TBB_INCLUDE_DIR}"
+      "${STRING_VIEW_LITE_INCLUDE}"
      "${LIBSCAP_INCLUDE_DIRS}"
      "${LIBSINSP_INCLUDE_DIRS}"
      "${YAMLCPP_INCLUDE_DIR}"
--- a/userspace/engine/falco_engine.cpp
+++ b/userspace/engine/falco_engine.cpp
@@ -18,7 +18,6 @@ limitations under the License.
 #include <unistd.h>
 #include <string>
 #include <fstream>
-#include <functional>
 #include <utility>

 #include <sinsp.h>
@@ -27,8 +26,7 @@ limitations under the License.
 #include "falco_engine.h"
 #include "falco_utils.h"
 #include "falco_engine_version.h"
-#include "rule_loader_reader.h"
-#include "rule_loader_compiler.h"
+#include "rule_reader.h"

 #include "formats.h"

@@ -42,9 +40,7 @@ using namespace std;
 using namespace falco;

 falco_engine::falco_engine(bool seed_rng)
-	: m_syscall_source(NULL),
-	  m_syscall_source_idx(SIZE_MAX),
-	  m_next_ruleset_id(0),
+	: m_next_ruleset_id(0),
 	  m_min_priority(falco_common::PRIORITY_DEBUG),
 	  m_sampling_ratio(1), m_sampling_multiplier(0),
 	  m_replace_container_info(false)
@@ -60,7 +56,7 @@ falco_engine::falco_engine(bool seed_rng)
 falco_engine::~falco_engine()
 {
 	m_rules.clear();
-	m_rule_collector.clear();
+	m_rule_loader.clear();
 	m_rule_stats_manager.clear();
 	m_sources.clear();
 }
@@ -70,7 +66,7 @@ uint32_t falco_engine::engine_version()
 	return (uint32_t) FALCO_ENGINE_VERSION;
 }

-const falco_source* falco_engine::find_source(const std::string& name) const
+falco_source* falco_engine::find_source(const std::string& name)
 {
 	auto ret = m_sources.at(name);
 	if(!ret)
@@ -80,7 +76,7 @@ const falco_source* falco_engine::find_source(const std::string& name) const
 	return ret;
 }

-const falco_source* falco_engine::find_source(std::size_t index) const
+falco_source* falco_engine::find_source(std::size_t index)
 {
 	auto ret = m_sources.at(index);
 	if(!ret)
@@ -97,7 +93,7 @@ static std::string fieldclass_key(const gen_event_filter_factory::filter_fieldcl
 	return fld_info.name + fld_info.shortdesc;
 }

-void falco_engine::list_fields(std::string &source, bool verbose, bool names_only, bool markdown) const
+void falco_engine::list_fields(std::string &source, bool verbose, bool names_only, bool markdown)
 {
 	// Maps from field class name + short desc to list of event
 	// sources for which this field class can be used.
@@ -105,14 +101,14 @@ void falco_engine::list_fields(std::string &source, bool verbose, bool names_onl

 	// Do a first pass to group together classes that are
 	// applicable to multiple event sources.
-	for(const auto &it : m_sources)
+	for(auto &it : m_sources)
 	{
 		if(source != "" && source != it.name)
 		{
 			continue;
 		}

-		for(const auto &fld_class : it.filter_factory->get_fields())
+		for(auto &fld_class : it.filter_factory->get_fields())
 		{
 			fieldclass_event_sources[fieldclass_key(fld_class)].insert(it.name);
 		}
@@ -124,7 +120,7 @@ void falco_engine::list_fields(std::string &source, bool verbose, bool names_onl

 	// In the second pass, actually print info, skipping duplicate
 	// field classes and also printing info on supported sources.
-	for(const auto &it : m_sources)
+	for(auto &it : m_sources)
 	{
 		if(source != "" && source != it.name)
 		{
@@ -175,7 +171,20 @@ void falco_engine::load_rules(const string &rules_content, bool verbose, bool al

 	std::unique_ptr<load_result> res = load_rules(rules_content, no_name);

-	interpret_load_result(res, no_name, rules_content, verbose);
+	if(verbose)
+	{
+		// Here, verbose controls whether to additionally
+		// "log" e.g. print to stderr. What's logged is always
+		// non-verbose so it fits on a single line.
+		// todo(jasondellaluce): introduce a logging callback in Falco
+		fprintf(stderr, "%s\n", res->as_string(false).c_str());
+	}
+
+	if(!res->successful())
+	{
+		// The output here is always the full e.g. "verbose" output.
+		throw falco_exception(res->as_string(true).c_str());
+	}
 }

 std::unique_ptr<load_result> falco_engine::load_rules(const std::string &rules_content, const std::string &name)
@@ -186,26 +195,15 @@ std::unique_ptr<load_result> falco_engine::load_rules(const std::string &rules_c
 	cfg.replace_output_container_info = m_replace_container_info;
 	cfg.default_ruleset_id = m_default_ruleset_id;

-	rule_loader::reader reader;
-	if (reader.read(cfg, m_rule_collector))
+	rule_reader reader;
+	if (reader.load(cfg, m_rule_loader))
 	{
 		for (auto &src : m_sources)
 		{
 			src.ruleset = src.ruleset_factory->new_ruleset();
 		}
-
-		rule_loader::compiler compiler;
 		m_rules.clear();
-		compiler.compile(cfg, m_rule_collector, m_rules);
-	}
-
-	if (cfg.res->successful())
-	{
-		m_rule_stats_manager.clear();
-		for (const auto &r : m_rules)
-		{
-			m_rule_stats_manager.on_rule_loaded(r);
-		}
+		m_rule_loader.compile(cfg, m_rules);
 	}

 	return std::move(cfg.res);
@@ -213,33 +211,44 @@ std::unique_ptr<load_result> falco_engine::load_rules(const std::string &rules_c

 void falco_engine::load_rules_file(const std::string &rules_filename, bool verbose, bool all_events)
 {
-	std::string rules_content;
+	std::unique_ptr<load_result> res = load_rules_file(rules_filename);

-	read_file(rules_filename, rules_content);
+	if(verbose)
+	{
+		// Here, verbose controls whether to additionally
+		// "log" e.g. print to stderr. What's logged is always
+		// non-verbose so it fits on a single line.
+		// todo(jasondellaluce): introduce a logging callback in Falco
+		fprintf(stderr, "%s\n", res->as_string(false).c_str());
+	}

-	std::unique_ptr<load_result> res = load_rules(rules_content, rules_filename);
-
-	interpret_load_result(res, rules_filename, rules_content, verbose);
+	if(!res->successful())
+	{
+		// The output here is always the full e.g. "verbose" output.
+		throw falco_exception(res->as_string(true).c_str());
+	}
 }

 std::unique_ptr<load_result> falco_engine::load_rules_file(const string &rules_filename)
 {
-	std::string rules_content;
+	ifstream is;

-	try {
-		read_file(rules_filename, rules_content);
-	}
-	catch (falco_exception &e)
+	is.open(rules_filename);
+	if (!is.is_open())
 	{
 		rule_loader::context ctx(rules_filename);
+		std::string empty;

 		std::unique_ptr<rule_loader::result> res(new rule_loader::result(rules_filename));

-		res->add_error(load_result::LOAD_ERR_FILE_READ, e.what(), ctx);
+		res->add_error(load_result::LOAD_ERR_FILE_READ, "Could not open for reading.", ctx, empty);

-		return res;
+		return std::move(res);
 	}

+	string rules_content((istreambuf_iterator<char>(is)),
+			     istreambuf_iterator<char>());
+
 	return load_rules(rules_content, rules_filename);
 }

@@ -248,7 +257,7 @@ void falco_engine::enable_rule(const string &substring, bool enabled, const stri
 	uint16_t ruleset_id = find_ruleset_id(ruleset);
 	bool match_exact = false;

-	for(const auto &it : m_sources)
+	for(auto &it : m_sources)
 	{
 		if(enabled)
 		{
@@ -266,7 +275,7 @@ void falco_engine::enable_rule_exact(const string &rule_name, bool enabled, cons
 	uint16_t ruleset_id = find_ruleset_id(ruleset);
 	bool match_exact = true;

-	for(const auto &it : m_sources)
+	for(auto &it : m_sources)
 	{
 		if(enabled)
 		{
@@ -283,7 +292,7 @@ void falco_engine::enable_rule_by_tag(const set<string> &tags, bool enabled, con
 {
 	uint16_t ruleset_id = find_ruleset_id(ruleset);

-	for(const auto &it : m_sources)
+	for(auto &it : m_sources)
 	{
 		if(enabled)
 		{
@@ -316,7 +325,7 @@ uint64_t falco_engine::num_rules_for_ruleset(const std::string &ruleset)
 {
 	uint16_t ruleset_id = find_ruleset_id(ruleset);
 	uint64_t ret = 0;
-	for (const auto &src : m_sources)
+	for (auto &src : m_sources)
 	{
 		ret += src.ruleset->enabled_count(ruleset_id);
 	}
@@ -329,49 +338,28 @@ void falco_engine::evttypes_for_ruleset(std::string &source, std::set<uint16_t>
 }

 std::shared_ptr<gen_event_formatter> falco_engine::create_formatter(const std::string &source,
-								    const std::string &output) const
+								    const std::string &output)
 {
 	return find_source(source)->formatter_factory->create_formatter(output);
 }

 unique_ptr<falco_engine::rule_result> falco_engine::process_event(std::size_t source_idx, gen_event *ev, uint16_t ruleset_id)
 {
-	// note: there are no thread-safety guarantees on the filter_ruleset::run()
-	// method, but the thread-safety assumptions of falco_engine::process_event()
-	// imply that concurrent invokers use different and non-switchable values of
-	// source_idx, which means that at any time each filter_ruleset will only
-	// be accessed by a single thread.
-
-	const falco_source *source;
-
-	if(source_idx == m_syscall_source_idx)
-	{
-		if(m_syscall_source == NULL)
-		{
-			m_syscall_source = find_source(m_syscall_source_idx);
-		}
-
-		source = m_syscall_source;
-	}
-	else
-	{
-		source = find_source(source_idx);
-	}
-
-	if(should_drop_evt() || !source || !source->ruleset->run(ev, source->m_rule, ruleset_id))
+	falco_rule rule;
+	if(should_drop_evt() || !find_source(source_idx)->ruleset->run(ev, rule, ruleset_id))
 	{
 		return unique_ptr<struct rule_result>();
 	}

 	unique_ptr<struct rule_result> res(new rule_result());
 	res->evt = ev;
-	res->rule = source->m_rule.name;
-	res->source = source->m_rule.source;
-	res->format = source->m_rule.output;
-	res->priority_num = source->m_rule.priority;
-	res->tags = source->m_rule.tags;
-	res->exception_fields = source->m_rule.exception_fields;
-	m_rule_stats_manager.on_event(source->m_rule);
+	res->rule = rule.name;
+	res->source = rule.source;
+	res->format = rule.output;
+	res->priority_num = rule.priority;
+	res->tags = rule.tags;
+	res->exception_fields = rule.exception_fields;
+	m_rule_stats_manager.on_event(rule);
 	return res;
 }

@@ -387,14 +375,7 @@ std::size_t falco_engine::add_source(const std::string &source,
 	// evttype_index_ruleset is the default ruleset implementation
 	std::shared_ptr<filter_ruleset_factory> ruleset_factory(
 		new evttype_index_ruleset_factory(filter_factory));
-	size_t idx = add_source(source, filter_factory, formatter_factory, ruleset_factory);
-
-	if(source == falco_common::syscall_source)
-	{
-		m_syscall_source_idx = idx;
-	}
-
-	return idx;
+	return add_source(source, filter_factory, formatter_factory, ruleset_factory);
 }

 std::size_t falco_engine::add_source(const std::string &source,
@@ -411,7 +392,7 @@ std::size_t falco_engine::add_source(const std::string &source,
 	return m_sources.insert(src, source);
 }

-void falco_engine::describe_rule(string *rule) const
+void falco_engine::describe_rule(string *rule)
 {
 	static const char* rule_fmt = "%-50s %s\n";
 	fprintf(stdout, rule_fmt, "Rule", "Description");
@@ -432,7 +413,7 @@ void falco_engine::describe_rule(string *rule) const
 	}
 }

-void falco_engine::print_stats() const
+void falco_engine::print_stats()
 {
 	string out;
 	m_rule_stats_manager.format(m_rules, out);
@@ -440,110 +421,57 @@ void falco_engine::print_stats() const
 	fprintf(stdout, "%s", out.c_str());
 }

-bool falco_engine::is_source_valid(const std::string &source) const
+bool falco_engine::is_source_valid(const std::string &source)
 {
 	return m_sources.at(source) != nullptr;
 }

-void falco_engine::read_file(const std::string& filename, std::string& contents)
-{
-	ifstream is;
-
-	is.open(filename);
-	if (!is.is_open())
-	{
-		throw falco_exception("Could not open " + filename + " for reading");
-	}
-
-	contents.assign(istreambuf_iterator<char>(is),
-			istreambuf_iterator<char>());
-}
-
-void falco_engine::interpret_load_result(std::unique_ptr<load_result>& res,
-					 const std::string& rules_filename,
-					 const std::string& rules_content,
-					 bool verbose)
-{
-	falco::load_result::rules_contents_t rc = {{rules_filename, rules_content}};
-
-	if(!res->successful())
-	{
-		// The output here is always the full e.g. "verbose" output.
-		throw falco_exception(res->as_string(true, rc).c_str());
-	}
-
-	if(verbose && res->has_warnings())
-	{
-		// Here, verbose controls whether to additionally
-		// "log" e.g. print to stderr. What's logged is always
-		// non-verbose so it fits on a single line.
-		// todo(jasondellaluce): introduce a logging callback in Falco
-		fprintf(stderr, "%s\n", res->as_string(false, rc).c_str());
-	}
-}
-
-static bool check_plugin_requirement_alternatives(
-		const std::vector<falco_engine::plugin_version_requirement>& plugins,
-		const rule_loader::plugin_version_info::requirement_alternatives& alternatives,
+bool falco_engine::check_plugin_requirements(
+		const std::vector<plugin_version_requirement>& plugins,
 		std::string& err)
 {
-	for (const auto &req : alternatives)
+	for (const auto &req : m_rule_loader.required_plugin_versions())
 	{
+		bool found = false;
 		for (const auto &plugin : plugins)
 		{
-			if (req.name == plugin.name)
+			if (req.first == plugin.name)
 			{
-				sinsp_version req_version(req.version);
+				found = true;
 				sinsp_version plugin_version(plugin.version);
 				if(!plugin_version.m_valid)
 				{
-					err = "Plugin '" + plugin.name
+					err = "Plugin '" + req.first
 						+ "' has invalid version string '"
 						+ plugin.version + "'";
 					return false;
 				}
-				if (!plugin_version.check(req_version))
+				for (const auto &reqver: req.second)
 				{
-					err = "Plugin '" + plugin.name
-					+ "' version '" + plugin.version
-					+ "' is not compatible with required plugin version '"
-					+ req.version + "'";
-					return false;
+					sinsp_version req_version(reqver);
+					if (!plugin_version.check(req_version))
+					{
+						err = "Plugin '" + plugin.name
+						+ "' version '" + plugin.version
+						+ "' is not compatible with required plugin version '"
+						+ reqver + "'";
+						return false;
+					}
 				}
-				return true;
 			}
 		}
-	}
-	return false;
-}
-
-bool falco_engine::check_plugin_requirements(
-		const std::vector<plugin_version_requirement>& plugins,
-		std::string& err) const
-{
-	err = "";
-	for (const auto &alternatives : m_rule_collector.required_plugin_versions())
-	{
-		if (!check_plugin_requirement_alternatives(plugins, alternatives, err))
+		if (!found)
 		{
-			if (err.empty())
-			{
-				for (const auto& req : alternatives)
-				{
-					err += err.empty() ? "" : ", ";
-					err += req.name + " (>= " + req.version + ")";
-				}
-				err = "Plugin requirement not satisfied, must load one of: " + err;
-			}
+			err = "Plugin '" + req.first + "' is required but not loaded";
 			return false;
 		}
 	}
 	return true;
 }

-void falco_engine::complete_rule_loading() const
+void falco_engine::complete_rule_loading()
 {
-	for (const auto &src : m_sources)
+	for (auto &src : m_sources)
 	{
 		src.ruleset->on_loading_complete();
 	}
@@ -565,7 +493,7 @@ void falco_engine::set_extra(string &extra, bool replace_container_info)
 	m_replace_container_info = replace_container_info;
 }

-inline bool falco_engine::should_drop_evt() const
+inline bool falco_engine::should_drop_evt()
 {
 	if(m_sampling_multiplier == 0)
 	{
--- a/userspace/engine/falco_engine.h
+++ b/userspace/engine/falco_engine.h
@@ -22,7 +22,6 @@ limitations under the License.

 #pragma once

-#include <atomic>
 #include <string>
 #include <memory>
 #include <set>
@@ -32,7 +31,6 @@ limitations under the License.
 #include "gen_filter.h"
 #include "filter_ruleset.h"
 #include "rule_loader.h"
-#include "rule_loader_collector.h"
 #include "stats_manager.h"
 #include "falco_common.h"
 #include "falco_source.h"
@@ -58,7 +56,7 @@ public:

 	// Print to stdout (using printf) a description of each field supported by this engine.
 	// If source is non-empty, only fields for the provided source are printed.
-	void list_fields(std::string &source, bool verbose, bool names_only, bool markdown) const;
+	void list_fields(std::string &source, bool verbose, bool names_only, bool markdown);

 	//
 	// Load rules either directly or from a filename.
@@ -100,7 +98,7 @@ public:
 	// Internally, this can be used to release unused resources before starting
 	// processing events with process_event().
 	//
-	void complete_rule_loading() const;
+	void complete_rule_loading();

 	// Only load rules having this priority or more severe.
 	void set_min_priority(falco_common::priority_type priority);
@@ -123,12 +121,12 @@ public:
 	// Print details on the given rule. If rule is NULL, print
 	// details on all rules.
 	//
-	void describe_rule(std::string *rule) const;
+	void describe_rule(std::string *rule);

 	//
 	// Print statistics on how many events matched each rule.
 	//
-	void print_stats() const;
+	void print_stats();

 	//
 	// Set the sampling ratio, which can affect which events are
@@ -147,7 +145,7 @@ public:
 	// of all output expressions. You can also choose to replace
 	// %container.info with the extra information or add it to the
 	// end of the expression. This is used in open source falco to
-	// add k8s/mesos/container information to outputs when
+	// add k8s/container information to outputs when
 	// available.
 	//
 	void set_extra(string &extra, bool replace_container_info);
@@ -167,33 +165,18 @@ public:
 	//
 	// Given an event, check it against the set of rules in the
 	// engine and if a matching rule is found, return details on
-	// the rule that matched. If no rule matched, returns nullptr.
+	// the rule that matched. If no rule matched, returns NULL.
 	//
-	// This method should be invoked only after having initialized and
-	// configured the engine. In particular, invoking this with a source_idx
-	// not previosly-returned by a call to add_source() would cause a
-	// falco_exception to be thrown.
+	// When ruleset_id is provided, use the enabled/disabled status
+	// associated with the provided ruleset. This is only useful
+	// when you have previously called enable_rule/enable_rule_by_tag
+	// with a ruleset string.
 	//
-	// This method is thread-safe only with the assumption that every invoker
-	// uses a different source_idx. Moreover, each invoker must not switch
-	// source_idx in subsequent invocations of this method.
-	// Considering that each invoker is related to a unique event source, it
-	// is safe to assume that each invoker will pass a different event
-	// to this method too, since two distinct sources cannot possibly produce
-	// the same event. Lastly, filterchecks and formatters (and their factories)
-	// that are used to populate the conditions for a given event-source
-	// ruleset must not be reused across rulesets of other event sources.
-	// These assumptions guarantee thread-safety because internally the engine
-	// is partitioned by event sources. However, each ruleset assigned to each
-	// event source is not thread-safe of its own, so invoking this method
-	// concurrently with the same source_idx would inherently cause data races
-	// and lead to undefined behavior.
+	// the returned rule_result is allocated and must be delete()d.
 	std::unique_ptr<rule_result> process_event(std::size_t source_idx, gen_event *ev, uint16_t ruleset_id);

 	//
-	// Wrapper assuming the default ruleset.
-	//
-	// This inherits the same thread-safety guarantees.
+	// Wrapper assuming the default ruleset
 	//
 	std::unique_ptr<rule_result> process_event(std::size_t source_idx, gen_event *ev);

@@ -217,7 +200,7 @@ public:

 	// Return whether or not there is a valid filter/formatter
 	// factory for this source.
-	bool is_source_valid(const std::string &source) const;
+	bool is_source_valid(const std::string &source);

 	//
 	// Given an event source and ruleset, fill in a bitset
@@ -233,10 +216,10 @@ public:
 	// event.
 	//
 	std::shared_ptr<gen_event_formatter> create_formatter(const std::string &source,
-							      const std::string &output) const;
+							      const std::string &output);

 	// The rule loader definition is aliased as it is exactly what we need
-	typedef rule_loader::plugin_version_info::requirement plugin_version_requirement;
+	typedef rule_loader::plugin_version_info plugin_version_requirement;

 	//
 	// Returns true if the provided list of plugins satisfies all the
@@ -247,39 +230,22 @@ public:
 	//
 	bool check_plugin_requirements(
 		const std::vector<plugin_version_requirement>& plugins,
-		std::string& err) const;
+		std::string& err);

 private:
-
-	// Throws falco_exception if the file can not be read
-	void read_file(const std::string& filename, std::string& contents);
-
-	// For load_rules methods that throw exceptions on error,
-	// interpret a load_result and throw an exception if needed.
-	void interpret_load_result(std::unique_ptr<falco::load_result>& res,
-				   const std::string& rules_filename,
-				   const std::string& rules_content,
-				   bool verbose);
-
 	indexed_vector<falco_source> m_sources;

-	const falco_source* find_source(std::size_t index) const;
-	const falco_source* find_source(const std::string& name) const;
-
-	// To allow the engine to be extremely fast for syscalls (can
-	// be > 1M events/sec), we save the syscall source/source_idx
-	// separately and check it explicitly in process_event()
-	const falco_source* m_syscall_source;
-	std::atomic<size_t> m_syscall_source_idx;
+	falco_source* find_source(std::size_t index);
+	falco_source* find_source(const std::string& name);

 	//
 	// Determine whether the given event should be matched at all
 	// against the set of rules, given the current sampling
 	// ratio/multiplier.
 	//
-	inline bool should_drop_evt() const;
+	inline bool should_drop_evt();

-	rule_loader::collector m_rule_collector;
+	rule_loader m_rule_loader;
 	indexed_vector<falco_rule> m_rules;
 	stats_manager m_rule_stats_manager;

--- a/userspace/engine/falco_engine_version.h
+++ b/userspace/engine/falco_engine_version.h
@@ -16,9 +16,9 @@ limitations under the License.

 // The version of rules/filter fields/etc supported by this Falco
 // engine.
-#define FALCO_ENGINE_VERSION (15)
+#define FALCO_ENGINE_VERSION (14)

 // This is the result of running "falco --list -N | sha256sum" and
 // represents the fields supported by this version of Falco. It's used
 // at build time to detect a changed set of fields.
-#define FALCO_FIELDS_CHECKSUM "7295abed12ed0f2fba58b10a383fbefb67741ef24d493233e056296350f1f288"
+#define FALCO_FIELDS_CHECKSUM "674c6cf2bc1c105038c8676f018fa3d1431d86597df428453441f5d859cad284"
--- a/userspace/engine/falco_load_result.h
+++ b/userspace/engine/falco_load_result.h
@@ -16,7 +16,6 @@ limitations under the License.

 #pragma once

-#include <functional>
 #include <string>
 #include <nlohmann/json.hpp>

@@ -56,8 +55,6 @@ public:
 		LOAD_UNKNOWN_ITEM
 	};

-	virtual ~load_result() = default;
-
 	// The warning code as a string
 	static const std::string& warning_code_str(warning_code ec);

@@ -78,35 +75,20 @@ public:
 	// has_warnings() can both be true if there were only warnings.
 	virtual bool has_warnings() = 0;

-	// This represents a set of rules contents as a mapping from
-	// rules content name (usually filename) to rules content. The
-	// rules content is actually a reference to the actual string
-	// to avoid copies. Using reference_wrapper allows the
-	// reference to be held in the stl map (bare references can't
-	// be copied/assigned, but reference_wrappers can).
-	//
-	// It's used in the as_string/as_json() methods below.
-	typedef std::map<std::string, std::reference_wrapper<const std::string>> rules_contents_t;
-
 	// This contains a human-readable version of the result,
 	// suitable for display to end users.
 	//
-	// The provided rules_contents_t should map from content name
-	// to rules content (reference) for each rules_content that has
-	// been passed to rule_loader::compile() or
-	// rule_reader::load().
-	//
 	// When verbose is true, the returned value has full details
 	// on the result including document locations/context.
 	//
 	// When verbose is false, the returned value is a short string
 	// with the success value and a list of
 	// errors/warnings. Suitable for simple one-line display.
-	virtual const std::string& as_string(bool verbose, const rules_contents_t& contents) = 0;
+	virtual const std::string& as_string(bool verbose) = 0;

 	// This contains the full result structure as json, suitable
 	// for automated parsing/interpretation downstream.
-	virtual const nlohmann::json& as_json(const rules_contents_t& contents) = 0;
+	virtual const nlohmann::json& as_json() = 0;
 };

 } // namespace falco
--- a/userspace/engine/falco_rule.h
+++ b/userspace/engine/falco_rule.h
@@ -26,12 +26,6 @@ limitations under the License.
 */
 struct falco_rule
 {
-	falco_rule(): id(0), priority(falco_common::PRIORITY_DEBUG) {}
-	falco_rule(falco_rule&&) = default;
-	falco_rule& operator = (falco_rule&&) = default;
-	falco_rule(const falco_rule&) = default;
-	falco_rule& operator = (const falco_rule&) = default;
-
 	std::size_t id;
 	std::string source;
 	std::string name;
--- a/userspace/engine/falco_source.h
+++ b/userspace/engine/falco_source.h
@@ -26,34 +26,13 @@ limitations under the License.
 */
 struct falco_source
 {
-	falco_source() = default;
-	falco_source(falco_source&&) = default;
-	falco_source& operator = (falco_source&&) = default;
-	falco_source(const falco_source& s):
-		name(s.name),
-		ruleset_factory(s.ruleset_factory),
-		filter_factory(s.filter_factory),
-		formatter_factory(s.formatter_factory) { };
-	falco_source& operator = (const falco_source& s)
-	{
-		name = s.name;
-		ruleset_factory = s.ruleset_factory;
-		filter_factory = s.filter_factory;
-		formatter_factory = s.formatter_factory;
-		return *this;
-	};
-
 	std::string name;
 	std::shared_ptr<filter_ruleset> ruleset;
 	std::shared_ptr<filter_ruleset_factory> ruleset_factory;
 	std::shared_ptr<gen_event_filter_factory> filter_factory;
 	std::shared_ptr<gen_event_formatter_factory> formatter_factory;

-	// Used by the filter_ruleset interface. Filled in when a rule
-	// matches an event.
-	mutable falco_rule m_rule;
-
-	inline bool is_field_defined(const std::string& field) const
+	inline bool is_field_defined(std::string field) const
 	{
 		auto *chk = filter_factory->new_filtercheck(field.c_str());
 		if (chk)
--- a/userspace/engine/falco_utils.cpp
+++ b/userspace/engine/falco_utils.cpp
@@ -20,7 +20,6 @@ limitations under the License.
 #include <iomanip>

 #include "falco_utils.h"
-#include "utils.h"
 #include "banned.h" // This raises a compilation error when certain functions are used

 namespace falco
@@ -76,9 +75,9 @@ void readfile(const std::string& filename, std::string& data)
 }
 namespace network
 {
-bool is_unix_scheme(const std::string& url)
+bool is_unix_scheme(nonstd::string_view url)
 {
-	return sinsp_utils::startswith(url, UNIX_SCHEME);
+	return url.starts_with(UNIX_SCHEME);
 }
 } // namespace network
 } // namespace utils
--- a/userspace/engine/falco_utils.h
+++ b/userspace/engine/falco_utils.h
@@ -24,6 +24,7 @@ limitations under the License.
 #include <iostream>
 #include <string>
 #include <thread>
+#include <nonstd/string_view.hpp>

 #ifdef __GNUC__
 #define likely(x) __builtin_expect(!!(x), 1)
@@ -48,7 +49,7 @@ uint32_t hardware_concurrency();
 namespace network
 {
 static const std::string UNIX_SCHEME("unix://");
-bool is_unix_scheme(const std::string& url);
+bool is_unix_scheme(nonstd::string_view url);
 } // namespace network
 } // namespace utils
 } // namespace falco
--- a/userspace/engine/filter_evttype_resolver.cpp
+++ b/userspace/engine/filter_evttype_resolver.cpp
@@ -17,32 +17,31 @@ limitations under the License.
 #include "filter_evttype_resolver.h"
 #include <sinsp.h>

+using namespace std;
 using namespace libsinsp::filter;

 extern sinsp_evttables g_infotables;

-static bool is_evttype_operator(const std::string& op)
+static bool is_evttype_operator(const string& op)
 {
 	return op == "==" || op == "=" || op == "!=" || op == "in";
 }

-
-size_t falco_event_types::get_ppm_event_max()
+void filter_evttype_resolver::visitor::inversion(set<uint16_t>& types)
 {
-	return PPM_EVENT_MAX;
-}
-
-void filter_evttype_resolver::visitor::inversion(falco_event_types& types)
-{
-	falco_event_types all_types;
+	set<uint16_t> all_types;
 	evttypes("", all_types);
 	if (types != all_types) // we don't invert the "all types" set
 	{
-		types = all_types.diff(types);
+		set<uint16_t> diff = types;
+		types.clear();
+		set_difference(
+			all_types.begin(), all_types.end(), diff.begin(), diff.end(),
+			inserter(types, types.begin()));
 	}
 }

-void filter_evttype_resolver::visitor::evttypes(const std::string& evtname, falco_event_types& out)
+void filter_evttype_resolver::visitor::evttypes(string evtname, set<uint16_t>& out)
 {
 	// Fill in from 2 to PPM_EVENT_MAX-1. 0 and 1 are excluded as
 	// those are PPM_GENERIC_E/PPME_GENERIC_X
@@ -50,7 +49,8 @@ void filter_evttype_resolver::visitor::evttypes(const std::string& evtname, falc
 	for(uint16_t i = 2; i < PPM_EVENT_MAX; i++)
 	{
 		// Skip unused events or events not matching the requested evtname
-		if(!sinsp::is_unused_event(i) && (evtname.empty() || std::string(etable[i].name) == evtname))
+		if(!(etable[i].flags & EF_UNUSED)
+			&& (evtname.empty() || string(etable[i].name) == evtname))
 		{
 			out.insert(i);
 		}
@@ -59,38 +59,42 @@ void filter_evttype_resolver::visitor::evttypes(const std::string& evtname, falc

 void filter_evttype_resolver::evttypes(
 	ast::expr* filter,
-	std::set<uint16_t>& out) const
+	set<uint16_t>& out) const
 {
 	visitor v;
 	v.m_expect_value = false;
 	v.m_last_node_evttypes.clear();
 	filter->accept(&v);
-	v.m_last_node_evttypes.for_each([&out](uint16_t val){out.insert(val); return true;});
+	out.insert(v.m_last_node_evttypes.begin(), v.m_last_node_evttypes.end());
 }

 void filter_evttype_resolver::evttypes(
 	shared_ptr<ast::expr> filter,
-	std::set<uint16_t>& out) const
+	set<uint16_t>& out) const
 {
 	visitor v;
 	v.m_expect_value = false;
 	v.m_last_node_evttypes.clear();
 	filter.get()->accept(&v);
-	v.m_last_node_evttypes.for_each([&out](uint16_t val){out.insert(val); return true;} );
+	out.insert(v.m_last_node_evttypes.begin(), v.m_last_node_evttypes.end());
 }

 // "and" nodes evttypes are the intersection of the evttypes of their children.
 // we initialize the set with "all event types"
 void filter_evttype_resolver::visitor::visit(ast::and_expr* e)
 {
-	falco_event_types types;
+	set<uint16_t> types, inters;
 	evttypes("", types);
 	m_last_node_evttypes.clear();
 	for (auto &c : e->children)
 	{
-		falco_event_types inters;
+		inters.clear();
 		c->accept(this);
-		types = types.intersect(m_last_node_evttypes);
+		set_intersection(
+			types.begin(), types.end(),
+			m_last_node_evttypes.begin(), m_last_node_evttypes.end(),
+			inserter(inters, inters.begin()));
+		types = inters;
 	}
 	m_last_node_evttypes = types;
 }
@@ -98,12 +102,12 @@ void filter_evttype_resolver::visitor::visit(ast::and_expr* e)
 // "or" nodes evttypes are the union of the evttypes their children
 void filter_evttype_resolver::visitor::visit(ast::or_expr* e)
 {
-	falco_event_types types;
+	set<uint16_t> types;
 	m_last_node_evttypes.clear();
 	for (auto &c : e->children)
 	{
 		c->accept(this);
-		types.merge(m_last_node_evttypes);
+		types.insert(m_last_node_evttypes.begin(), m_last_node_evttypes.end());
 	}
 	m_last_node_evttypes = types;
 }
--- a/userspace/engine/filter_evttype_resolver.h
+++ b/userspace/engine/filter_evttype_resolver.h
@@ -20,128 +20,6 @@ limitations under the License.
 #include <string>
 #include <set>
 #include <memory>
-#include <functional>
-#include <stdexcept>
-
-class falco_event_types
-{
-private:
-	using vec_t = std::vector<uint8_t>;
-	vec_t m_types{};
-
-	static inline void check_range(uint16_t e)
-	{
-	    	static const auto enum_max = get_ppm_event_max();
-		if(e > enum_max)
-		{
-			throw std::range_error("invalid event type");
-		}
-	}
-
-public:
-	falco_event_types(falco_event_types&&) = default;
-	falco_event_types(const falco_event_types&) = default;
-	falco_event_types& operator=(falco_event_types&&) = default;
-	falco_event_types& operator=(const falco_event_types&) = default;
-
-	static size_t get_ppm_event_max();
-
-	inline falco_event_types():
-		m_types(get_ppm_event_max() + 1, 0)
-	{
-	}
-
-	inline void insert(uint16_t e)
-	{
-		check_range(e);
-		m_types[e] = 1;
-	}
-
-	void merge(const falco_event_types& other)
-	{
-		for(size_t i = 0; i <= get_ppm_event_max(); ++i)
-		{
-			m_types[i] |= other.m_types[i];
-		}
-	}
-
-	void merge(const std::set<uint16_t>& other)
-	{
-		for(const auto& e : other)
-		{
-			insert(e);
-		}
-	}
-
-	inline bool contains(uint16_t e) const
-	{
-		check_range(e);
-		return m_types[e] != 0;
-	}
-
-	void clear()
-	{
-		for(auto& v : m_types)
-		{
-			v = 0;
-		}
-	}
-
-	bool equals(const falco_event_types& other) const
-	{
-		return m_types == other.m_types;
-	}
-
-	falco_event_types diff(const falco_event_types& other)
-	{
-		falco_event_types ret;
-		for(size_t i = 0; i <= get_ppm_event_max(); ++i)
-		{
-			if(m_types[i] == 1 && other.m_types[i] == 0)
-			{
-				ret.m_types[i] = 1;
-			}
-		}
-		return ret;
-	}
-
-	falco_event_types intersect(const falco_event_types& other)
-	{
-		falco_event_types ret;
-		for(size_t i = 0; i <= get_ppm_event_max(); ++i)
-		{
-			if(m_types[i] == 1 && other.m_types[i] == 1)
-			{
-				ret.m_types[i] = 1;
-			}
-		}
-		return ret;
-	}
-
-	void for_each(std::function<bool(uint16_t)> consumer) const
-	{
-		for(uint16_t i = 0; i < m_types.size(); ++i)
-		{
-			if(m_types[i] != 0)
-			{
-				if(!consumer(i))
-				{
-					return;
-				}
-			}
-		}
-	}
-};
-
-inline bool operator==(const falco_event_types& lhs, const falco_event_types& rhs)
-{
-	return lhs.equals(rhs);
-}
-
-inline bool operator!=(const falco_event_types& lhs, const falco_event_types& rhs)
-{
-	return !(lhs == rhs);
-}

 /*!
 	\brief Helper class for finding event types
@@ -157,12 +35,9 @@ public:
 		string is passed, all the available evttypes are collected
 		\param out The set to be filled with the evttypes
 	*/
-	inline void evttypes(const std::string& evtname, falco_event_types& out) const
+	inline void evttypes(std::string evtname, std::set<uint16_t>& out) const
 	{
-		falco_event_types evt_types;
-		visitor().evttypes(evtname, evt_types);
-		evt_types.for_each([&out](uint16_t val)
-				   {out.insert(val); return true; });
+		visitor().evttypes(evtname, out);
 	}

 	/*!
@@ -188,14 +63,8 @@ public:
 private:
 	struct visitor : public libsinsp::filter::ast::expr_visitor
 	{
-		visitor(): m_expect_value(false) {}
-		visitor(visitor&&) = default;
-		visitor& operator = (visitor&&) = default;
-		visitor(const visitor&) = default;
-		visitor& operator = (const visitor&) = default;
-
 		bool m_expect_value;
-		falco_event_types m_last_node_evttypes;
+		std::set<uint16_t> m_last_node_evttypes;

 		void visit(libsinsp::filter::ast::and_expr* e) override;
 		void visit(libsinsp::filter::ast::or_expr* e) override;
@@ -204,7 +73,7 @@ private:
 		void visit(libsinsp::filter::ast::list_expr* e) override;
 		void visit(libsinsp::filter::ast::unary_check_expr* e) override;
 		void visit(libsinsp::filter::ast::binary_check_expr* e) override;
-		void inversion(falco_event_types& types);
-		void evttypes(const std::string& evtname, falco_event_types& out);
+		void inversion(std::set<uint16_t>& types);
+		void evttypes(std::string evtname, std::set<uint16_t>& out);
 	};
 };
--- a/userspace/engine/filter_macro_resolver.cpp
+++ b/userspace/engine/filter_macro_resolver.cpp
@@ -27,12 +27,13 @@ bool filter_macro_resolver::run(libsinsp::filter::ast::expr*& filter)
 	v.m_unknown_macros = &m_unknown_macros;
 	v.m_resolved_macros = &m_resolved_macros;
 	v.m_macros = &m_macros;
-	v.m_node_substitute = nullptr;
+	v.m_last_node_changed = false;
+	v.m_last_node = filter;
 	filter->accept(&v);
-	if (v.m_node_substitute)
+	if (v.m_last_node_changed)
 	{
 		delete filter;
-		filter = v.m_node_substitute.release();
+		filter = v.m_last_node;
 	}
 	return !m_resolved_macros.empty();
 }
@@ -45,11 +46,12 @@ bool filter_macro_resolver::run(std::shared_ptr<libsinsp::filter::ast::expr>& fi
 	v.m_unknown_macros = &m_unknown_macros;
 	v.m_resolved_macros = &m_resolved_macros;
 	v.m_macros = &m_macros;
-	v.m_node_substitute = nullptr;
+	v.m_last_node_changed = false;
+	v.m_last_node = filter.get();
 	filter->accept(&v);
-	if (v.m_node_substitute)
+	if (v.m_last_node_changed)
 	{
-		filter = std::move(v.m_node_substitute);
+		filter.reset(v.m_last_node);
 	}
 	return !m_resolved_macros.empty();
 }
@@ -61,12 +63,12 @@ void filter_macro_resolver::set_macro(
 	m_macros[name] = macro;
 }

-const unordered_set<string>& filter_macro_resolver::get_unknown_macros() const
+const set<string>& filter_macro_resolver::get_unknown_macros() const
 {
 	return m_unknown_macros;
 }

-const unordered_set<string>& filter_macro_resolver::get_resolved_macros() const
+const set<string>& filter_macro_resolver::get_resolved_macros() const
 {
 	return m_resolved_macros;
 }
@@ -76,12 +78,14 @@ void filter_macro_resolver::visitor::visit(ast::and_expr* e)
 	for (size_t i = 0; i < e->children.size(); i++)
 	{
 		e->children[i]->accept(this);
-		if (m_node_substitute)
+		if (m_last_node_changed)
 		{
-			e->children[i] = std::move(m_node_substitute);
+			delete e->children[i];
+			e->children[i] = m_last_node;
 		}
 	}
-	m_node_substitute = nullptr;
+	m_last_node = e;
+	m_last_node_changed = false;
 }

 void filter_macro_resolver::visitor::visit(ast::or_expr* e)
@@ -89,39 +93,46 @@ void filter_macro_resolver::visitor::visit(ast::or_expr* e)
 	for (size_t i = 0; i < e->children.size(); i++)
 	{
 		e->children[i]->accept(this);
-		if (m_node_substitute)
+		if (m_last_node_changed)
 		{
-			e->children[i] = std::move(m_node_substitute);
+			delete e->children[i];
+			e->children[i] = m_last_node;
 		}
 	}
-	m_node_substitute = nullptr;
+	m_last_node = e;
+	m_last_node_changed = false;
 }

 void filter_macro_resolver::visitor::visit(ast::not_expr* e)
 {
 	e->child->accept(this);
-	if (m_node_substitute)
+	if (m_last_node_changed)
 	{
-		e->child = std::move(m_node_substitute);
+		delete e->child;
+		e->child = m_last_node;
 	}
-	m_node_substitute = nullptr;
+	m_last_node = e;
+	m_last_node_changed = false;
 }

 void filter_macro_resolver::visitor::visit(ast::list_expr* e)
 {
-	m_node_substitute = nullptr;
+	m_last_node = e;
+	m_last_node_changed = false;
 }

 void filter_macro_resolver::visitor::visit(ast::binary_check_expr* e)
 {
 	// avoid exploring checks, so that we can be sure that each
 	// value_expr* node visited is a macro identifier
-	m_node_substitute = nullptr;
+	m_last_node = e;
+	m_last_node_changed = false;
 }

 void filter_macro_resolver::visitor::visit(ast::unary_check_expr* e)
 {
-	m_node_substitute = nullptr;
+	m_last_node = e;
+	m_last_node_changed = false;
 }

 void filter_macro_resolver::visitor::visit(ast::value_expr* e)
@@ -132,20 +143,15 @@ void filter_macro_resolver::visitor::visit(ast::value_expr* e)
 	auto macro = m_macros->find(e->value);
 	if (macro != m_macros->end() && macro->second) // skip null-ptr macros
 	{
-		m_node_substitute = nullptr;
-		auto new_node = ast::clone(macro->second.get());
-		new_node->accept(this);
-		// new_node might already have set a non-NULL m_node_substitute.
-		// if not, the right substituted is the newly-cloned node.
-		if (!m_node_substitute)
-		{
-			m_node_substitute = std::move(new_node);
-		}
+		ast::expr* new_node = ast::clone(macro->second.get());
+		new_node->accept(this); // this sets m_last_node
+		m_last_node_changed = true;
 		m_resolved_macros->insert(e->value);
 	}
 	else
 	{
-		m_node_substitute = nullptr;
+		m_last_node = e;
+		m_last_node_changed = false;
 		m_unknown_macros->insert(e->value);
 	}
 }
--- a/userspace/engine/filter_macro_resolver.h
+++ b/userspace/engine/filter_macro_resolver.h
@@ -18,8 +18,8 @@ limitations under the License.

 #include <filter/parser.h>
 #include <string>
-#include <unordered_set>
-#include <unordered_map>
+#include <set>
+#include <map>
 #include <memory>

 /*!
@@ -63,7 +63,7 @@ class filter_macro_resolver
 			substituted during the last invocation of run(). Should be
 			non-empty if the last invocation of run() returned true.
 		*/
-		const std::unordered_set<std::string>& get_resolved_macros() const;
+		const std::set<std::string>& get_resolved_macros() const;

 		/*!
 			\brief Returns a set containing the names of all the macros
@@ -71,25 +71,20 @@ class filter_macro_resolver
 			A macro remains unresolved if it is found inside the processed
 			filter but it was not defined with set_macro();
 		*/
-		const std::unordered_set<std::string>& get_unknown_macros() const;
+		const std::set<std::string>& get_unknown_macros() const;
 		
 	private:
-		typedef std::unordered_map<
+		typedef std::map<
 			std::string,
 			std::shared_ptr<libsinsp::filter::ast::expr>
 		> macro_defs;

 		struct visitor : public libsinsp::filter::ast::expr_visitor
 		{
-			visitor() = default;
-			visitor(visitor&&) = default;
-			visitor& operator = (visitor&&) = default;
-			visitor(const visitor&) = delete;
-			visitor& operator = (const visitor&) = delete;
-
-			std::unique_ptr<libsinsp::filter::ast::expr> m_node_substitute;
-			std::unordered_set<std::string>* m_unknown_macros;
-			std::unordered_set<std::string>* m_resolved_macros;
+			bool m_last_node_changed;
+			libsinsp::filter::ast::expr* m_last_node;
+			std::set<std::string>* m_unknown_macros;
+			std::set<std::string>* m_resolved_macros;
 			macro_defs* m_macros;

 			void visit(libsinsp::filter::ast::and_expr* e) override;
@@ -101,7 +96,7 @@ class filter_macro_resolver
 			void visit(libsinsp::filter::ast::binary_check_expr* e) override;
 		};

-		std::unordered_set<std::string> m_unknown_macros;
-		std::unordered_set<std::string> m_resolved_macros;
+		std::set<std::string> m_unknown_macros;
+		std::set<std::string> m_resolved_macros;
 		macro_defs m_macros;
 };
--- a/userspace/engine/filter_ruleset.h
+++ b/userspace/engine/filter_ruleset.h
@@ -151,7 +151,5 @@ public:
 class filter_ruleset_factory
 {
 public:
-	virtual ~filter_ruleset_factory() = default;
-
 	virtual std::shared_ptr<filter_ruleset> new_ruleset() = 0;
 };
--- a/userspace/engine/filter_warning_resolver.h
+++ b/userspace/engine/filter_warning_resolver.h
@@ -48,12 +48,6 @@ public:
 private:
 	struct visitor : public libsinsp::filter::ast::base_expr_visitor
 	{
-		visitor(): m_is_equality_check(false), m_warnings(nullptr) {}
-		visitor(visitor&&) = default;
-		visitor& operator = (visitor&&) = default;
-		visitor(const visitor&) = delete;
-		visitor& operator = (const visitor&) = delete;
-
 		bool m_is_equality_check;
 		std::set<falco::load_result::warning_code>* m_warnings;

--- a/userspace/engine/formats.cpp
+++ b/userspace/engine/formats.cpp
@@ -20,7 +20,7 @@ limitations under the License.
 #include "falco_engine.h"
 #include "banned.h" // This raises a compilation error when certain functions are used

-falco_formats::falco_formats(std::shared_ptr<const falco_engine> engine,
+falco_formats::falco_formats(std::shared_ptr<falco_engine> engine,
 			     bool json_include_output_property,
 			     bool json_include_tags_property)
 	: m_falco_engine(engine),
@@ -34,8 +34,7 @@ falco_formats::~falco_formats()
 }

 string falco_formats::format_event(gen_event *evt, const std::string &rule, const std::string &source,
-				   const std::string &level, const std::string &format, std::set<std::string> &tags,
-				   const std::string &hostname) const
+				   const std::string &level, const std::string &format, std::set<std::string> &tags)
 {
 	string line;

@@ -84,7 +83,6 @@ string falco_formats::format_event(gen_event *evt, const std::string &rule, cons
 		event["rule"] = rule;
 		event["priority"] = level;
 		event["source"] = source;
-		event["hostname"] = hostname;

 		if(m_json_include_output_property)
 		{
@@ -132,7 +130,7 @@ string falco_formats::format_event(gen_event *evt, const std::string &rule, cons
 }

 map<string, string> falco_formats::get_field_values(gen_event *evt, const std::string &source,
-						    const std::string &format) const
+						    const std::string &format)
 {
 	std::shared_ptr<gen_event_formatter> formatter;

--- a/userspace/engine/formats.h
+++ b/userspace/engine/formats.h
@@ -24,20 +24,19 @@ limitations under the License.
 class falco_formats
 {
 public:
-	falco_formats(std::shared_ptr<const falco_engine> engine,
+	falco_formats(std::shared_ptr<falco_engine> engine,
 		      bool json_include_output_property,
 		      bool json_include_tags_property);
 	virtual ~falco_formats();

 	std::string format_event(gen_event *evt, const std::string &rule, const std::string &source,
-				 const std::string &level, const std::string &format, std::set<std::string> &tags,
-				 const std::string &hostname) const;
+				 const std::string &level, const std::string &format, std::set<std::string> &tags);

 	map<string, string> get_field_values(gen_event *evt, const std::string &source,
-					     const std::string &format) const ;
+					     const std::string &format);

 protected:
-	std::shared_ptr<const falco_engine> m_falco_engine;
+	std::shared_ptr<falco_engine> m_falco_engine;
 	bool m_json_include_output_property;
 	bool m_json_include_tags_property;
 };
--- a/userspace/engine/indexed_vector.h
+++ b/userspace/engine/indexed_vector.h
@@ -28,12 +28,7 @@ template <typename T>
 class indexed_vector
 {
 public:
-	indexed_vector() = default;
 	virtual ~indexed_vector() = default;
-	indexed_vector(indexed_vector&&) = default;
-	indexed_vector& operator = (indexed_vector&&) = default;
-	indexed_vector(const indexed_vector&) = default;
-	indexed_vector& operator = (const indexed_vector&) = default;

 	/*!
 		\brief Returns the number of elements
@@ -73,7 +68,7 @@ public:
 		\param index String index of the element to be added in the vector
 		\return The numeric index assigned to the element
 	*/
-	virtual inline size_t insert(const T& entry, const std::string& index)
+	virtual inline size_t insert(T& entry, const std::string& index)
 	{
 		size_t id;
 		auto prev = m_index.find(index);
@@ -94,7 +89,7 @@ public:
 	*/
 	virtual inline T* at(size_t id) const
 	{
-		if (id < m_entries.size())
+		if (id <= m_entries.size())
 		{
 			return (T* const) &m_entries[id];
 		}
@@ -136,5 +131,5 @@ public:

 private:
 	std::vector<T> m_entries;
-	std::unordered_map<std::string, size_t> m_index;
+	std::map<std::string, size_t> m_index;
 };
--- a/userspace/engine/json_evt.cpp
+++ b/userspace/engine/json_evt.cpp
@@ -515,17 +515,16 @@ int32_t json_event_filter_check::parse_field_name(const char *str, bool alloc_st

 	size_t idx_len = 0;

-	for(const auto &info : get_info().m_fields)
+	for(auto &info : m_info.m_fields)
 	{
-		auto iter = get_aliases().find(info.m_name);
-		if( iter == get_aliases().end())
+		if(m_aliases.find(info.m_name) == m_aliases.end())
 		{
 			throw falco_exception("Could not find alias for field name " + info.m_name);
 		}

 		m_uses_paths = info.m_uses_paths;

-		auto &al = iter->second;
+		auto &al = m_aliases[info.m_name];

 		// What follows the match must not be alphanumeric or a dot
 		if(strncmp(info.m_name.c_str(), str, info.m_name.size()) == 0 &&
@@ -693,6 +692,11 @@ size_t json_event_filter_check::parsed_size()
 	}
 }

+json_event_filter_check::check_info &json_event_filter_check::get_info()
+{
+	return m_info;
+}
+
 void json_event_filter_check::add_extracted_value(const std::string &str)
 {
 	m_evalues.first.emplace_back(json_event_value(str));
@@ -789,9 +793,9 @@ std::string jevt_filter_check::s_jevt_rawtime_field = "jevt.rawtime";
 std::string jevt_filter_check::s_jevt_value_field = "jevt.value";
 std::string jevt_filter_check::s_jevt_obj_field = "jevt.obj";

-const jevt_filter_check::check_info &jevt_filter_check::get_info() const
+jevt_filter_check::jevt_filter_check()
 {
-	static const check_info info = {"jevt",
+	m_info = {"jevt",
 		  "generic ways to access json events",
 		  "",
 		  {{s_jevt_time_field, "json event timestamp as a string that includes the nanosecond part"},
@@ -799,11 +803,6 @@ const jevt_filter_check::check_info &jevt_filter_check::get_info() const
 		   {s_jevt_rawtime_field, "absolute event timestamp, i.e. nanoseconds from epoch."},
 		   {s_jevt_value_field, "General way to access single property from json object. The syntax is [<json pointer expression>]. The property is returned as a string", IDX_REQUIRED, IDX_KEY},
 		   {s_jevt_obj_field, "The entire json object, stringified"}}};
-	return info;
-}
-
-jevt_filter_check::jevt_filter_check()
-{
 }

 jevt_filter_check::~jevt_filter_check()
@@ -1283,77 +1282,71 @@ bool k8s_audit_filter_check::extract_any_privileged(const json &j,
 	return true;
 }

-const json_event_filter_check::check_info &k8s_audit_filter_check::get_info() const
+k8s_audit_filter_check::k8s_audit_filter_check()
 {
-	static const json_event_filter_check::check_info
-		info = {"ka",
-			  "Access K8s Audit Log Events",
-			  "Fields with an IDX_ALLOWED annotation can be indexed (e.g. ka.req.containers.image[k] returns the image for the kth container). The index is optional--without any index the field returns values for all items. The index must be numeric with an IDX_NUMERIC annotation, and can be any string with an IDX_KEY annotation. Fields with an IDX_REQUIRED annotation require an index.",
-			  {{"ka.auditid", "The unique id of the audit event"},
-			   {"ka.stage", "Stage of the request (e.g. RequestReceived, ResponseComplete, etc.)"},
-			   {"ka.auth.decision", "The authorization decision"},
-			   {"ka.auth.reason", "The authorization reason"},
-			   {"ka.user.name", "The user name performing the request"},
-			   {"ka.user.groups", "The groups to which the user belongs"},
-			   {"ka.impuser.name", "The impersonated user name"},
-			   {"ka.verb", "The action being performed"},
-			   {"ka.uri", "The request URI as sent from client to server"},
-			   {"ka.uri.param", "The value of a given query parameter in the uri (e.g. when uri=/foo?key=val, ka.uri.param[key] is val).", IDX_REQUIRED, IDX_KEY},
-			   {"ka.target.name", "The target object name"},
-			   {"ka.target.namespace", "The target object namespace"},
-			   {"ka.target.resource", "The target object resource"},
-			   {"ka.target.subresource", "The target object subresource"},
-			   {"ka.req.binding.subjects", "When the request object refers to a cluster role binding, the subject (e.g. account/users) being linked by the binding"},
-			   {"ka.req.binding.role", "When the request object refers to a cluster role binding, the role being linked by the binding"},
-			   {"ka.req.binding.subject.has_name", "Deprecated, always returns \"N/A\". Only provided for backwards compatibility", IDX_REQUIRED, IDX_KEY},
-			   {"ka.req.configmap.name", "If the request object refers to a configmap, the configmap name"},
-			   {"ka.req.configmap.obj", "If the request object refers to a configmap, the entire configmap object"},
-			   {"ka.req.pod.containers.image", "When the request object refers to a pod, the container's images.", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.container.image", "Deprecated by ka.req.pod.containers.image. Returns the image of the first container only"},
-			   {"ka.req.pod.containers.image.repository", "The same as req.container.image, but only the repository part (e.g. falcosecurity/falco).", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.container.image.repository", "Deprecated by ka.req.pod.containers.image.repository. Returns the repository of the first container only"},
-			   {"ka.req.pod.host_ipc", "When the request object refers to a pod, the value of the hostIPC flag."},
-			   {"ka.req.pod.host_network", "When the request object refers to a pod, the value of the hostNetwork flag."},
-			   {"ka.req.container.host_network", "Deprecated alias for ka.req.pod.host_network"},
-			   {"ka.req.pod.host_pid", "When the request object refers to a pod, the value of the hostPID flag."},
-			   {"ka.req.pod.containers.host_port", "When the request object refers to a pod, all container's hostPort values.", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.containers.privileged", "When the request object refers to a pod, the value of the privileged flag for all containers.", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.container.privileged", "Deprecated by ka.req.pod.containers.privileged. Returns true if any container has privileged=true"},
-			   {"ka.req.pod.containers.allow_privilege_escalation", "When the request object refers to a pod, the value of the allowPrivilegeEscalation flag for all containers", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.containers.read_only_fs", "When the request object refers to a pod, the value of the readOnlyRootFilesystem flag for all containers", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.run_as_user", "When the request object refers to a pod, the runAsUser uid specified in the security context for the pod. See ....containers.run_as_user for the runAsUser for individual containers"},
-			   {"ka.req.pod.containers.run_as_user", "When the request object refers to a pod, the runAsUser uid for all containers", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.containers.eff_run_as_user", "When the request object refers to a pod, the initial uid that will be used for all containers. This combines information from both the pod and container security contexts and uses 0 if no uid is specified", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.run_as_group", "When the request object refers to a pod, the runAsGroup gid specified in the security context for the pod. See ....containers.run_as_group for the runAsGroup for individual containers"},
-			   {"ka.req.pod.containers.run_as_group", "When the request object refers to a pod, the runAsGroup gid for all containers", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.containers.eff_run_as_group", "When the request object refers to a pod, the initial gid that will be used for all containers. This combines information from both the pod and container security contexts and uses 0 if no gid is specified", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.containers.proc_mount", "When the request object refers to a pod, the procMount types for all containers", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.role.rules", "When the request object refers to a role/cluster role, the rules associated with the role"},
-			   {"ka.req.role.rules.apiGroups", "When the request object refers to a role/cluster role, the api groups associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.role.rules.nonResourceURLs", "When the request object refers to a role/cluster role, the non resource urls associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.role.rules.verbs", "When the request object refers to a role/cluster role, the verbs associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.role.rules.resources", "When the request object refers to a role/cluster role, the resources associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.fs_group", "When the request object refers to a pod, the fsGroup gid specified by the security context."},
-			   {"ka.req.pod.supplemental_groups", "When the request object refers to a pod, the supplementalGroup gids specified by the security context."},
-			   {"ka.req.pod.containers.add_capabilities", "When the request object refers to a pod, all capabilities to add when running the container.", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.service.type", "When the request object refers to a service, the service type"},
-			   {"ka.req.service.ports", "When the request object refers to a service, the service's ports", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.volumes.hostpath", "When the request object refers to a pod, all hostPath paths specified for all volumes", IDX_ALLOWED, IDX_NUMERIC, true},
-			   {"ka.req.volume.hostpath", "Deprecated by ka.req.pod.volumes.hostpath. Return true if the provided (host) path prefix is used by any volume", IDX_ALLOWED, IDX_KEY},
-			   {"ka.req.pod.volumes.flexvolume_driver", "When the request object refers to a pod, all flexvolume drivers specified for all volumes", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.req.pod.volumes.volume_type", "When the request object refers to a pod, all volume types for all volumes", IDX_ALLOWED, IDX_NUMERIC},
-			   {"ka.resp.name", "The response object name"},
-			   {"ka.response.code", "The response code"},
-			   {"ka.response.reason", "The response reason (usually present only for failures)"},
-			   {"ka.useragent", "The useragent of the client who made the request to the apiserver"}}};
-	return info;
+	m_info = {"ka",
+		  "Access K8s Audit Log Events",
+		  "Fields with an IDX_ALLOWED annotation can be indexed (e.g. ka.req.containers.image[k] returns the image for the kth container). The index is optional--without any index the field returns values for all items. The index must be numeric with an IDX_NUMERIC annotation, and can be any string with an IDX_KEY annotation. Fields with an IDX_REQUIRED annotation require an index.",
+		  {{"ka.auditid", "The unique id of the audit event"},
+		   {"ka.stage", "Stage of the request (e.g. RequestReceived, ResponseComplete, etc.)"},
+		   {"ka.auth.decision", "The authorization decision"},
+		   {"ka.auth.reason", "The authorization reason"},
+		   {"ka.user.name", "The user name performing the request"},
+		   {"ka.user.groups", "The groups to which the user belongs"},
+		   {"ka.impuser.name", "The impersonated user name"},
+		   {"ka.verb", "The action being performed"},
+		   {"ka.uri", "The request URI as sent from client to server"},
+		   {"ka.uri.param", "The value of a given query parameter in the uri (e.g. when uri=/foo?key=val, ka.uri.param[key] is val).", IDX_REQUIRED, IDX_KEY},
+		   {"ka.target.name", "The target object name"},
+		   {"ka.target.namespace", "The target object namespace"},
+		   {"ka.target.resource", "The target object resource"},
+		   {"ka.target.subresource", "The target object subresource"},
+		   {"ka.req.binding.subjects", "When the request object refers to a cluster role binding, the subject (e.g. account/users) being linked by the binding"},
+		   {"ka.req.binding.role", "When the request object refers to a cluster role binding, the role being linked by the binding"},
+		   {"ka.req.binding.subject.has_name", "Deprecated, always returns \"N/A\". Only provided for backwards compatibility", IDX_REQUIRED, IDX_KEY},
+		   {"ka.req.configmap.name", "If the request object refers to a configmap, the configmap name"},
+		   {"ka.req.configmap.obj", "If the request object refers to a configmap, the entire configmap object"},
+		   {"ka.req.pod.containers.image", "When the request object refers to a pod, the container's images.", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.container.image", "Deprecated by ka.req.pod.containers.image. Returns the image of the first container only"},
+		   {"ka.req.pod.containers.image.repository", "The same as req.container.image, but only the repository part (e.g. falcosecurity/falco).", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.container.image.repository", "Deprecated by ka.req.pod.containers.image.repository. Returns the repository of the first container only"},
+		   {"ka.req.pod.host_ipc", "When the request object refers to a pod, the value of the hostIPC flag."},
+		   {"ka.req.pod.host_network", "When the request object refers to a pod, the value of the hostNetwork flag."},
+		   {"ka.req.container.host_network", "Deprecated alias for ka.req.pod.host_network"},
+		   {"ka.req.pod.host_pid", "When the request object refers to a pod, the value of the hostPID flag."},
+		   {"ka.req.pod.containers.host_port", "When the request object refers to a pod, all container's hostPort values.", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.containers.privileged", "When the request object refers to a pod, the value of the privileged flag for all containers.", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.container.privileged", "Deprecated by ka.req.pod.containers.privileged. Returns true if any container has privileged=true"},
+		   {"ka.req.pod.containers.allow_privilege_escalation", "When the request object refers to a pod, the value of the allowPrivilegeEscalation flag for all containers", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.containers.read_only_fs", "When the request object refers to a pod, the value of the readOnlyRootFilesystem flag for all containers", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.run_as_user", "When the request object refers to a pod, the runAsUser uid specified in the security context for the pod. See ....containers.run_as_user for the runAsUser for individual containers"},
+		   {"ka.req.pod.containers.run_as_user", "When the request object refers to a pod, the runAsUser uid for all containers", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.containers.eff_run_as_user", "When the request object refers to a pod, the initial uid that will be used for all containers. This combines information from both the pod and container security contexts and uses 0 if no uid is specified", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.run_as_group", "When the request object refers to a pod, the runAsGroup gid specified in the security context for the pod. See ....containers.run_as_group for the runAsGroup for individual containers"},
+		   {"ka.req.pod.containers.run_as_group", "When the request object refers to a pod, the runAsGroup gid for all containers", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.containers.eff_run_as_group", "When the request object refers to a pod, the initial gid that will be used for all containers. This combines information from both the pod and container security contexts and uses 0 if no gid is specified", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.containers.proc_mount", "When the request object refers to a pod, the procMount types for all containers", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.role.rules", "When the request object refers to a role/cluster role, the rules associated with the role"},
+		   {"ka.req.role.rules.apiGroups", "When the request object refers to a role/cluster role, the api groups associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.role.rules.nonResourceURLs", "When the request object refers to a role/cluster role, the non resource urls associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.role.rules.verbs", "When the request object refers to a role/cluster role, the verbs associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.role.rules.resources", "When the request object refers to a role/cluster role, the resources associated with the role's rules", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.fs_group", "When the request object refers to a pod, the fsGroup gid specified by the security context."},
+		   {"ka.req.pod.supplemental_groups", "When the request object refers to a pod, the supplementalGroup gids specified by the security context."},
+		   {"ka.req.pod.containers.add_capabilities", "When the request object refers to a pod, all capabilities to add when running the container.", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.service.type", "When the request object refers to a service, the service type"},
+		   {"ka.req.service.ports", "When the request object refers to a service, the service's ports", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.volumes.hostpath", "When the request object refers to a pod, all hostPath paths specified for all volumes", IDX_ALLOWED, IDX_NUMERIC, true},
+		   {"ka.req.volume.hostpath", "Deprecated by ka.req.pod.volumes.hostpath. Return true if the provided (host) path prefix is used by any volume", IDX_ALLOWED, IDX_KEY},
+		   {"ka.req.pod.volumes.flexvolume_driver", "When the request object refers to a pod, all flexvolume drivers specified for all volumes", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.req.pod.volumes.volume_type", "When the request object refers to a pod, all volume types for all volumes", IDX_ALLOWED, IDX_NUMERIC},
+		   {"ka.resp.name", "The response object name"},
+		   {"ka.response.code", "The response code"},
+		   {"ka.response.reason", "The response reason (usually present only for failures)"},
+		   {"ka.useragent", "The useragent of the client who made the request to the apiserver"}}};

-}
-
-const std::unordered_map<std::string, k8s_audit_filter_check::alias> &k8s_audit_filter_check::get_aliases() const
-{
-	static const std::unordered_map<std::string, k8s_audit_filter_check::alias>
-		aliases = {
+	{
+		m_aliases = {
 			{"ka.auditid", {{"/auditID"_json_pointer}}},
 			{"ka.stage", {{"/stage"_json_pointer}}},
 			{"ka.auth.decision", {{"/annotations/authorization.k8s.io~1decision"_json_pointer}}},
@@ -1411,11 +1404,7 @@ const std::unordered_map<std::string, k8s_audit_filter_check::alias> &k8s_audit_
 			{"ka.response.code", {{"/responseStatus/code"_json_pointer}}},
 			{"ka.response.reason", {{"/responseStatus/reason"_json_pointer}}},
 			{"ka.useragent", {{"/userAgent"_json_pointer}}}};
-	return aliases;
-}
-
-k8s_audit_filter_check::k8s_audit_filter_check()
-{
+	}
 }

 k8s_audit_filter_check::~k8s_audit_filter_check()
@@ -1486,14 +1475,14 @@ std::list<gen_event_filter_factory::filter_fieldclass_info> json_event_filter_fa

 	for(auto &chk: m_defined_checks)
 	{
-		const json_event_filter_check::check_info &info = chk->get_info();
+		json_event_filter_check::check_info &info = chk->get_info();
 		gen_event_filter_factory::filter_fieldclass_info cinfo;

 		cinfo.name = info.m_name;
 		cinfo.desc = info.m_desc;
 		cinfo.shortdesc = info.m_shortdesc;

-		for(const auto &field : info.m_fields)
+		for(auto &field : info.m_fields)
 		{
 			gen_event_filter_factory::filter_field_info info;
 			info.name = field.m_name;
--- a/userspace/engine/json_evt.h
+++ b/userspace/engine/json_evt.h
@@ -173,7 +173,7 @@ public:
 	};

 	json_event_filter_check();
-	virtual ~json_event_filter_check() = 0;
+	virtual ~json_event_filter_check();

 	virtual int32_t parse_field_name(const char *str, bool alloc_state, bool needed_for_filtering);
 	void add_filter_value(const char *str, uint32_t len, uint32_t i = 0);
@@ -197,7 +197,7 @@ public:
 	// brackets (e.g. ka.image[foo])
 	size_t parsed_size();

-	virtual const check_info &get_info() const = 0;
+	check_info &get_info();

 	//
 	// Allocate a new check of the same type. Must be overridden.
@@ -260,9 +260,9 @@ protected:
 	//
 	// The version of parse_field_name in this base class will
 	// check a field specification against all the aliases.
-	virtual const std::unordered_map<std::string, alias> &get_aliases() const = 0;
+	std::map<std::string, struct alias> m_aliases;

-	//check_info m_info;
+	check_info m_info;

 	// The actual field name parsed in parse_field_name.
 	std::string m_field;
@@ -315,18 +315,11 @@ public:

 	int32_t parse_field_name(const char* str, bool alloc_state, bool needed_for_filtering) final;

-	json_event_filter_check *allocate_new() override;
-	const check_info &get_info() const override;
+	json_event_filter_check *allocate_new();

 protected:

 	bool extract_values(json_event *jevt) final;
-	const std::unordered_map<std::string, alias> &get_aliases() const override
-	{
-		static std::unordered_map<std::string, alias> a;
-		return a;
-	};
-

 private:

@@ -347,12 +340,9 @@ public:
 	k8s_audit_filter_check();
 	virtual ~k8s_audit_filter_check();

-	json_event_filter_check *allocate_new() override;
+	json_event_filter_check *allocate_new();

-	const check_info &get_info() const override;
-	const std::unordered_map<std::string, alias> &get_aliases() const override;
-
-		// Extract all images/image repositories from the provided containers
+	// Extract all images/image repositories from the provided containers
 	static bool extract_images(const nlohmann::json &j,
 				   json_event_filter_check &jchk);

--- a/userspace/engine/rule_loader.cpp
+++ b/userspace/engine/rule_loader.cpp
--- a/userspace/engine/rule_loader.h
+++ b/userspace/engine/rule_loader.h
@@ -16,199 +16,83 @@ limitations under the License.

 #pragma once

+#include <map>
 #include <string>
 #include <vector>
 #include <yaml-cpp/yaml.h>
 #include <nlohmann/json.hpp>
+#include "falco_rule.h"
 #include "falco_source.h"
 #include "falco_load_result.h"
 #include "indexed_vector.h"

-namespace rule_loader
+
+/*!
+	\brief Ruleset loader of the falco engine
+*/
+class rule_loader
 {
+public:
 	class context
 	{
 	public:
-		// The kinds of items that can be in rules
-		// content. These generally map to yaml items but a
-		// few are more specific (e.g. "within condition
-		// expression", "value for yaml node", etc.)
-		enum item_type {
-			VALUE_FOR = 0,
-			EXCEPTIONS,
-			EXCEPTION,
-			EXCEPTION_VALUES,
-			EXCEPTION_VALUE,
-			RULES_CONTENT,
-			RULES_CONTENT_ITEM,
-			REQUIRED_ENGINE_VERSION,
-			REQUIRED_PLUGIN_VERSIONS,
-			REQUIRED_PLUGIN_VERSIONS_ENTRY,
-			REQUIRED_PLUGIN_VERSIONS_ALTERNATIVE,
-			LIST,
-			LIST_ITEM,
-			MACRO,
-			MACRO_CONDITION,
-			RULE,
-			RULE_CONDITION,
-			CONDITION_EXPRESSION,
-			RULE_OUTPUT,
-			RULE_OUTPUT_EXPRESSION,
-			RULE_PRIORITY
-		};
-
-		static const std::string& item_type_as_string(enum item_type it);
-
-		static const size_t default_snippet_width = 160;
-
-		struct position
-		{
-			position() : pos(0), line(0), column(0) {};
-			explicit position(const YAML::Mark& mark) : pos(mark.pos), line(mark.line), column(mark.column) {};
-			~position() = default;
-			position(position&&) = default;
-			position& operator = (position&&) = default;
-			position(const position&) = default;
-			position& operator = (const position&) = default;
-
-			int pos;
-			int line;
-			int column;
-		};
-
 		struct location
 		{
-			location(): item_type(context::item_type::VALUE_FOR) {}
-			location(
-				const std::string& n,
-				const position& p,
-				context::item_type i,
-				const std::string& in):
-					name(n), pos(p), item_type(i), item_name(in) {}
-			location(location&&) = default;
-			location& operator = (location&&) = default;
-			location(const location&) = default;
-			location& operator = (const location&) = default;
-
-			// A name for the content this location refers
-			// to. Will generally be a filename, can also
-			// refer to a rule/macro condition when the
-			// location points into a condition string.
-			std::string name;
-
 			// The original location in the document
-			position pos;
+			YAML::Mark mark;

 			// The kind of item at this location
 			// (e.g. "list", "macro", "rule", "exception", etc)
-			context::item_type item_type;
+			std::string item_type;

 			// The name of this item (e.g. "Write Below Etc",
 			// etc).
 			std::string item_name;
 		};

-		explicit context(const std::string& name);
-		context(const YAML::Node& item,
-			item_type item_type,
-			const std::string& item_name,
+		context(const std::string& name);
+		context(const YAML::Node& mark,
+			const std::string item_type,
+			const std::string item_name,
 			const context& parent);
-
-		// Build a context from a condition expression +
-		// parser position. This does not use the original
-		// yaml content because:
-		//   - YAML block indicators will remove whitespace/newlines/wrapping
-		//     from the YAML node containing the condition expression.
-		//   - When compiling, the condition expression has expanded
-		//     macro and list references with their values.
-		context(const libsinsp::filter::ast::pos_info& pos,
-			const std::string& condition,
-			const context& parent);
-
 		virtual ~context() = default;

-		context(context&&) = default;
-		context& operator = (context&&) = default;
-		context(const context&) = default;
-		context& operator = (const context&) = default;
-
-		// Return the content name (generally filename) for
-		// this context
-		const std::string& name() const;
-
 		// Return a snippet of the provided rules content
 		// corresponding to this context.
-		// Uses the provided rules_contents to look up the original
-		// rules content for a given location name.
-		// (If this context has a non-empty alt_content, it
-		// will be used to create the snippet, ignoring the
-		// provided rules_contents).
-		std::string snippet(const falco::load_result::rules_contents_t& rules_contents, size_t snippet_width = default_snippet_width) const;
+		std::string snippet(const std::string& content) const;

 		std::string as_string();
 		nlohmann::json as_json();

 	private:
-		void init(const std::string& name,
-			  const position& pos,
-			  const item_type item_type,
-			  const std::string& item_name,
-			  const context& parent);
+		std::string name;

 		// A chain of locations from the current item, its
 		// parent, possibly older ancestors.
 		std::vector<location> m_locs;
-
-		// If non-empty, this content will be used when
-		// creating snippets. Used for contexts involving
-		// condition expressions.
-		std::string alt_content;
 	};

 	struct warning
 	{
-		warning(): wc(falco::load_result::warning_code::LOAD_UNKNOWN_SOURCE), ctx("no-filename-given") {}
-		warning(
-			falco::load_result::warning_code w,
-			const std::string& m,
-			const context& c): wc(w), msg(m), ctx(c) {}
-		warning(warning&&) = default;
-		warning& operator = (warning&&) = default;
-		warning(const warning&) = default;
-		warning& operator = (const warning&) = default;
-
 		falco::load_result::warning_code wc;
 		std::string msg;
 		context ctx;
+		std::string snippet;
 	};

 	struct error
 	{
-		error(): ec(falco::load_result::error_code::LOAD_ERR_FILE_READ), ctx("no-filename-given") {}
-		error(
-			falco::load_result::error_code e,
-			const std::string& m,
-			const context& c): ec(e), msg(m), ctx(c) {}
-		error(error&&) = default;
-		error& operator = (error&&) = default;
-		error(const error&) = default;
-		error& operator = (const error&) = default;
-
 		falco::load_result::error_code ec;
 		std::string msg;
 		context ctx;
+		std::string snippet;
 	};

 	class rule_load_exception : public std::exception
 	{
 	public:
-		rule_load_exception(falco::load_result::error_code ec, const std::string& msg, const context& ctx);
+		rule_load_exception(falco::load_result::error_code ec, std::string msg, const context& ctx);
 		virtual ~rule_load_exception();
-		rule_load_exception(rule_load_exception&&) = default;
-		rule_load_exception& operator = (rule_load_exception&&) = default;
-		rule_load_exception(const rule_load_exception&) = default;
-		rule_load_exception& operator = (const rule_load_exception&) = default;
-
 		const char* what();

 		falco::load_result::error_code ec;
@@ -226,28 +110,25 @@ namespace rule_loader
 	public:
 		result(const std::string &name);
 		virtual ~result() = default;
-		result(result&&) = default;
-		result& operator = (result&&) = default;
-		result(const result&) = default;
-		result& operator = (const result&) = default;

 		virtual bool successful() override;
 		virtual bool has_warnings() override;
-
-		virtual const std::string& as_string(bool verbose, const falco::load_result::rules_contents_t& contents) override;
-		virtual const nlohmann::json& as_json(const falco::load_result::rules_contents_t& contents) override;
+		virtual const std::string& as_string(bool verbose) override;
+		virtual const nlohmann::json& as_json() override;

 		void add_error(falco::load_result::error_code ec,
 			       const std::string& msg,
-			       const context& ctx);
+			       const context& ctx,
+			       const std::string& rules_content);

 		void add_warning(falco::load_result::warning_code ec,
 				 const std::string& msg,
-				 const context& ctx);
+				 const context& ctx,
+				 const std::string& rules_content);
 	protected:

 		const std::string& as_summary_string();
-		const std::string& as_verbose_string(const falco::load_result::rules_contents_t& contents);
+		const std::string& as_verbose_string();
 		std::string name;
 		bool success;

@@ -267,17 +148,11 @@ namespace rule_loader
 		explicit configuration(
 			const std::string& cont,
 			const indexed_vector<falco_source>& srcs,
-			const std::string& name)
-				: content(cont), sources(srcs), name(name),
-				  default_ruleset_id(0), replace_output_container_info(false),
-				  min_priority(falco_common::PRIORITY_DEBUG)
+			std::string name)
+				: content(cont), sources(srcs), name(name)
 			{
 				res.reset(new result(name));
 			}
-		configuration(configuration&&) = default;
-		configuration& operator = (configuration&&) = default;
-		configuration(const configuration&) = delete;
-		configuration& operator = (const configuration&) = delete;

 		const std::string& content;
 		const indexed_vector<falco_source>& sources;
@@ -296,10 +171,6 @@ namespace rule_loader
 	{
 		engine_version_info(context &ctx);
 		~engine_version_info() = default;
-		engine_version_info(engine_version_info&&) = default;
-		engine_version_info& operator = (engine_version_info&&) = default;
-		engine_version_info(const engine_version_info&) = default;
-		engine_version_info& operator = (const engine_version_info&) = default;

 		context ctx;
 		uint32_t version;
@@ -310,35 +181,16 @@ namespace rule_loader
 	*/
 	struct plugin_version_info
 	{
-		struct requirement
-		{
-			requirement() = default;
-			requirement(const std::string& n, const std::string& v):
-				name(n), version(v) { }
-			requirement(requirement&&) = default;
-			requirement& operator = (requirement&&) = default;
-			requirement(const requirement&) = default;
-			requirement& operator = (const requirement&) = default;
-
-			std::string name;
-			std::string version;
-		};
-
-		typedef std::vector<requirement> requirement_alternatives;
-
 		// This differs from the other _info structs by having
 		// a default constructor. This allows it to be used
 		// by falco_engine, which aliases the type.
 		plugin_version_info();
 		plugin_version_info(context &ctx);
 		~plugin_version_info() = default;
-		plugin_version_info(plugin_version_info&&) = default;
-		plugin_version_info& operator = (plugin_version_info&&) = default;
-		plugin_version_info(const plugin_version_info&) = default;
-		plugin_version_info& operator = (const plugin_version_info&) = default;

 		context ctx;
-		requirement_alternatives alternatives;
+		std::string name;
+		std::string version;
 	};

 	/*!
@@ -348,10 +200,6 @@ namespace rule_loader
 	{
 		list_info(context &ctx);
 		~list_info() = default;
-		list_info(list_info&&) = default;
-		list_info& operator = (list_info&&) = default;
-		list_info(const list_info&) = default;
-		list_info& operator = (const list_info&) = default;

 		context ctx;
 		bool used;
@@ -368,10 +216,6 @@ namespace rule_loader
 	{
 		macro_info(context &ctx);
 		~macro_info() = default;
-		macro_info(macro_info&&) = default;
-		macro_info& operator = (macro_info&&) = default;
-		macro_info(const macro_info&) = default;
-		macro_info& operator = (const macro_info&) = default;

 		context ctx;
 		context cond_ctx;
@@ -390,10 +234,6 @@ namespace rule_loader
 	{
 		rule_exception_info(context &ctx);
 		~rule_exception_info() = default;
-		rule_exception_info(rule_exception_info&&) = default;
-		rule_exception_info& operator = (rule_exception_info&&) = default;
-		rule_exception_info(const rule_exception_info&) = default;
-		rule_exception_info& operator = (const rule_exception_info&) = default;

 		/*!
 			\brief This is necessary due to the dynamic-typed nature of
@@ -402,14 +242,6 @@ namespace rule_loader
 			this easier to implement in C++, that is not non-dynamic-typed.
 		*/
 		struct entry {
-			entry(): is_list(false) {}
-			explicit entry(const std::string& i): is_list(false), item(i) {}
-			explicit entry(const std::vector<entry>& v): is_list(true), items(v) {}
-			entry(entry&&) = default;
-			entry& operator = (entry&&) = default;
-			entry(const entry&) = default;
-			entry& operator = (const entry&) = default;
-
 			bool is_list;
 			std::string item;
 			std::vector<entry> items;
@@ -435,10 +267,6 @@ namespace rule_loader
 	{
 		rule_info(context &ctx);
 		~rule_info() = default;
-		rule_info(rule_info&&) = default;
-		rule_info& operator = (rule_info&&) = default;
-		rule_info(const rule_info&) = default;
-		rule_info& operator = (const rule_info&) = default;

 		context ctx;
 		context cond_ctx;
@@ -457,4 +285,67 @@ namespace rule_loader
 		bool warn_evttypes;
 		bool skip_if_unknown_filter;
 	};
+
+	virtual ~rule_loader() = default;
+
+	/*!
+		\brief Erases all the internal state and definitions
+	*/
+	virtual void clear();
+
+	/*!
+		\brief Uses the internal state to compile a list of falco_rules
+	*/
+	virtual void compile(configuration& cfg, indexed_vector<falco_rule>& out) const;
+
+	/*!
+		\brief Returns the set of all required versions for each plugin according
+		to the internal definitions.
+	*/
+	virtual const std::map<std::string, std::set<std::string>> required_plugin_versions() const;
+
+	/*!
+		\brief Defines an info block. If a similar info block is found
+		in the internal state (e.g. another rule with same name), then
+		the previous definition gets overwritten
+	*/
+	virtual void define(configuration& cfg, engine_version_info& info);
+	virtual void define(configuration& cfg, plugin_version_info& info);
+	virtual void define(configuration& cfg, list_info& info);
+	virtual void define(configuration& cfg, macro_info& info);
+	virtual void define(configuration& cfg, rule_info& info);
+
+	/*!
+		\brief Appends an info block to an existing one. An exception
+		is thrown if no existing definition can be matched with the appended
+		one
+	*/
+	virtual void append(configuration& cfg, list_info& info);
+	virtual void append(configuration& cfg, macro_info& info);
+	virtual void append(configuration& cfg, rule_info& info);
+
+	/*!
+		\brief Updates the 'enabled' flag of an existing definition
+	*/
+	virtual void enable(configuration& cfg, rule_info& info);
+
+private:
+	void compile_list_infos(
+		configuration& cfg,
+		indexed_vector<list_info>& out) const;
+	void compile_macros_infos(
+		configuration& cfg,
+		indexed_vector<list_info>& lists,
+		indexed_vector<macro_info>& out) const;
+	void compile_rule_infos(
+		configuration& cfg,
+		indexed_vector<list_info>& lists,
+		indexed_vector<macro_info>& macros,
+		indexed_vector<falco_rule>& out) const;
+
+	uint32_t m_cur_index;
+	indexed_vector<rule_info> m_rule_infos;
+	indexed_vector<macro_info> m_macro_infos;
+	indexed_vector<list_info> m_list_infos;
+	std::map<std::string, std::set<std::string>> m_required_plugin_versions;
 };
--- a/userspace/engine/rule_loader_collector.cpp
+++ b/userspace/engine/rule_loader_collector.cpp
@@ -1,280 +0,0 @@
-/*
-Copyright (C) 2022 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 <string>
-#include <version.h>
-
-#include "falco_engine.h"
-#include "rule_loader_collector.h"
-
-#define THROW(cond, err, ctx)    { if ((cond)) { throw rule_loader::rule_load_exception(falco::load_result::LOAD_ERR_VALIDATE, (err), (ctx)); } }
-
-
-static inline bool is_operator_defined(const std::string& op)
-{
-	auto ops = libsinsp::filter::parser::supported_operators();
-	return find(ops.begin(), ops.end(), op) != ops.end();
-}
-
-template <typename T>
-static inline void define_info(indexed_vector<T>& infos, T& info, uint32_t id)
-{
-	auto prev = infos.at(info.name);
-	if (prev)
-	{
-		info.index = prev->index;
-		info.visibility = id;
-		*prev = info;
-	}
-	else
-	{
-		info.index = id;
-		info.visibility = id;
-		infos.insert(info, info.name);
-	}
-}
-
-template <typename T>
-static inline void append_info(T* prev, T& info, uint32_t id)
-{
-	prev->visibility = id;
-}
-
-static void validate_exception_info(
-	const falco_source& source,
-	rule_loader::rule_exception_info &ex)
-{
-	if (ex.fields.is_list)
-	{
-		if (!ex.comps.is_valid())
-		{
-			ex.comps.is_list = true;
-			for (size_t i = 0; i < ex.fields.items.size(); i++)
-			{
-				ex.comps.items.push_back(rule_loader::rule_exception_info::entry("="));
-			}
-		}
-		THROW(ex.fields.items.size() != ex.comps.items.size(),
-		       "Fields and comps lists must have equal length",
-		       ex.ctx);
-		for (auto &v : ex.comps.items)
-		{
-			THROW(!is_operator_defined(v.item),
-			      std::string("'") + v.item + "' is not a supported comparison operator",
-			      ex.ctx);
-		}
-		for (auto &v : ex.fields.items)
-		{
-			THROW(!source.is_field_defined(v.item),
-			      std::string("'") + v.item + "' is not a supported filter field",
-			      ex.ctx);
-		}
-	}
-	else
-	{
-		if (!ex.comps.is_valid())
-		{
-			ex.comps.is_list = false;
-			ex.comps.item = "in";
-		}
-		THROW(ex.comps.is_list,
-		      "Fields and comps must both be strings",
-		      ex.ctx);
-		THROW((ex.comps.item != "in" && ex.comps.item != "pmatch" && ex.comps.item != "intersects"),
-		      "When fields is a single value, comps must be one of (in, pmatch, intersects)",
-		      ex.ctx);
-		THROW(!source.is_field_defined(ex.fields.item),
-		      std::string("'") + ex.fields.item + "' is not a supported filter field",
-		      ex.ctx);
-	}
-}
-
-void rule_loader::collector::clear()
-{
-	m_cur_index = 0;
-	m_rule_infos.clear();
-	m_list_infos.clear();
-	m_macro_infos.clear();
-	m_required_plugin_versions.clear();
-}
-
-const std::vector<rule_loader::plugin_version_info::requirement_alternatives>& rule_loader::collector::required_plugin_versions() const
-{
-	return m_required_plugin_versions;
-}
-
-const indexed_vector<rule_loader::list_info>& rule_loader::collector::lists() const
-{
-	return m_list_infos;
-}
-
-const indexed_vector<rule_loader::macro_info>& rule_loader::collector::macros() const
-{
-	return m_macro_infos;
-}
-
-const indexed_vector<rule_loader::rule_info>& rule_loader::collector::rules() const
-{
-	return m_rule_infos;
-}
-
-void rule_loader::collector::define(configuration& cfg, engine_version_info& info)
-{
-	auto v = falco_engine::engine_version();
-	THROW(v < info.version, "Rules require engine version "
-	      + std::to_string(info.version) + ", but engine version is " + std::to_string(v),
-	      info.ctx);
-}
-
-void rule_loader::collector::define(configuration& cfg, plugin_version_info& info)
-{
-	std::unordered_set<std::string> plugin_names;
-	for (const auto& req : info.alternatives)
-	{
-		sinsp_version plugin_version(req.version);
-		THROW(!plugin_version.m_valid,
-			"Invalid required version '" + req.version
-				+ "' for plugin '" + req.name + "'",
-			info.ctx);
-		THROW(plugin_names.find(req.name) != plugin_names.end(),
-			"Defined multiple alternative version requirements for plugin '"
-				+ req.name + "'",
-			info.ctx);
-		plugin_names.insert(req.name);
-	}
-	m_required_plugin_versions.push_back(info.alternatives);
-}
-
-void rule_loader::collector::define(configuration& cfg, list_info& info)
-{
-	define_info(m_list_infos, info, m_cur_index++);
-}
-
-void rule_loader::collector::append(configuration& cfg, list_info& info)
-{
-	auto prev = m_list_infos.at(info.name);
-	THROW(!prev,
-	       "List has 'append' key but no list by that name already exists",
-	       info.ctx);
-	prev->items.insert(prev->items.end(), info.items.begin(), info.items.end());
-	append_info(prev, info, m_cur_index++);
-}
-
-void rule_loader::collector::define(configuration& cfg, macro_info& info)
-{
-	define_info(m_macro_infos, info, m_cur_index++);
-}
-
-void rule_loader::collector::append(configuration& cfg, macro_info& info)
-{
-	auto prev = m_macro_infos.at(info.name);
-	THROW(!prev,
-	       "Macro has 'append' key but no macro by that name already exists",
-	       info.ctx);
-	prev->cond += " ";
-	prev->cond += info.cond;
-	append_info(prev, info, m_cur_index++);
-}
-
-void rule_loader::collector::define(configuration& cfg, rule_info& info)
-{
-	auto source = cfg.sources.at(info.source);
-	if (!source)
-	{
-		cfg.res->add_warning(falco::load_result::LOAD_UNKNOWN_SOURCE,
-				     "Unknown source " + info.source + ", skipping",
-				     info.ctx);
-		return;
-	}
-
-	auto prev = m_rule_infos.at(info.name);
-	THROW(prev && prev->source != info.source,
-	       "Rule has been re-defined with a different source",
-	       info.ctx);
-
-	for (auto &ex : info.exceptions)
-	{
-		THROW(!ex.fields.is_valid(),
-		       "Rule exception item must have fields property with a list of fields",
-		       ex.ctx);
-		validate_exception_info(*source, ex);
-	}
-
-	define_info(m_rule_infos, info, m_cur_index++);
-}
-
-void rule_loader::collector::append(configuration& cfg, rule_info& info)
-{
-	auto prev = m_rule_infos.at(info.name);
-
-	THROW(!prev,
-	       "Rule has 'append' key but no rule by that name already exists",
-	       info.ctx);
-	THROW(info.cond.empty() && info.exceptions.empty(),
-	       "Appended rule must have exceptions or condition property",
-	       info.ctx);
-
-	auto source = cfg.sources.at(prev->source);
-	// note: this is not supposed to happen
-	THROW(!source,
-	      std::string("Unknown source ") + prev->source,
-	      info.ctx);
-
-	if (!info.cond.empty())
-	{
-		prev->cond += " ";
-		prev->cond += info.cond;
-	}
-
-	for (auto &ex : info.exceptions)
-	{
-		auto prev_ex = find_if(prev->exceptions.begin(), prev->exceptions.end(),
-			[&ex](const rule_loader::rule_exception_info& i)
-				{ return i.name == ex.name; });
-		if (prev_ex == prev->exceptions.end())
-		{
-			THROW(!ex.fields.is_valid(),
-			       "Rule exception must have fields property with a list of fields",
-			       ex.ctx);
-			THROW(ex.values.empty(),
-			       "Rule exception must have values property with a list of values",
-			       ex.ctx);
-			validate_exception_info(*source, ex);
-			prev->exceptions.push_back(ex);
-		}
-		else
-		{
-			THROW(ex.fields.is_valid(),
-			       "Can not append exception fields to existing exception, only values",
-			       ex.ctx);
-			THROW(ex.comps.is_valid(),
-			       "Can not append exception comps to existing exception, only values",
-			       ex.ctx);
-			prev_ex->values.insert(
-				prev_ex->values.end(), ex.values.begin(), ex.values.end());
-		}
-	}
-	append_info(prev, info, m_cur_index++);
-}
-
-void rule_loader::collector::enable(configuration& cfg, rule_info& info)
-{
-	auto prev = m_rule_infos.at(info.name);
-	THROW(!prev,
-	       "Rule has 'enabled' key but no rule by that name already exists",
-	       info.ctx);
-	prev->enabled = info.enabled;
-}
--- a/userspace/engine/rule_loader_collector.h
+++ b/userspace/engine/rule_loader_collector.h
@@ -1,97 +0,0 @@
-/*
-Copyright (C) 2022 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.
-*/
-
-#pragma once
-
-#include <vector>
-#include "rule_loader.h"
-#include "indexed_vector.h"
-
-namespace rule_loader
-{
-
-/*!
-	\brief Collector for the ruleset loader of the falco engine
-*/
-class collector
-{
-public:
-	collector(): m_cur_index(0) { }
-	virtual ~collector() = default;
-	collector(collector&&) = default;
-	collector& operator = (collector&&) = default;
-	collector(const collector&) = delete;
-	collector& operator = (const collector&) = delete;
-
-	/*!
-		\brief Erases all the internal state and definitions
-	*/
-	virtual void clear();
-
-	/*!
-		\brief Returns the set of all defined required plugin versions
-	*/
-	virtual const std::vector<plugin_version_info::requirement_alternatives>& required_plugin_versions() const;
-
-	/*!
-		\brief Returns the list of defined lists
-	*/
-	virtual const indexed_vector<list_info>& lists() const;
-
-	/*!
-		\brief Returns the list of defined macros
-	*/
-	virtual const indexed_vector<macro_info>& macros() const;
-
-	/*!
-		\brief Returns the list of defined rules
-	*/
-	virtual const indexed_vector<rule_info>& rules() const;
-
-	/*!
-		\brief Defines an info block. If a similar info block is found
-		in the internal state (e.g. another rule with same name), then
-		the previous definition gets overwritten
-	*/
-	virtual void define(configuration& cfg, engine_version_info& info);
-	virtual void define(configuration& cfg, plugin_version_info& info);
-	virtual void define(configuration& cfg, list_info& info);
-	virtual void define(configuration& cfg, macro_info& info);
-	virtual void define(configuration& cfg, rule_info& info);
-
-	/*!
-		\brief Appends an info block to an existing one. An exception
-		is thrown if no existing definition can be matched with the appended
-		one
-	*/
-	virtual void append(configuration& cfg, list_info& info);
-	virtual void append(configuration& cfg, macro_info& info);
-	virtual void append(configuration& cfg, rule_info& info);
-
-	/*!
-		\brief Updates the 'enabled' flag of an existing definition
-	*/
-	virtual void enable(configuration& cfg, rule_info& info);
-
-private:
-	uint32_t m_cur_index;
-	indexed_vector<rule_info> m_rule_infos;
-	indexed_vector<macro_info> m_macro_infos;
-	indexed_vector<list_info> m_list_infos;
-	std::vector<plugin_version_info::requirement_alternatives> m_required_plugin_versions;
-};
-
-}; // namespace rule_loader
--- a/userspace/engine/rule_loader_compiler.cpp
+++ b/userspace/engine/rule_loader_compiler.cpp
@@ -1,543 +0,0 @@
-/*
-Copyright (C) 2022 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 <string>
-#include <memory>
-#include <set>
-#include <vector>
-
-#include "rule_loader_compiler.h"
-#include "filter_macro_resolver.h"
-#include "filter_evttype_resolver.h"
-#include "filter_warning_resolver.h"
-
-#define MAX_VISIBILITY		((uint32_t) -1)
-
-#define THROW(cond, err, ctx)    { if ((cond)) { throw rule_loader::rule_load_exception(falco::load_result::LOAD_ERR_VALIDATE, (err), (ctx)); } }
-
-static std::string s_container_info_fmt = "%container.info";
-static std::string s_default_extra_fmt  = "%container.name (id=%container.id)";
-
-using namespace libsinsp::filter;
-
-// todo(jasondellaluce): this breaks string escaping in lists and exceptions
-static void quote_item(std::string& e)
-{
-	if (e.find(" ") != std::string::npos && e[0] != '"' && e[0] != '\'')
-	{
-		e = '"' + e + '"';
-	}
-}
-
-static void paren_item(std::string& e)
-{
-	if(e[0] != '(')
-	{
-		e = '(' + e + ')';
-	}
-}
-
-static inline bool is_operator_defined(const std::string& op)
-{
-	auto ops = libsinsp::filter::parser::supported_operators();
-	return find(ops.begin(), ops.end(), op) != ops.end();
-}
-
-static inline bool is_operator_for_list(const std::string& op)
-{
-	auto ops = libsinsp::filter::parser::supported_operators(true);
-	return find(ops.begin(), ops.end(), op) != ops.end();
-}
-
-static bool is_format_valid(const falco_source& source, std::string fmt, std::string& err)
-{
-	try
-	{
-		std::shared_ptr<gen_event_formatter> formatter;
-		formatter = source.formatter_factory->create_formatter(fmt);
-		return true;
-	}
-	catch(exception &e)
-	{
-		err = e.what();
-		return false;
-	}
-}
-
-static void build_rule_exception_infos(
-	const std::vector<rule_loader::rule_exception_info>& exceptions,
-	std::set<std::string>& exception_fields,
-	std::string& condition)
-{
-	std::string tmp;
-	for (auto &ex : exceptions)
-	{
-		std::string icond;
-		if(!ex.fields.is_list)
-		{
-			for (auto &val : ex.values)
-			{
-				THROW(val.is_list,
-				       "Expected values array to contain a list of strings",
-				       ex.ctx)
-				icond += icond.empty()
-					? ("(" + ex.fields.item + " "
-						+ ex.comps.item + " (")
-					: ", ";
-				exception_fields.insert(ex.fields.item);
-				tmp = val.item;
-				quote_item(tmp);
-				icond += tmp;
-			}
-			icond += icond.empty() ? "" : "))";
-		}
-		else
-		{
-			icond = "(";
-			for (auto &values : ex.values)
-			{
-				THROW(ex.fields.items.size() != values.items.size(),
-				       "Fields and values lists must have equal length",
-				       ex.ctx);
-				icond += icond == "(" ? "" : " or ";
-				icond += "(";
-				uint32_t k = 0;
-				std::string istr;
-				for (auto &field : ex.fields.items)
-				{
-					icond += k == 0 ? "" : " and ";
-					if (values.items[k].is_list)
-					{
-						istr = "(";
-						for (auto &v : values.items[k].items)
-						{
-							tmp = v.item;
-							quote_item(tmp);
-							istr += istr == "(" ? "" : ", ";
-							istr += tmp;
-						}
-						istr += ")";
-					}
-					else
-					{
-						istr = values.items[k].item;
-						if(is_operator_for_list(ex.comps.items[k].item))
-						{
-							paren_item(istr);
-						}
-						else
-						{
-							quote_item(istr);
-						}
-					}
-					icond += " " + field.item;
-					icond += " " + ex.comps.items[k].item + " " + istr;
-					exception_fields.insert(field.item);
-					k++;
-				}
-				icond += ")";
-			}
-			icond += ")";
-			if (icond == "()")
-			{
-				icond = "";
-			}
-		}
-		condition += icond.empty() ? "" : " and not " + icond;
-	}
-}
-
-// todo(jasondellaluce): this breaks string escaping in lists
-static bool resolve_list(std::string& cnd, const rule_loader::list_info& list)
-{
-	static std::string blanks = " \t\n\r";
-	static std::string delims = blanks + "(),=";
-	std::string new_cnd;
-	size_t start, end;
-	bool used = false;
-	start = cnd.find(list.name);
-	while (start != std::string::npos)
-	{
-		// the characters surrounding the name must
-		// be delims of beginning/end of string
-		end = start + list.name.length();
-		if ((start == 0 || delims.find(cnd[start - 1]) != std::string::npos)
-			&& (end >= cnd.length() || delims.find(cnd[end]) != std::string::npos))
-		{
-			// shift pointers to consume all whitespaces
-			while (start > 0
-				&& blanks.find(cnd[start - 1]) != std::string::npos)
-			{
-				start--;
-			}
-			while (end < cnd.length()
-				&& blanks.find(cnd[end]) != std::string::npos)
-			{
-				end++;
-			}
-			// create substitution string by concatenating all values
-			std::string sub = "";
-			for (auto &v : list.items)
-			{
-				if (!sub.empty())
-				{
-					sub += ", ";
-				}
-				sub += v;
-			}
-			// if substituted list is empty, we need to
-			// remove a comma from the left or the right
-			if (sub.empty())
-			{
-				if (start > 0 && cnd[start - 1] == ',')
-				{
-					start--;
-				}
-				else if (end < cnd.length() && cnd[end] == ',')
-				{
-					end++;
-				}
-			}
-			// compose new string with substitution
-			new_cnd = "";
-			if (start > 0)
-			{
-				new_cnd += cnd.substr(0, start) + " ";
-			}
-			new_cnd += sub + " ";
-			if (end <= cnd.length())
-			{
-				new_cnd += cnd.substr(end);
-			}
-			cnd = new_cnd;
-			start += sub.length() + 1;
-			used = true;
-		}
-		start = cnd.find(list.name, start + 1);
-	}
-	return used;
-}
-
-static void resolve_macros(
-	indexed_vector<rule_loader::macro_info>& macros,
-	std::shared_ptr<ast::expr>& ast,
-	uint32_t visibility,
-	const rule_loader::context &ctx)
-{
-	filter_macro_resolver macro_resolver;
-	for (auto &m : macros)
-	{
-		if (m.index < visibility)
-		{
-			macro_resolver.set_macro(m.name, m.cond_ast);
-		}
-	}
-	macro_resolver.run(ast);
-
-	// Note: only complaining about the first unknown macro
-	THROW(!macro_resolver.get_unknown_macros().empty(),
-	      std::string("Undefined macro '")
-	      + *macro_resolver.get_unknown_macros().begin()
-	      + "' used in filter.",
-	      ctx);
-
-	for (auto &m : macro_resolver.get_resolved_macros())
-	{
-		macros.at(m)->used = true;
-	}
-}
-
-// note: there is no visibility order between filter conditions and lists
-static std::shared_ptr<ast::expr> parse_condition(
-	std::string condition,
-	indexed_vector<rule_loader::list_info>& lists,
-	const rule_loader::context &ctx)
-{
-	for (auto &l : lists)
-	{
-		if (resolve_list(condition, l))
-		{
-			l.used = true;
-		}
-	}
-	libsinsp::filter::parser p(condition);
-	p.set_max_depth(1000);
-	try
-	{
-		std::shared_ptr<ast::expr> res_ptr(p.parse());
-		return res_ptr;
-	}
-	catch (const sinsp_exception& e)
-	{
-		rule_loader::context parsectx(p.get_pos(), condition, ctx);
-
-		throw rule_loader::rule_load_exception(
-			falco::load_result::LOAD_ERR_COMPILE_CONDITION,
-			e.what(),
-			parsectx);
-	}
-}
-
-static void apply_output_substitutions(
-	rule_loader::configuration& cfg,
-	std::string& out)
-{
-	if (out.find(s_container_info_fmt) != std::string::npos)
-	{
-		if (cfg.replace_output_container_info)
-		{
-			out = replace(out, s_container_info_fmt, cfg.output_extra);
-			return;
-		}
-		out = replace(out, s_container_info_fmt, s_default_extra_fmt);
-	}
-	out += cfg.output_extra.empty() ? "" : " " + cfg.output_extra;
-}
-
-void rule_loader::compiler::compile_list_infos(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<list_info>& out) const
-{
-	std::string tmp;
-	std::vector<std::string> used;
-	for (auto &list : col.lists())
-	{
-		list_info v = list;
-		v.items.clear();
-		for (auto &item : list.items)
-		{
-			const auto ref = col.lists().at(item);
-			if (ref && ref->index < list.visibility)
-			{
-				used.push_back(ref->name);
-				for (auto val : ref->items)
-				{
-					quote_item(val);
-					v.items.push_back(val);
-				}
-			}
-			else
-			{
-				tmp = item;
-				quote_item(tmp);
-				v.items.push_back(tmp);
-			}
-		}
-		v.used = false;
-		out.insert(v, v.name);
-	}
-	for (auto &v : used)
-	{
-		out.at(v)->used = true;
-	}
-}
-
-// note: there is a visibility ordering between macros
-void rule_loader::compiler::compile_macros_infos(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<list_info>& lists,
-		indexed_vector<macro_info>& out) const
-{
-	for (auto &m : col.macros())
-	{
-		macro_info entry = m;
-		entry.cond_ast = parse_condition(m.cond, lists, m.cond_ctx);
-		entry.used = false;
-		out.insert(entry, m.name);
-	}
-
-	for (auto &m : out)
-	{
-		resolve_macros(out, m.cond_ast, m.visibility, m.ctx);
-	}
-}
-
-
-void rule_loader::compiler::compile_rule_infos(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<list_info>& lists,
-		indexed_vector<macro_info>& macros,
-		indexed_vector<falco_rule>& out) const
-{
-	std::string err, condition;
-	std::set<falco::load_result::load_result::warning_code> warn_codes;
-	filter_warning_resolver warn_resolver;
-	for (auto &r : col.rules())
-	{
-		// skip the rule if below the minimum priority
-		if (r.priority > cfg.min_priority)
-		{
-			continue;
-		}
-
-		auto source = cfg.sources.at(r.source);
-		// note: this is not supposed to happen
-
-		THROW(!source,
-		      std::string("Unknown source ") + r.source,
-		      r.ctx);
-
-		// build filter AST by parsing the condition, building exceptions,
-		// and resolving lists and macros
-		falco_rule rule;
-
-		condition = r.cond;
-		if (!r.exceptions.empty())
-		{
-			build_rule_exception_infos(
-				r.exceptions, rule.exception_fields, condition);
-		}
-		auto ast = parse_condition(condition, lists, r.cond_ctx);
-		resolve_macros(macros, ast, MAX_VISIBILITY, r.ctx);
-
-		// check for warnings in the filtering condition
-		warn_codes.clear();
-		if (warn_resolver.run(ast.get(), warn_codes))
-		{
-			for (auto &w : warn_codes)
-			{
-				cfg.res->add_warning(w, "", r.ctx);
-			}
-		}
-
-		// build rule output message
-		rule.output = r.output;
-		if (r.source == falco_common::syscall_source)
-		{
-			apply_output_substitutions(cfg, rule.output);
-		}
-
-		if(!is_format_valid(*cfg.sources.at(r.source), rule.output, err))
-		{
-			throw rule_load_exception(
-				falco::load_result::load_result::LOAD_ERR_COMPILE_OUTPUT,
-				err,
-				r.output_ctx);
-		}
-
-		// construct rule definition and compile it to a filter
-		rule.name = r.name;
-		rule.source = r.source;
-		rule.description = r.desc;
-		rule.priority = r.priority;
-		rule.tags = r.tags;
-
-		auto rule_id = out.insert(rule, rule.name);
-		out.at(rule_id)->id = rule_id;
-
-		// This also compiles the filter, and might throw a
-		// falco_exception with details on the compilation
-		// failure.
-		try {
-			source->ruleset->add(*out.at(rule_id), ast);
-		}
-		catch (const falco_exception& e)
-		{
-			// Allow errors containing "nonexistent field" if
-			// skip_if_unknown_filter is true
-			std::string err = e.what();
-
-			if (err.find("nonexistent field") != std::string::npos &&
-			    r.skip_if_unknown_filter)
-			{
-				cfg.res->add_warning(
-					falco::load_result::load_result::LOAD_UNKNOWN_FIELD,
-					e.what(),
-					r.cond_ctx);
-			}
-			else
-			{
-				throw rule_loader::rule_load_exception(
-					falco::load_result::load_result::LOAD_ERR_COMPILE_CONDITION,
-					e.what(),
-					r.cond_ctx);
-			}
-		}
-
-		// By default rules are enabled/disabled for the default ruleset
-		if(r.enabled)
-		{
-			source->ruleset->enable(rule.name, true, cfg.default_ruleset_id);
-		}
-		else
-		{
-			source->ruleset->disable(rule.name, true, cfg.default_ruleset_id);
-		}
-
-		// populate set of event types and emit an special warning
-		std::set<uint16_t> evttypes = { ppm_event_type::PPME_PLUGINEVENT_E };
-		if(rule.source == falco_common::syscall_source)
-		{
-			evttypes.clear();
-			filter_evttype_resolver().evttypes(ast, evttypes);
-			if ((evttypes.empty() || evttypes.size() > 100)
-			    && r.warn_evttypes)
-			{
-				cfg.res->add_warning(
-					falco::load_result::load_result::LOAD_NO_EVTTYPE,
-					"Rule matches too many evt.type values. This has a significant performance penalty.",
-					r.ctx);
-			}
-		}
-	}
-}
-
-void rule_loader::compiler::compile(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<falco_rule>& out) const
-{
-	indexed_vector<list_info> lists;
-	indexed_vector<macro_info> macros;
-
-	// expand all lists, macros, and rules
-	try
-	{
-		compile_list_infos(cfg, col, lists);
-		compile_macros_infos(cfg, col, lists, macros);
-		compile_rule_infos(cfg, col, lists, macros, out);
-	}
-	catch(rule_load_exception &e)
-	{
-		cfg.res->add_error(e.ec, e.msg, e.ctx);
-		return;
-	}
-
-	// print info on any dangling lists or macros that were not used anywhere
-	for (auto &m : macros)
-	{
-		if (!m.used)
-		{
-			cfg.res->add_warning(
-				falco::load_result::load_result::LOAD_UNUSED_MACRO,
-				"Macro not referred to by any other rule/macro",
-				m.ctx);
-		}
-	}
-	for (auto &l : lists)
-	{
-		if (!l.used)
-		{
-			cfg.res->add_warning(
-				falco::load_result::LOAD_UNUSED_LIST,
-				"List not referred to by any other rule/macro",
-				l.ctx);
-		}
-	}
-}
--- a/userspace/engine/rule_loader_compiler.h
+++ b/userspace/engine/rule_loader_compiler.h
@@ -1,69 +0,0 @@
-/*
-Copyright (C) 2022 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.
-*/
-
-#pragma once
-
-#include "rule_loader.h"
-#include "rule_loader_collector.h"
-#include "indexed_vector.h"
-#include "falco_rule.h"
-
-namespace rule_loader
-{
-
-/*!
-	\brief Compiler for the ruleset loader of the falco engine
-*/
-class compiler
-{
-public:
-	compiler() = default;
-	virtual ~compiler() = default;
-	compiler(compiler&&) = default;
-	compiler& operator = (compiler&&) = default;
-	compiler(const compiler&) = default;
-	compiler& operator = (const compiler&) = default;
-
-	/*!
-		\brief Compiles a list of falco rules
-	*/
-	virtual void compile(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<falco_rule>& out) const;
-
-private:
-	void compile_list_infos(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<list_info>& out) const;
-
-	void compile_macros_infos(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<list_info>& lists,
-		indexed_vector<macro_info>& out) const;
-
-	void compile_rule_infos(
-		configuration& cfg,
-		const collector& col,
-		indexed_vector<list_info>& lists,
-		indexed_vector<macro_info>& macros,
-		indexed_vector<falco_rule>& out) const;
-};
-
-}; // namespace rule_loader
-
--- a/userspace/engine/rule_loader_reader.cpp
+++ b/userspace/engine/rule_loader_reader.cpp
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-#include <string>
-#include <vector>
+#include "rule_reader.h"

-#include "rule_loader_reader.h"
-
-#define THROW(cond, err, ctx)    { if ((cond)) { throw rule_loader::rule_load_exception(falco::load_result::LOAD_ERR_YAML_VALIDATE, (err), (ctx)); } }
+#define THROW(cond, err, ctx)    { if ((cond)) { throw rule_loader::rule_load_exception(load_result::LOAD_ERR_YAML_VALIDATE, (err), (ctx)); } }

+using namespace falco;

 // Don't call this directly, call decode_val/decode_optional_val instead.
 template <typename T>
@@ -36,7 +34,7 @@ static void decode_val_generic(const YAML::Node& item, const char *key, T& out,
 	THROW(!val.IsDefined(), std::string("Item has no mapping for key '") + key + "'", ctx);
 	THROW(val.IsNull(), std::string("Mapping for key '") + key + "' is empty", ctx);

-	rule_loader::context valctx(val, rule_loader::context::VALUE_FOR, key, ctx);
+	rule_loader::context valctx(val, "value for", key, ctx);
 	THROW(!val.IsScalar(), "Value is not a scalar value", valctx);
 	THROW(val.Scalar().empty(), "Value must be non-empty", valctx);

@@ -74,13 +72,13 @@ static void decode_seq(const YAML::Node& item, const char *key,

 	THROW(!val.IsDefined(), std::string("Item has no mapping for key '") + key + "'", ctx);

-	rule_loader::context valctx(val, rule_loader::context::VALUE_FOR, key, ctx);
+	rule_loader::context valctx(val, "value for", key, ctx);
 	THROW(!val.IsSequence(), "Value is not a sequence", valctx);

 	T value;
 	for(const YAML::Node& v : val)
 	{
-		rule_loader::context ictx(v, rule_loader::context::LIST_ITEM, "", valctx);
+		rule_loader::context ictx(v, "list item", "", valctx);
 		THROW(!v.IsScalar(), "sequence value is not scalar", ictx);
 		THROW(!YAML::convert<T>::decode(v, value), "Can't decode YAML sequence value", ictx);
 		inserter(value);
@@ -130,7 +128,7 @@ static void decode_exception_info_entry(

 	THROW(!val.IsDefined(), std::string("Item has no mapping for key '") + key + "'", ctx);

-	rule_loader::context valctx(val, rule_loader::context::VALUE_FOR, (key == NULL ? "" : key), ctx);
+	rule_loader::context valctx(val, "value for", (key == NULL ? "" : key), ctx);

 	if (val.IsScalar())
 	{
@@ -141,10 +139,10 @@ static void decode_exception_info_entry(
 	if (val.IsSequence())
 	{
 		out.is_list = true;
+		rule_loader::rule_exception_info::entry tmp;
 		for(const YAML::Node& v : val)
 		{
-			rule_loader::rule_exception_info::entry tmp;
-			rule_loader::context lctx(v, rule_loader::context::EXCEPTION, "", valctx);
+			rule_loader::context lctx(v, "list exception entry", "", valctx);

 			// Optional is always false once you get past the outer values
 			optional = false;
@@ -198,7 +196,7 @@ static void read_rule_exceptions(
 		return;
 	}

-	rule_loader::context exes_ctx(exs, rule_loader::context::EXCEPTIONS, "", parent);
+	rule_loader::context exes_ctx(exs, "exceptions", "", parent);

 	THROW(!exs.IsSequence(), "Rule exceptions must be a sequence", exes_ctx);

@@ -207,13 +205,13 @@ static void read_rule_exceptions(
 		// Make a temp context to verify simple properties
 		// about the exception.
 		std::string name;
-		rule_loader::context tmp(ex, rule_loader::context::EXCEPTION, "", exes_ctx);
+		rule_loader::context tmp(ex, "exception", "", exes_ctx);

 		THROW(!ex.IsMap(), "Rule exception must be a mapping", tmp);
 		decode_val(ex, "name", name, tmp);

 		// Now use a real context including the exception name.
-		rule_loader::context ex_ctx(ex, rule_loader::context::EXCEPTION, name, parent);
+		rule_loader::context ex_ctx(ex, "exception", name, parent);
 		rule_loader::rule_exception_info v_ex(ex_ctx);
 		v_ex.name = name;

@@ -225,12 +223,12 @@ static void read_rule_exceptions(
 		const YAML::Node& exvals = ex["values"];
 		if (exvals.IsDefined())
 		{
-			rule_loader::context vals_ctx(exvals, rule_loader::context::EXCEPTION_VALUES, "", ex_ctx);
+			rule_loader::context vals_ctx(exvals, "exception values", "", ex_ctx);
 			THROW(!exvals.IsSequence(),
 			       "Rule exception values must be a sequence", vals_ctx);
 			for (auto &val : exvals)
 			{
-				rule_loader::context vctx(val, rule_loader::context::EXCEPTION_VALUE, "", vals_ctx);
+				rule_loader::context vctx(val, "exception value", "", vals_ctx);
 				rule_loader::rule_exception_info::entry v_ex_val;

 				decode_exception_values(val, v_ex_val, vctx);
@@ -243,26 +241,26 @@ static void read_rule_exceptions(

 static void read_item(
 	rule_loader::configuration& cfg,
-	rule_loader::collector& collector,
+	rule_loader& loader,
 	const YAML::Node& item,
 	const rule_loader::context& parent)
 {
-	rule_loader::context tmp(item, rule_loader::context::RULES_CONTENT_ITEM, "", parent);
+	rule_loader::context tmp(item, "item", "", parent);
 	THROW(!item.IsMap(), "Unexpected element type. "
 	      "Each element should be a yaml associative array.", tmp);

 	if (item["required_engine_version"].IsDefined())
 	{
-		rule_loader::context ctx(item, rule_loader::context::REQUIRED_ENGINE_VERSION, "", parent);
+		rule_loader::context ctx(item, "required_engine_version", "", parent);
 		rule_loader::engine_version_info v(ctx);

 		decode_val(item, "required_engine_version", v.version, ctx);
-		collector.define(cfg, v);
+		loader.define(cfg, v);
 	}
 	else if(item["required_plugin_versions"].IsDefined())
 	{
 		const YAML::Node& req_plugin_vers = item["required_plugin_versions"];
-		rule_loader::context ctx(req_plugin_vers, rule_loader::context::REQUIRED_PLUGIN_VERSIONS, "", parent);
+		rule_loader::context ctx(req_plugin_vers, "required_plugin_versions", "", parent);

 		THROW(!req_plugin_vers.IsSequence(),
 		       "Value of required_plugin_versions must be a sequence",
@@ -270,45 +268,28 @@ static void read_item(

 		for(const YAML::Node& plugin : req_plugin_vers)
 		{
-			rule_loader::plugin_version_info::requirement r;
-
 			// Use a temp context until we can get a name
-			rule_loader::context tmp(plugin, rule_loader::context::REQUIRED_PLUGIN_VERSIONS_ENTRY, "", ctx);
+			std::string name;
+			rule_loader::context tmp(plugin, "plugin version", "", ctx);
 			THROW(!plugin.IsMap(), "Plugin version must be a mapping", tmp);
-			decode_val(plugin, "name", r.name, tmp);
-			rule_loader::context pctx(plugin, rule_loader::context::REQUIRED_PLUGIN_VERSIONS_ENTRY, r.name, ctx);
+			decode_val(plugin, "name", name, tmp);
+
+			rule_loader::context pctx(plugin, "plugin version", name, ctx);
 			rule_loader::plugin_version_info v(pctx);
-			decode_val(plugin, "version", r.version, pctx);
-			v.alternatives.push_back(r);
+			decode_val(plugin, "version", v.version, pctx);
+			v.name = name;

-			const YAML::Node& alternatives = plugin["alternatives"];
-			if(alternatives.IsDefined())
-			{
-				THROW(!alternatives.IsSequence(),
-					"Value of plugin version alternatives must be a sequence",
-					pctx);
-				for (const auto &req : alternatives)
-				{
-					tmp = rule_loader::context(req, rule_loader::context::REQUIRED_PLUGIN_VERSIONS_ALTERNATIVE, "", pctx);
-					THROW(!req.IsMap(), "Plugin version alternative must be a mapping", tmp);
-					decode_val(req, "name", r.name, tmp);
-					tmp = rule_loader::context(req, rule_loader::context::REQUIRED_PLUGIN_VERSIONS_ALTERNATIVE, r.name, pctx);
-					decode_val(req, "version", r.version, tmp);
-					v.alternatives.push_back(r);
-				}
-			}
-
-			collector.define(cfg, v);
+			loader.define(cfg, v);
 		}
 	}
 	else if(item["list"].IsDefined())
 	{
 		std::string name;
 		// Using tmp context until name is decoded
-		rule_loader::context tmp(item, rule_loader::context::LIST, "", parent);
+		rule_loader::context tmp(item, "list", "", parent);
 		decode_val(item, "list", name, tmp);

-		rule_loader::context ctx(item, rule_loader::context::LIST, name, parent);
+		rule_loader::context ctx(item, "list", name, parent);
 		rule_loader::list_info v(ctx);

 		bool append = false;
@@ -319,21 +300,21 @@ static void read_item(

 		if(append)
 		{
-			collector.append(cfg, v);
+			loader.append(cfg, v);
 		}
 		else
 		{
-			collector.define(cfg, v);
+			loader.define(cfg, v);
 		}
 	}
 	else if(item["macro"].IsDefined())
 	{
 		std::string name;
 		// Using tmp context until name is decoded
-		rule_loader::context tmp(item, rule_loader::context::MACRO, "", parent);
+		rule_loader::context tmp(item, "macro", "", parent);
 		decode_val(item, "macro", name, tmp);

-		rule_loader::context ctx(item, rule_loader::context::MACRO, name, parent);
+		rule_loader::context ctx(item, "macro", name, parent);
 		rule_loader::macro_info v(ctx);
 		v.name = name;

@@ -341,17 +322,17 @@ static void read_item(
 		decode_val(item, "condition", v.cond, ctx);

 		// Now set the proper context for the condition now that we know it exists
-		v.cond_ctx = rule_loader::context(item["condition"], rule_loader::context::MACRO_CONDITION, "", ctx);
+		v.cond_ctx = rule_loader::context(item["condition"], "condition", "", ctx);

 		decode_optional_val(item, "append", append, ctx);

 		if(append)
 		{
-			collector.append(cfg, v);
+			loader.append(cfg, v);
 		}
 		else
 		{
-			collector.define(cfg, v);
+			loader.define(cfg, v);
 		}
 	}
 	else if(item["rule"].IsDefined())
@@ -359,10 +340,10 @@ static void read_item(
 		std::string name;

 		// Using tmp context until name is decoded
-		rule_loader::context tmp(item, rule_loader::context::RULE, "", parent);
+		rule_loader::context tmp(item, "rule", "", parent);
 		decode_val(item, "rule", name, tmp);

-		rule_loader::context ctx(item, rule_loader::context::RULE, name, parent);
+		rule_loader::context ctx(item, "rule", name, parent);
 		rule_loader::rule_info v(ctx);
 		v.name = name;

@@ -378,10 +359,10 @@ static void read_item(
 			decode_optional_val(item, "condition", v.cond, ctx);
 			if(item["condition"].IsDefined())
 			{
-				v.cond_ctx = rule_loader::context(item["condition"], rule_loader::context::RULE_CONDITION, "", ctx);
+				v.cond_ctx = rule_loader::context(item["condition"], "condition", "", ctx);
 			}
 			read_rule_exceptions(item, v, ctx, append);
-			collector.append(cfg, v);
+			loader.append(cfg, v);
 		}
 		else
 		{
@@ -396,7 +377,7 @@ static void read_item(
 			    !item["priority"].IsDefined())
 			{
 				decode_val(item, "enabled", v.enabled, ctx);
-				collector.enable(cfg, v);
+				loader.enable(cfg, v);
 			}
 			else
 			{
@@ -404,17 +385,17 @@ static void read_item(

 				// All of these are required
 				decode_val(item, "condition", v.cond, ctx);
-				v.cond_ctx = rule_loader::context(item["condition"], rule_loader::context::RULE_CONDITION, "", ctx);
+				v.cond_ctx = rule_loader::context(item["condition"], "condition", "", ctx);

 				decode_val(item, "output", v.output, ctx);
-				v.output_ctx = rule_loader::context(item["output"], rule_loader::context::RULE_OUTPUT, "", ctx);
+				v.output_ctx = rule_loader::context(item["output"], "output", "", ctx);

 				decode_val(item, "desc", v.desc, ctx);
 				decode_val(item, "priority", priority, ctx);

 				v.output = trim(v.output);
 				v.source = falco_common::syscall_source;
-				rule_loader::context prictx(item["priority"], rule_loader::context::RULE_PRIORITY, "", ctx);
+				rule_loader::context prictx(item["priority"], "priority value", "", ctx);
 				THROW(!falco_common::parse_priority(priority, v.priority),
 				       "Invalid priority", prictx);
 				decode_optional_val(item, "source", v.source, ctx);
@@ -423,18 +404,18 @@ static void read_item(
 				decode_optional_val(item, "skip-if-unknown-filter", v.skip_if_unknown_filter, ctx);
 				decode_tags(item, v.tags, ctx);
 				read_rule_exceptions(item, v, ctx, append);
-				collector.define(cfg, v);
+				loader.define(cfg, v);
 			}
 		}
 	}
 	else
 	{
-		rule_loader::context ctx(item, rule_loader::context::RULES_CONTENT_ITEM, "", parent);
-		cfg.res->add_warning(falco::load_result::LOAD_UNKNOWN_ITEM, "Unknown top level item", ctx);
+		rule_loader::context ctx(item, "unknown", "", parent);
+		cfg.res->add_warning(load_result::LOAD_UNKNOWN_ITEM, "Unknown top level item", ctx, cfg.content);
 	}
 }

-bool rule_loader::reader::read(rule_loader::configuration& cfg, collector& collector)
+bool rule_reader::load(rule_loader::configuration& cfg, rule_loader& loader)
 {
 	std::vector<YAML::Node> docs;
 	try
@@ -444,7 +425,7 @@ bool rule_loader::reader::read(rule_loader::configuration& cfg, collector& colle
 	catch(const exception& e)
 	{
 		rule_loader::context ctx(cfg.name);
-		cfg.res->add_error(falco::load_result::LOAD_ERR_YAML_PARSE, e.what(), ctx);
+		cfg.res->add_error(load_result::LOAD_ERR_YAML_PARSE, e.what(), ctx, cfg.content);
 		return false;
 	}

@@ -467,13 +448,13 @@ bool rule_loader::reader::read(rule_loader::configuration& cfg, collector& colle
 				{
 					if (!it->IsNull())
 					{
-						read_item(cfg, collector, *it, ctx);
+						read_item(cfg, loader, *it, ctx);
 					}
 				}
 			}
 			catch (rule_loader::rule_load_exception &e)
 			{
-				cfg.res->add_error(e.ec, e.msg, e.ctx);
+				cfg.res->add_error(e.ec, e.msg, e.ctx, cfg.content);

 				// Although we *could* continue on to the next doc,
 				// as it's effectively a new rules file, for
--- a/userspace/engine/rule_loader_reader.h
+++ b/userspace/engine/rule_loader_reader.h
@@ -16,30 +16,22 @@ limitations under the License.

 #pragma once

+#include <map>
+#include <string>
+#include <vector>
 #include "rule_loader.h"
-#include "rule_loader_collector.h"
-
-namespace rule_loader
-{

 /*!
    \brief Reads the contents of a ruleset
 */
-class reader
+class rule_reader
 {
 public:
-    reader() = default;
-    virtual ~reader() = default;
-    reader(reader&&) = default;
-	reader& operator = (reader&&) = default;
-	reader(const reader&) = default;
-	reader& operator = (const reader&) = default;
+    virtual ~rule_reader() = default;

    /*!
-		\brief Reads the contents of a ruleset and uses a collector to store
+		\brief Reads the contents of a ruleset and uses a loader to store
        thew new definitions
 	*/
-	virtual bool read(configuration& cfg, collector& loader);
+	virtual bool load(rule_loader::configuration& cfg, rule_loader& loader);
 };
-
-}; // namespace rule_loader
--- a/userspace/engine/stats_manager.cpp
+++ b/userspace/engine/stats_manager.cpp
@@ -45,48 +45,37 @@ void stats_manager::format(
 	out += "Rule counts by severity:\n";
 	for (size_t i = 0; i < m_by_priority.size(); i++)
 	{
-		auto val = m_by_priority[i].get()->load();
-		if (val > 0)
+		if (m_by_priority[i] > 0)
 		{
 			falco_common::format_priority(
 				(falco_common::priority_type) i, fmt, true);
 			transform(fmt.begin(), fmt.end(), fmt.begin(), ::toupper);
-			out += "   " + fmt + ": " + to_string(val) + "\n";
+			out += "   " + fmt;
+			out += ": " + to_string(m_by_priority[i]) + "\n";
 		}
 	}
 	out += "Triggered rules by rule name:\n";
 	for (size_t i = 0; i < m_by_rule_id.size(); i++)
 	{
-		auto val = m_by_rule_id[i].get()->load();
-		if (val > 0)
+		if (m_by_rule_id[i] > 0)
 		{
-			out += "   " + rules.at(i)->name + ": " + to_string(val) + "\n";
+			out += "   " + rules.at(i)->name;
+			out += ": " + to_string(m_by_rule_id[i]) + "\n";
 		}
 	}
 }

-void stats_manager::on_rule_loaded(const falco_rule& rule)
-{
-	while (m_by_rule_id.size() <= rule.id)
-	{
-		m_by_rule_id.emplace_back();
-		m_by_rule_id[m_by_rule_id.size() - 1].reset(new atomic<uint64_t>(0));
-	}
-	while (m_by_priority.size() <= (size_t) rule.priority)
-	{
-		m_by_priority.emplace_back();
-		m_by_priority[m_by_priority.size() - 1].reset(new atomic<uint64_t>(0));
-	}
-}
-
 void stats_manager::on_event(const falco_rule& rule)
 {
-	if (m_by_rule_id.size() <= rule.id
-		|| m_by_priority.size() <= (size_t) rule.priority)
+	if (m_by_rule_id.size() <= rule.id)
 	{
-		throw falco_exception("rule id or priority out of bounds");
+		m_by_rule_id.resize(rule.id + 1, (uint64_t) 0);
 	}
-	m_total.fetch_add(1, std::memory_order_relaxed);
-	m_by_rule_id[rule.id]->fetch_add(1, std::memory_order_relaxed);
-	m_by_priority[(size_t) rule.priority]->fetch_add(1, std::memory_order_relaxed);
+	if (m_by_priority.size() <= (size_t) rule.priority)
+	{
+		m_by_priority.resize((size_t) rule.priority + 1, (uint64_t) 0);
+	}
+	m_total++;
+	m_by_rule_id[rule.id]++;
+	m_by_priority[(size_t) rule.priority]++;
 }
--- a/userspace/engine/stats_manager.h
+++ b/userspace/engine/stats_manager.h
@@ -18,26 +18,17 @@ limitations under the License.

 #include <vector>
 #include <string>
-#include <atomic>
-#include <memory>
 #include "falco_rule.h"
 #include "indexed_vector.h"

 /*!
-	\brief Manager for the internal statistics of the rule engine.
-	The on_event() is thread-safe and non-blocking, and it can be used
-	concurrently across many callers in parallel.
-	All the other methods are not thread safe.
+	\brief Manager for the internal statistics of the rule engine
 */
 class stats_manager
 {
 public:
 	stats_manager();
 	virtual ~stats_manager();
-	stats_manager(stats_manager&&) = default;
-	stats_manager& operator = (stats_manager&&) = default;
-	stats_manager(const stats_manager&) = default;
-	stats_manager& operator = (const stats_manager&) = default;

 	/*!
 		\brief Erases the internal state and statistics data
@@ -45,29 +36,19 @@ public:
 	virtual void clear();

 	/*!
-		\brief Callback for when a new rule is loaded in the engine.
-		Rules must be passed through this method before submitting them as
-		an argument of on_event().
-	*/
-	virtual void on_rule_loaded(const falco_rule& rule);
-
-	/*!
-		\brief Callback for when a given rule matches an event.
-		This method is thread-safe.
-		\throws falco_exception if rule has not been passed to
-		on_rule_loaded() first
+		\brief Callback for when a given rule matches an event
 	*/
 	virtual void on_event(const falco_rule& rule);

 	/*!
-		\brief Formats the internal statistics into the out string.
+		\brief Formats the internal statistics into the out string
 	*/
 	virtual void format(
 		const indexed_vector<falco_rule>& rules,
 		std::string& out) const;

 private:
-	atomic<uint64_t> m_total;
-	std::vector<std::unique_ptr<atomic<uint64_t>>> m_by_priority;
-	std::vector<std::unique_ptr<atomic<uint64_t>>> m_by_rule_id;
+	uint64_t m_total;
+	std::vector<uint64_t> m_by_priority;
+	std::vector<uint64_t> m_by_rule_id;
 };
--- a/userspace/falco/CMakeLists.txt
+++ b/userspace/falco/CMakeLists.txt
@@ -20,7 +20,7 @@ set(
  app_actions/create_signal_handlers.cpp
  app_actions/daemonize.cpp
  app_actions/init_falco_engine.cpp
-  app_actions/init_inspectors.cpp
+  app_actions/init_inspector.cpp
  app_actions/init_clients.cpp
  app_actions/init_outputs.cpp
  app_actions/list_fields.cpp
@@ -35,16 +35,10 @@ set(
  app_actions/print_ignored_events.cpp
  app_actions/print_plugin_info.cpp
  app_actions/print_support.cpp
-  app_actions/print_syscall_events.cpp
  app_actions/print_version.cpp
-  app_actions/print_page_size.cpp
-  app_actions/compute_syscall_buffer_size.cpp
-  app_actions/select_event_sources.cpp
  app_actions/start_grpc_server.cpp
  app_actions/start_webserver.cpp
  app_actions/validate_rules_files.cpp
-  app_actions/create_requested_paths.cpp
-  app_actions/configure_interesting_sets.cpp
  configuration.cpp
  logger.cpp
  falco_outputs.cpp
@@ -53,7 +47,7 @@ set(
  outputs_stdout.cpp
  outputs_syslog.cpp
  event_drops.cpp
-  stats_writer.cpp
+  statsfilewriter.cpp
  falco.cpp
 )

@@ -62,16 +56,17 @@ set(
  "${PROJECT_SOURCE_DIR}/userspace/engine"
  "${PROJECT_BINARY_DIR}/userspace/falco"
  "${PROJECT_BINARY_DIR}/driver/src"
+  "${STRING_VIEW_LITE_INCLUDE}"
  "${CXXOPTS_INCLUDE_DIR}"
  "${YAMLCPP_INCLUDE_DIR}"
  "${CMAKE_CURRENT_BINARY_DIR}"
  "${CMAKE_CURRENT_SOURCE_DIR}"
+  "${DRAIOS_DEPENDENCIES_DIR}/yaml-${DRAIOS_YAML_VERSION}/target/include"
 )

-list(APPEND FALCO_INCLUDE_DIRECTORIES "${FALCO_EXTRA_INCLUDE_DIRS}")
-
 set(
  FALCO_DEPENDENCIES
+  string-view-lite
  b64
  cxxopts
 )
--- a/userspace/falco/app_actions/compute_syscall_buffer_size.cpp
+++ b/userspace/falco/app_actions/compute_syscall_buffer_size.cpp
@@ -1,71 +0,0 @@
-/*
-Copyright (C) 2022 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 "application.h"
-
-using namespace falco::app;
-
-/* These indexes could change over the Falco releases. */
-#define MIN_INDEX 1
-#define MAX_INDEX 10
-#define DEFAULT_BYTE_SIZE 1 << 23
-
-application::run_result application::configure_syscall_buffer_size()
-{
-	/* We don't need to compute the syscall buffer dimension if we are in capture mode or if the
-	 * the syscall source is not enabled.
-	 */
-	if(is_capture_mode() || m_state->enabled_sources.find(falco_common::syscall_source) == m_state->enabled_sources.end() || is_gvisor_enabled())
-	{
-		return run_result::ok();
-	}
-
-	uint16_t index = m_state->config->m_syscall_buf_size_preset;
-	if(index < MIN_INDEX || index > MAX_INDEX)
-	{
-		return run_result::fatal("The 'syscall_buf_size_preset' value must be between '" + std::to_string(MIN_INDEX) + "' and '" + std::to_string(MAX_INDEX) + "'\n");
-	}
-
-	/* Sizes from `1 MB` to `512 MB`. The index `0` is reserved, users cannot use it! */
-	std::vector<uint32_t> vect{0, 1 << 20, 1 << 21, 1 << 22, DEFAULT_BYTE_SIZE, 1 << 24, 1 << 25, 1 << 26, 1 << 27, 1 << 28, 1 << 29};
-
-	uint64_t chosen_size = vect[index];
-
-	/* If the page size is not valid we return here. */
-	long page_size = getpagesize();
-	if(page_size <= 0)
-	{
-		m_state->syscall_buffer_bytes_size = DEFAULT_BYTE_SIZE;
-		falco_logger::log(LOG_WARNING, "Unable to get the system page size through 'getpagesize()'. Try to use the default syscall buffer dimension: " + std::to_string(DEFAULT_BYTE_SIZE) + " bytes\n");
-		return run_result::ok();
-	}
-
-	/* Check if the chosen size is a multiple of the page size. */
-	if(chosen_size % page_size != 0)
-	{
-		return run_result::fatal("The chosen syscall buffer size '" + std::to_string(chosen_size) + "' is not a multiple of your system page size '" + std::to_string(page_size) + "'. Please configure a greater 'syscall_buf_size_preset' value in the Falco configuration file\n");
-	}
-
-	/* Check if the chosen size is greater than `2 * page_size`. */
-	if((chosen_size / page_size) <= 2)
-	{
-		return run_result::fatal("The chosen syscall buffer size '" + std::to_string(chosen_size) + "' is not greater than '2 * " + std::to_string(page_size) + "' where '" + std::to_string(page_size) + "' is your system page size. Please configure a greater 'syscall_buf_size_preset' value in the Falco configuration file\n");
-	}
-
-	m_state->syscall_buffer_bytes_size = chosen_size;
-	falco_logger::log(LOG_INFO, "The chosen syscall buffer dimension is: " + std::to_string(chosen_size) + " bytes (" +  std::to_string(chosen_size / (uint64_t)(1024 * 1024)) + " MBs)\n");
-	return run_result::ok();
-}
--- a/userspace/falco/app_actions/configure_interesting_sets.cpp
+++ b/userspace/falco/app_actions/configure_interesting_sets.cpp
@@ -1,61 +0,0 @@
-/*
-Copyright (C) 2022 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 "application.h"
-
-using namespace falco::app;
-
-void application::configure_interesting_sets()
-{
-	/// TODO: in the next future we need to change the interface of `enforce_simple_ppm_sc_set`
-	/// and `enforce_sinsp_state_tp` APIs, they shouldn't require an inspector to be called!
-	std::unique_ptr<sinsp> inspector(new sinsp());
-
-	/* Please note: here we fill these 2 sets because we are interested in only some features, if we leave
-	 * them empty `libsinsp` will fill them with all the available syscalls and all the available tracepoints!
-	 */
-
-	/* Here the `libsinsp` state set is not enough, we need other syscalls used in the rules,
-	 * so we use the `simple_set`, this `simple_set` contains all the syscalls of the `libsinsp` state
-	 * plus syscalls for Falco default rules.
-	 */
-	m_state->ppm_sc_of_interest = inspector->enforce_simple_ppm_sc_set();
-	m_state->ppm_event_info_of_interest = inspector->get_event_set_from_ppm_sc_set(m_state->ppm_sc_of_interest);
-
-	/* Fill-up the set of event infos of interest */
-	for (uint32_t ev = 2; ev < PPM_EVENT_MAX; ev++)
-	{
-		if (!sinsp::is_old_version_event(ev)
-				&& !sinsp::is_unused_event(ev)
-				&& !sinsp::is_unknown_event(ev))
-		{
-			/* So far we only covered syscalls, so we add other kinds of
-			interesting events. In this case, we are also interested in
-			metaevents and in the procexit tracepoint event. */
-			if (sinsp::is_metaevent(ev) || ev == PPME_PROCEXIT_1_E)
-			{
-				m_state->ppm_event_info_of_interest.insert(ev);
-			}
-		}
-	}
-
-	/* In this case we get the tracepoints for the `libsinsp` state and we remove
-	 * the `sched_switch` tracepoint since it is highly noisy and not so useful
-	 * for our state/events enrichment.
-	 */
-	m_state->tp_of_interest = inspector->enforce_sinsp_state_tp();
-	m_state->tp_of_interest.erase(SCHED_SWITCH);
-}
--- a/userspace/falco/app_actions/create_requested_paths.cpp
+++ b/userspace/falco/app_actions/create_requested_paths.cpp
@@ -1,111 +0,0 @@
-/*
-Copyright (C) 2022 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 "application.h"
-#include "falco_utils.h"
-#include <sys/stat.h>
-
-#ifndef CPPPATH_SEP
-#ifdef _MSC_VER
-#define CPPPATH_SEP "\\"
-#else
-#define CPPPATH_SEP "/"
-#endif
-#endif
-
-using namespace falco::app;
-
-application::run_result application::create_requested_paths()
-{
-	if(!m_options.gvisor_config.empty())
-	{
-		// This is bad: parsing gvisor config to get endpoint
-		// to be able to auto-create the path to the file for the user.
-		std::ifstream reader(m_options.gvisor_config);
-		if (reader.fail())
-		{
-			return run_result::fatal(m_options.gvisor_config + ": cannot open file");
-		}
-
-		nlohmann::json parsed_json;
-		std::string gvisor_socket;
-		try
-		{
-			parsed_json = nlohmann::json::parse(reader);
-		}
-		catch (const std::exception &e)
-		{
-			return run_result::fatal(m_options.gvisor_config + ": cannot parse JSON: " + e.what());
-		}
-
-		try
-		{
-			gvisor_socket = parsed_json["trace_session"]["sinks"][0]["config"]["endpoint"];
-		}
-		catch (const std::exception &e)
-		{
-			return run_result::fatal(m_options.gvisor_config + ": failed to fetch config.endpoint: " + e.what());
-		}
-
-		int ret = create_dir(gvisor_socket);
-		if (ret != 0)
-		{
-			return run_result::fatal(gvisor_socket + ": " + strerror(errno));
-		}
-	}
-
-	if (m_state->config->m_grpc_enabled && !m_state->config->m_grpc_bind_address.empty())
-	{
-		if(falco::utils::network::is_unix_scheme(m_state->config->m_grpc_bind_address))
-		{
-			auto server_path = m_state->config->m_grpc_bind_address.substr(
-				falco::utils::network::UNIX_SCHEME.length()
-			);
-			int ret = create_dir(server_path);
-			if(ret != 0)
-			{
-				return run_result::fatal(server_path + ": " + strerror(errno));
-			}
-		}
-	}
-
-	// TODO: eventually other files written by Falco whose destination is
-	// customizable by users, must be handled here.
-	return run_result::ok();
-}
-
-int application::create_dir(const std::string &path)
-{
-	// Properly reset errno
-	errno = 0;
-
-	istringstream f(path);
-	string path_until_token;
-	string s;
-	// Create all the subfolder stopping at last token (f.eof());
-	// Examples:
-	// "/tmp/foo/bar" -> "", "tmp", "foo" -> mkdir("/") + mkdir("/tmp/") + midir("/tmp/foo/")
-	// "tmp/foo/bar" -> "tmp", "foo" -> mkdir("tmp/") + midir("tmp/foo/")
-	while (getline(f, s, *CPPPATH_SEP) && !f.eof()) {
-		path_until_token += s + CPPPATH_SEP;
-		int ret = mkdir(path_until_token.c_str(), 0600);
-		if (ret != 0 && errno != EEXIST)
-		{
-			return ret;
-		}
-	}
-	return 0;
-}
--- a/userspace/falco/app_actions/create_signal_handlers.cpp
+++ b/userspace/falco/app_actions/create_signal_handlers.cpp
@@ -30,24 +30,23 @@ using namespace falco::app;
 // provided application, and in unregister_signal_handlers it will be
 // rebound back to the dummy application.

+static application dummy;
+static std::reference_wrapper<application> s_app = dummy;
 static int inot_fd;

-static void terminate_signal_handler(int signal)
+static void signal_callback(int signal)
 {
-	ASSERT(falco::app::g_terminate.is_lock_free());
-	falco::app::g_terminate.store(APP_SIGNAL_SET, std::memory_order_seq_cst);
+	s_app.get().terminate();
 }

-static void reopen_outputs_signal_handler(int signal)
+static void reopen_outputs(int signal)
 {
-	ASSERT(falco::app::g_reopen_outputs.is_lock_free());
-	falco::app::g_reopen_outputs.store(APP_SIGNAL_SET, std::memory_order_seq_cst);
+	s_app.get().reopen_outputs();
 }

-static void restart_signal_handler(int signal)
+static void restart_falco(int signal)
 {
-	ASSERT(falco::app::g_restart.is_lock_free());
-	falco::app::g_restart.store(APP_SIGNAL_SET, std::memory_order_seq_cst);
+	s_app.get().restart();
 }

 bool application::create_handler(int sig, void (*func)(int), run_result &ret)
@@ -72,52 +71,42 @@ bool application::create_handler(int sig, void (*func)(int), run_result &ret)

 application::run_result application::create_signal_handlers()
 {
-	falco::app::g_terminate.store(APP_SIGNAL_NOT_SET, std::memory_order_seq_cst);
-	falco::app::g_restart.store(APP_SIGNAL_NOT_SET, std::memory_order_seq_cst);
-	falco::app::g_reopen_outputs.store(APP_SIGNAL_NOT_SET, std::memory_order_seq_cst);
-
-	if (!g_terminate.is_lock_free()
-		|| !g_restart.is_lock_free()
-		|| !g_reopen_outputs.is_lock_free())
-	{
-		falco_logger::log(LOG_WARNING, "Bundled atomics implementation is not lock-free, signal handlers may be unstable\n");
-	}
-
 	run_result ret;
-	if(! create_handler(SIGINT, ::terminate_signal_handler, ret) ||
-	   ! create_handler(SIGTERM, ::terminate_signal_handler, ret) ||
-	   ! create_handler(SIGUSR1, ::reopen_outputs_signal_handler, ret) ||
-	   ! create_handler(SIGHUP, ::restart_signal_handler, ret))
+	if(! create_handler(SIGINT, ::signal_callback, ret) ||
+	   ! create_handler(SIGTERM, ::signal_callback, ret) ||
+	   ! create_handler(SIGUSR1, ::reopen_outputs, ret) ||
+	   ! create_handler(SIGHUP, ::restart_falco, ret))
 	{
-		// we use the if just to make sure we return at the first failed statement
+		return ret;
 	}

+	s_app = *this;
 	return ret;
 }

 application::run_result application::attach_inotify_signals()
 {
-    if (m_state->config->m_watch_config_files)
+        if (m_state->config->m_watch_config_files)
 	{
 		inot_fd = inotify_init();
 		if (inot_fd == -1)
 		{
-			return run_result::fatal("Could not create inotify handler");
+			return run_result::fatal("Could not create inotify handler.");
 		}

 		struct sigaction sa;
 		sigemptyset(&sa.sa_mask);
 		sa.sa_flags = SA_RESTART;
-		sa.sa_handler = restart_signal_handler;
+		sa.sa_handler = restart_falco;
 		if (sigaction(SIGIO, &sa, NULL) == -1)
 		{
-			return run_result::fatal("Failed to link SIGIO to inotify handler");
+			return run_result::fatal("Failed to link SIGIO to inotify handler.");
 		}

 		/* Set owner process that is to receive "I/O possible" signal */
 		if (fcntl(inot_fd, F_SETOWN, getpid()) == -1)
 		{
-			return run_result::fatal("Failed to setting owner on inotify handler");
+			return run_result::fatal("Failed to setting owner on inotify handler.");
 		}

 		/*
@@ -127,14 +116,14 @@ application::run_result application::attach_inotify_signals()
 		int flags = fcntl(inot_fd, F_GETFL);
 		if (fcntl(inot_fd, F_SETFL, flags | O_ASYNC | O_NONBLOCK) == -1)
 		{
-			return run_result::fatal("Failed to setting flags on inotify handler");
+			return run_result::fatal("Failed to setting flags on inotify handler.");
 		}

 		// Watch conf file
 		int wd = inotify_add_watch(inot_fd, m_options.conf_filename.c_str(), IN_CLOSE_WRITE);
 		if (wd == -1)
 		{
-			return run_result::fatal("Failed to watch conf file");
+			return run_result::fatal("Failed to watch conf file.");
 		}
 		falco_logger::log(LOG_DEBUG, "Watching " + m_options.conf_filename +"\n");

@@ -146,7 +135,7 @@ application::run_result application::attach_inotify_signals()
 			{
 				return run_result::fatal("Failed to watch rule file: " + rule);
 			}
-			falco_logger::log(LOG_DEBUG, "Watching " + rule +"\n");
+			falco_logger::log(LOG_DEBUG, "Watching " + rule +".\n");
 		}

 		// Watch specified rules folders, if any:
@@ -160,7 +149,7 @@ application::run_result application::attach_inotify_signals()
 			{
 				return run_result::fatal("Failed to watch rule folder: " + fld);
 			}
-			falco_logger::log(LOG_DEBUG, "Watching " + fld +" folder\n");
+			falco_logger::log(LOG_DEBUG, "Watching " + fld +" folder.\n");
 		}
 	}
 	return run_result::ok();
@@ -178,5 +167,7 @@ bool application::unregister_signal_handlers(std::string &errstr)
 		errstr = ret.errstr;
 		return false;
 	}
+
+	s_app = dummy;
 	return true;
 }
--- a/userspace/falco/app_actions/daemonize.cpp
+++ b/userspace/falco/app_actions/daemonize.cpp
@@ -34,7 +34,7 @@ application::run_result application::daemonize()
 		pid = fork();
 		if (pid < 0) {
 			// error
-			return run_result::fatal("Could not fork");
+			return run_result::fatal("Could not fork.");
 		} else if (pid > 0) {
 			// parent. Write child pid to pidfile and exit
 			std::ofstream pidfile;
@@ -54,7 +54,7 @@ application::run_result application::daemonize()
 		// Become own process group.
 		sid = setsid();
 		if (sid < 0) {
-			return run_result::fatal("Could not set session id");
+			return run_result::fatal("Could not set session id.");
 		}

 		// Set umask so no files are world anything or group writable.
@@ -62,7 +62,7 @@ application::run_result application::daemonize()

 		// Change working directory to '/'
 		if ((chdir("/")) < 0) {
-			return run_result::fatal("Could not change working directory to '/'");
+			return run_result::fatal("Could not change working directory to '/'.");
 		}

 		// Close stdin, stdout, stderr and reopen to /dev/null
--- a/userspace/falco/app_actions/init_clients.cpp
+++ b/userspace/falco/app_actions/init_clients.cpp
@@ -21,18 +21,16 @@ using namespace falco::app;
 application::run_result application::init_clients()
 {
 #ifndef MINIMAL_BUILD
-	// k8s and mesos clients are useful only if syscall source is enabled
-	if (m_state->enabled_sources.find(falco_common::syscall_source) == m_state->enabled_sources.end())
+	// k8s client is useful only if the syscall source is enabled
+	if (!is_syscall_source_enabled())
 	{
 		return run_result::ok();
 	}

-	auto inspector = m_state->source_infos.at(falco_common::syscall_source)->inspector;
-
 	falco_logger::log(LOG_DEBUG, "Setting metadata download max size to " + to_string(m_state->config->m_metadata_download_max_mb) + " MB\n");
 	falco_logger::log(LOG_DEBUG, "Setting metadata download chunk wait time to " + to_string(m_state->config->m_metadata_download_chunk_wait_us) + " μs\n");
 	falco_logger::log(LOG_DEBUG, "Setting metadata download watch frequency to " + to_string(m_state->config->m_metadata_download_watch_freq_sec) + " seconds\n");
-	inspector->set_metadata_download_params(m_state->config->m_metadata_download_max_mb * 1024 * 1024, m_state->config->m_metadata_download_chunk_wait_us, m_state->config->m_metadata_download_watch_freq_sec);
+	m_state->inspector->set_metadata_download_params(m_state->config->m_metadata_download_max_mb * 1024 * 1024, m_state->config->m_metadata_download_chunk_wait_us, m_state->config->m_metadata_download_watch_freq_sec);

 	//
 	// Run k8s, if required
@@ -55,24 +53,7 @@ application::run_result application::init_clients()
 				*k8s_api_cert_ptr = k8s_cert_env;
 			}
 		}
-		inspector->init_k8s_client(k8s_api_ptr, k8s_api_cert_ptr, k8s_node_name_ptr, m_options.verbose);
-	}
-
-	//
-	// Run mesos, if required
-	//
-	if(!m_options.mesos_api.empty())
-	{
-		// Differs from init_k8s_client in that it
-		// passes a pointer but the inspector does
-		// *not* own it and does not use it after
-		// init_mesos_client() returns.
-		inspector->init_mesos_client(&(m_options.mesos_api), m_options.verbose);
-	}
-	else if(char* mesos_api_env = getenv("FALCO_MESOS_API"))
-	{
-		std::string mesos_api_copy = mesos_api_env;
-		inspector->init_mesos_client(&mesos_api_copy, m_options.verbose);
+		m_state->inspector->init_k8s_client(k8s_api_ptr, k8s_api_cert_ptr, k8s_node_name_ptr, m_options.verbose);
 	}
 #endif

--- a/userspace/falco/app_actions/init_falco_engine.cpp
+++ b/userspace/falco/app_actions/init_falco_engine.cpp
@@ -14,8 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+#include <sstream>
+
 #include "application.h"
-#include <plugin_manager.h>

 using namespace falco::app;

@@ -29,31 +30,21 @@ void application::configure_output_format()
 		output_format = "container=%container.name (id=%container.id)";
 		replace_container_info = true;
 	}
-	else if(m_options.print_additional == "cg" || m_options.print_additional == "container-gvisor")
-	{
-		output_format = "container=%container.name (id=%container.id) vpid=%proc.vpid vtid=%thread.vtid";
-		replace_container_info = true;
-	}
 	else if(m_options.print_additional == "k" || m_options.print_additional == "kubernetes")
 	{
 		output_format = "k8s.ns=%k8s.ns.name k8s.pod=%k8s.pod.name container=%container.id";
 		replace_container_info = true;
 	}
-	else if(m_options.print_additional == "kg" || m_options.print_additional == "kubernetes-gvisor")
-	{
-		output_format = "k8s.ns=%k8s.ns.name k8s.pod=%k8s.pod.name container=%container.id vpid=%proc.vpid vtid=%thread.vtid";
-		replace_container_info = true;
-	}
-	else if(m_options.print_additional == "m" || m_options.print_additional == "mesos")
-	{
-		output_format = "task=%mesos.task.name container=%container.id";
-		replace_container_info = true;
-	}
 	else if(!m_options.print_additional.empty())
 	{
 		output_format = m_options.print_additional;
 		replace_container_info = false;
 	}
+	else if(m_options.gvisor_config != "")
+	{
+		output_format = "container=%container.id pid=%proc.vpid tid=%thread.vtid";
+		replace_container_info = true;
+	}

 	if(!output_format.empty())
 	{
@@ -61,80 +52,47 @@ void application::configure_output_format()
 	}
 }

-void application::add_source_to_engine(const std::string& src)
-{
-	auto src_info = m_state->source_infos.at(src);
-	std::shared_ptr<gen_event_filter_factory> filter_factory = nullptr;
-	std::shared_ptr<gen_event_formatter_factory> formatter_factory = nullptr;
-
-	if (src == falco_common::syscall_source)
-	{
-		filter_factory = std::shared_ptr<gen_event_filter_factory>(
-			new sinsp_filter_factory(src_info->inspector.get()));
-		formatter_factory = std::shared_ptr<gen_event_formatter_factory>(
-			new sinsp_evt_formatter_factory(src_info->inspector.get()));
-	}
-	else
-	{
-		auto &filterchecks = m_state->source_infos.at(src)->filterchecks;
-		filter_factory = std::shared_ptr<gen_event_filter_factory>(
-			new sinsp_filter_factory(src_info->inspector.get(), filterchecks));
-		formatter_factory = std::shared_ptr<gen_event_formatter_factory>(
-			new sinsp_evt_formatter_factory(src_info->inspector.get(), filterchecks));
-	}
-
-	if(m_state->config->m_json_output)
-	{
-		formatter_factory->set_output_format(gen_event_formatter::OF_JSON);
-	}
-
-	src_info->engine_idx = m_state->engine->add_source(
-		src, filter_factory, formatter_factory);
-}
-
 application::run_result application::init_falco_engine()
 {
-	// add all non-syscall event sources in engine
-	for (const auto& src : m_state->loaded_sources)
-	{
-		if (src != falco_common::syscall_source)
-		{
-			// we skip the syscall as we want it to be the one added for last
-			// in the engine. This makes the source index assignment easier.
-			add_source_to_engine(src);
-		}
-	}
-
-	// add syscall as last source
-	add_source_to_engine(falco_common::syscall_source);
-
-	// note: in capture mode, we can assume that the plugin source index will
-	// be the same in both the falco engine and the sinsp plugin manager.
-	// This assumption stands because the plugin manager stores sources in a
-	// vector, and the syscall source is appended in the engine *after* the sources
-	// coming from plugins. The reason why this can't work with live mode,
-	// is because in that case event sources are scattered across different
-	// inspectors. Since this is an implementation-based assumption, we
-	// check this and return an error to spot regressions in the future.
-	if (is_capture_mode())
-	{
-		auto manager = m_state->offline_inspector->get_plugin_manager();
-		for (const auto &p : manager->plugins())
-		{
-			if (p->caps() & CAP_SOURCING)
-			{
-				bool added = false;
-				auto source_idx = manager->source_idx_by_plugin_id(p->id(), added);
-				auto engine_idx = m_state->source_infos.at(p->event_source())->engine_idx;
-				if (!added || source_idx != engine_idx)
-				{
-					return run_result::fatal("Could not add event source in the engine: " + p->event_source());
-				}
-			}
-		}
-	}
-
 	configure_output_format();
+
+	// Create "factories" that can create filters/formatters for syscalls
+
+	// libs requires raw pointer, we should modify libs to use reference/shared_ptr
+	std::shared_ptr<gen_event_filter_factory> syscall_filter_factory(new sinsp_filter_factory(m_state->inspector.get()));
+
+	// libs requires raw pointer, we should modify libs to use reference/shared_ptr
+	std::shared_ptr<gen_event_formatter_factory> syscall_formatter_factory(new sinsp_evt_formatter_factory(m_state->inspector.get()));
+
+	m_state->syscall_source_idx = m_state->engine->add_source(falco_common::syscall_source, syscall_filter_factory, syscall_formatter_factory);
+	
+	if(m_state->config->m_json_output)
+	{
+		syscall_formatter_factory->set_output_format(gen_event_formatter::OF_JSON);
+	}
+
+	for(const auto &src : m_options.disable_sources)
+	{
+		if (m_state->enabled_sources.find(src) == m_state->enabled_sources.end())
+		{
+			return run_result::fatal("Attempted disabling unknown event source: " + src);
+		}
+		m_state->enabled_sources.erase(src);
+	}
+
+	// todo(jasondellaluce,leogr): change this once we attain multiple active source
+	if(m_state->enabled_sources.empty())
+	{
+		return run_result::fatal("At least one event source needs to be enabled");
+	}
+
+	/* Print all enabled sources. */
+	std::ostringstream os;
+	std::copy(m_state->enabled_sources.begin(), m_state->enabled_sources.end(), std::ostream_iterator<std::string>(os, ","));
+	std::string result = os.str();
+	result.pop_back();
+	falco_logger::log(LOG_INFO, "Enabled sources: " + result + "\n");
+
 	m_state->engine->set_min_priority(m_state->config->m_min_priority);

 	return run_result::ok();
--- a/userspace/falco/app_actions/init_inspector.cpp
+++ b/userspace/falco/app_actions/init_inspector.cpp
@@ -0,0 +1,58 @@
+/*
+Copyright (C) 2022 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 "application.h"
+
+using namespace falco::app;
+
+application::run_result application::init_inspector()
+{
+	m_state->inspector->set_buffer_format(m_options.event_buffer_format);
+
+	// If required, set the CRI paths
+	for (auto &p : m_options.cri_socket_paths)
+	{
+		if (!p.empty())
+		{
+			m_state->inspector->add_cri_socket_path(p);
+		}
+	}
+
+	// Decide whether to do sync or async for CRI metadata fetch
+	m_state->inspector->set_cri_async(!m_options.disable_cri_async);
+
+	//
+	// If required, set the snaplen
+	//
+	if(m_options.snaplen != 0)
+	{
+		m_state->inspector->set_snaplen(m_options.snaplen);
+	}
+
+	if(!m_options.all_events)
+	{
+		// Drop EF_DROP_SIMPLE_CONS kernel side
+		m_state->inspector->set_simple_consumer();
+		// Eventually, drop any EF_DROP_SIMPLE_CONS event
+		// that reached userspace (there are some events that are not syscall-based
+		// like signaldeliver, that have the EF_DROP_SIMPLE_CONS flag)
+		m_state->inspector->set_drop_event_flags(EF_DROP_SIMPLE_CONS);
+	}
+
+	m_state->inspector->set_hostname_and_port_resolution_mode(false);
+
+	return run_result::ok();
+}
--- a/userspace/falco/app_actions/init_inspectors.cpp
+++ b/userspace/falco/app_actions/init_inspectors.cpp
@@ -1,200 +0,0 @@
-/*
-Copyright (C) 2022 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 "application.h"
-#include <unordered_set>
-#include <plugin_manager.h>
-
-using namespace falco::app;
-
-void application::init_syscall_inspector(
-		std::shared_ptr<sinsp> inspector,
-		const falco::app::cmdline_options& opts)
-{
-	inspector->set_buffer_format(opts.event_buffer_format);
-
-	// If required, set the CRI paths
-	for (auto &p : opts.cri_socket_paths)
-	{
-		if (!p.empty())
-		{
-			inspector->add_cri_socket_path(p);
-		}
-	}
-
-	// Decide whether to do sync or async for CRI metadata fetch
-	inspector->set_cri_async(!opts.disable_cri_async);
-
-	//
-	// If required, set the snaplen
-	//
-	if(opts.snaplen != 0)
-	{
-		inspector->set_snaplen(opts.snaplen);
-	}
-
-	if(!opts.all_events)
-	{
-		configure_interesting_sets();
-	}
-
-	if(m_state->config->m_hash_executables)
-	{
-		inspector->set_exec_hashing(true, m_state->config->m_hashing_checksum_files);
-	}
-
-	inspector->set_hostname_and_port_resolution_mode(false);
-}
-
-static bool populate_filterchecks(
-		std::shared_ptr<sinsp> inspector,
-		const std::string& source,
-		filter_check_list& filterchecks,
-		std::unordered_set<std::string>& used_plugins,
-		std::string& err)
-{
-	std::vector<const filter_check_info*> info;
-	for(const auto& p : inspector->get_plugin_manager()->plugins())
-	{
-		if (!(p->caps() & CAP_EXTRACTION))
-		{
-			continue;
-		}
-
-		// check if some fields are overlapping on this event sources
-		info.clear();
-		filterchecks.get_all_fields(info);
-		for (auto &info : info)
-		{
-			for (int32_t i = 0; i < info->m_nfields; i++)
-			{
-				// check if one of the fields extractable by the plugin
-				// is already provided by another filtercheck for this source
-				std::string fname = info->m_fields[i].m_name;
-				for (auto &f : p->fields())
-				{
-					if (std::string(f.m_name) == fname)
-					{
-						err = "Plugin '" + p->name()
-							+ "' supports extraction of field '" + fname
-							+ "' that is overlapping for source '" + source + "'";
-						return false;
-					}
-				}
-			}
-		}
-
-		// add plugin filterchecks to the event source
-		filterchecks.add_filter_check(sinsp_plugin::new_filtercheck(p));
-		used_plugins.insert(p->name());
-	}
-	return true;
-}
-
-application::run_result application::init_inspectors()
-{
-	std::string err;
-	std::unordered_set<std::string> used_plugins;
-	const auto& all_plugins = m_state->offline_inspector->get_plugin_manager()->plugins();
-	
-	for (const auto &src : m_state->loaded_sources)
-	{
-		auto src_info = m_state->source_infos.at(src);
-
-		// in capture mode, every event source uses the offline inspector.
-		// in live mode, we create a new inspector for each event source
-		src_info->inspector = is_capture_mode()
-			? m_state->offline_inspector
-			: std::make_shared<sinsp>();
-
-		// handle syscall and plugin sources differently
-		// todo(jasondellaluce): change this once we support extracting plugin fields from syscalls too
-		if (src == falco_common::syscall_source)
-		{
-			init_syscall_inspector(src_info->inspector, m_options);
-			continue;
-		}
-
-		// load and init all plugins compatible with this event source
-		// (if in capture mode, all plugins will be inited on the same inspector)
-		for (const auto& p : all_plugins)
-		{
-			std::shared_ptr<sinsp_plugin> plugin = nullptr;
-			auto config = m_state->plugin_configs.at(p->name());
-			auto is_input = p->caps() & CAP_SOURCING && p->event_source() == src;
-
-			if (is_capture_mode())
-			{
-				// in capture mode, every plugin is already registered
-				// in the offline inspector by the load_plugins action
-				plugin = p;
-			}
-			else
-			{
-				// in live mode, for the inspector assigned to the given
-				// event source, we must register the plugin supporting
-				// that event source and also plugins with field extraction
-				// capability that are compatible with that event source
-				if (is_input || (p->caps() & CAP_EXTRACTION && p->is_source_compatible(src)))
-				{
-					plugin = src_info->inspector->register_plugin(config->m_library_path);
-				}
-			}
-
-			// init the plugin, if we registered it into an inspector
-			// (in capture mode, this is true for every plugin)
-			if (plugin)
-			{
-				if (!plugin->init(config->m_init_config, err))
-				{
-					return run_result::fatal(err);
-				}
-				if (is_input)
-				{
-					auto gen_check = src_info->inspector->new_generic_filtercheck();
-					src_info->filterchecks.add_filter_check(gen_check);
-				}
-				used_plugins.insert(plugin->name());
-			}
-		}
-
-		// populate filtercheck list for this inspector
-		if (!populate_filterchecks(
-				src_info->inspector,
-				src,
-				src_info->filterchecks,
-				used_plugins,
-				err))
-		{
-			return run_result::fatal(err);
-		}	
-
-	}
-
-	// check if some plugin with field extraction capability remains unused
-	for (const auto& p : all_plugins)
-	{
-		if(used_plugins.find(p->name()) == used_plugins.end() 
-			&& p->caps() & CAP_EXTRACTION
-			&& !(p->caps() & CAP_SOURCING && p->is_source_compatible(p->event_source())))
-		{
-			return run_result::fatal("Plugin '" + p->name()
-				+ "' has field extraction capability but is not compatible with any known event source");
-		}
-	}
-
-	return run_result::ok();
-}
--- a/userspace/falco/app_actions/init_outputs.cpp
+++ b/userspace/falco/app_actions/init_outputs.cpp
@@ -25,12 +25,9 @@ application::run_result application::init_outputs()
 {
 	// read hostname
 	std::string hostname;
-	char* env_hostname = getenv("FALCO_HOSTNAME");
-	// todo(leogr): keep FALCO_GRPC_HOSTNAME for backward compatibility. Shall we deprecate it?
-	if(env_hostname || (env_hostname = getenv("FALCO_GRPC_HOSTNAME")))
+	if(char* env_hostname = getenv("FALCO_GRPC_HOSTNAME"))
 	{
 		hostname = env_hostname;
-		falco_logger::log(LOG_INFO, "Hostname value has been overridden via environment variable to: " + hostname + "\n");
 	}
 	else
 	{
@@ -43,16 +40,20 @@ application::run_result application::init_outputs()
 		hostname = c_hostname;
 	}

-	m_state->outputs.reset(new falco_outputs(
-		m_state->engine,
-		m_state->config->m_outputs,
-		m_state->config->m_json_output,
-		m_state->config->m_json_include_output_property,
-		m_state->config->m_json_include_tags_property,
-		m_state->config->m_output_timeout,
-		m_state->config->m_buffered_outputs,
-		m_state->config->m_time_format_iso_8601,
-		hostname));
+	m_state->outputs->init(m_state->engine,
+			      m_state->config->m_json_output,
+			      m_state->config->m_json_include_output_property,
+			      m_state->config->m_json_include_tags_property,
+			      m_state->config->m_output_timeout,
+			      m_state->config->m_notifications_rate, m_state->config->m_notifications_max_burst,
+			      m_state->config->m_buffered_outputs,
+			      m_state->config->m_time_format_iso_8601,
+			      hostname);
+
+	for(auto output : m_state->config->m_outputs)
+	{
+		m_state->outputs->add_output(output);
+	}

 	return run_result::ok();
 }
--- a/userspace/falco/app_actions/list_fields.cpp
+++ b/userspace/falco/app_actions/list_fields.cpp
@@ -33,5 +33,12 @@ application::run_result application::list_fields()
 		return run_result::exit();
 	}

+	if(m_options.list_syscall_events)
+	{
+		// We know this function doesn't hold into the raw pointer value
+		list_events(m_state->inspector.get(), m_options.markdown);
+		return run_result::exit();
+	}
+
 	return run_result::ok();
 }
--- a/userspace/falco/app_actions/list_plugins.cpp
+++ b/userspace/falco/app_actions/list_plugins.cpp
@@ -24,17 +24,14 @@ application::run_result application::list_plugins()
 	if(m_options.list_plugins)
 	{
 		std::ostringstream os;
-		std::unique_ptr<sinsp> inspector(new sinsp());
-		const auto& configs = m_state->config->m_plugins;
-		for (auto &c : configs)
+		const auto &plugins = m_state->inspector->get_plugin_manager()->plugins();
+		for (auto &p : plugins)
 		{
-			// load the plugin (no need to initialize it)
-			auto plugin = inspector->register_plugin(c.m_library_path);
-			format_plugin_info(plugin, os);
+			format_plugin_info(p, os);
 			os << std::endl;
 		}

-		printf("%lu Plugins Loaded:\n\n%s\n", configs.size(), os.str().c_str());
+		printf("%lu Plugins Loaded:\n\n%s\n", plugins.size(), os.str().c_str());
 		return run_result::exit();
 	}

--- a/userspace/falco/app_actions/load_config.cpp
+++ b/userspace/falco/app_actions/load_config.cpp
@@ -26,12 +26,9 @@ application::run_result application::load_config()
 		falco_logger::set_time_format_iso_8601(m_state->config->m_time_format_iso_8601);

 		// log after config init because config determines where logs go
-		falco_logger::log(LOG_INFO, "Falco version: " + std::string(FALCO_VERSION) + " (" + std::string(FALCO_TARGET_ARCH) + ")\n");
-		if (!m_state->cmdline.empty())
-		{
-			falco_logger::log(LOG_DEBUG, "CLI args: " + m_state->cmdline);
-		}
+		falco_logger::log(LOG_INFO, "Falco version: " + std::string(FALCO_VERSION) + "\n");
 		falco_logger::log(LOG_INFO, "Falco initialized with configuration file: " + m_options.conf_filename + "\n");
+		falco_logger::log(LOG_INFO, "Falco compiled for: " + std::string(FALCO_TARGET_ARCH) + "\n");
 	}
 	else
 	{
--- a/userspace/falco/app_actions/load_plugins.cpp
+++ b/userspace/falco/app_actions/load_plugins.cpp
@@ -27,34 +27,117 @@ application::run_result application::load_plugins()
 		return run_result::fatal("Can not load/use plugins with musl optimized build");
 	}
 #endif
-	auto empty_src_info = state::source_info{};

-	// Initialize the set of loaded event sources. 
-	// By default, the set includes the 'syscall' event source
-	m_state->source_infos.clear();
-	m_state->source_infos.insert(empty_src_info, falco_common::syscall_source);
-	m_state->loaded_sources = { falco_common::syscall_source };
+	// The only enabled event source is syscall by default
+	m_state->enabled_sources = {falco_common::syscall_source};

-	// Initialize map of plugin configs
-	m_state->plugin_configs.clear();
-
-	// Initialize the offline inspector. This is used to load all the configured
-	// plugins in order to have them available every time we need to access
-	// their static info. If Falco is in capture mode, this inspector is also
-	// used to open and read the trace file
-	m_state->offline_inspector.reset(new sinsp());
-
-	// Load all the configured plugins
+	std::string err = "";
+	std::shared_ptr<sinsp_plugin> loaded_plugin = nullptr;
 	for(auto &p : m_state->config->m_plugins)
 	{
-		falco_logger::log(LOG_INFO, "Loading plugin '" + p.m_name + "' from file " + p.m_library_path + "\n");
-		auto plugin = m_state->offline_inspector->register_plugin(p.m_library_path);
-		m_state->plugin_configs.insert(p, plugin->name());
+		falco_logger::log(LOG_INFO, "Loading plugin (" + p.m_name + ") from file " + p.m_library_path + "\n");
+		auto plugin = m_state->inspector->register_plugin(p.m_library_path);
+		if (!plugin->init(p.m_init_config, err))
+		{
+			return run_result::fatal(err);
+		}
+
 		if(plugin->caps() & CAP_SOURCING)
 		{
-			auto sname = plugin->event_source();
-			m_state->source_infos.insert(empty_src_info, sname);
-			m_state->loaded_sources.insert(sname);
+			if (!is_capture_mode())
+			{
+				// todo(jasondellaluce): change this once we support multiple enabled event sources
+				if(loaded_plugin)
+				{
+					return run_result::fatal("Can not load multiple plugins with event sourcing capability: '"
+						+ loaded_plugin->name()
+						+ "' already loaded");
+				}
+				loaded_plugin = plugin;
+				m_state->enabled_sources = {plugin->event_source()};
+				m_state->inspector->set_input_plugin(p.m_name, p.m_open_params);
+			}
+
+			// Init filtercheck list for the plugin's source and add the
+			// event-generic filterchecks
+			auto &filterchecks = m_state->plugin_filter_checks[plugin->event_source()];
+			filterchecks.add_filter_check(m_state->inspector->new_generic_filtercheck());
+
+			// Factories that can create filters/formatters for the event source of the plugin.
+			std::shared_ptr<gen_event_filter_factory> filter_factory(new sinsp_filter_factory(m_state->inspector.get(), filterchecks));
+			std::shared_ptr<gen_event_formatter_factory> formatter_factory(new sinsp_evt_formatter_factory(m_state->inspector.get(), filterchecks));
+			if(m_state->config->m_json_output)
+			{
+				formatter_factory->set_output_format(gen_event_formatter::OF_JSON);
+			}
+
+			// note: here we assume that the source index will be the same in
+			// both the falco engine and the sinsp plugin manager. This assumption
+			// stands because the plugin manager stores sources in a vector, and
+			// the syscall source is appended in the engine *after* the sources
+			// coming from plugins. Since this is an implementation-based
+			// assumption, we check this and return an error to spot
+			// regressions in the future. We keep it like this for to avoid the
+			// overhead of additional mappings at runtime, but we may consider
+			// mapping the two indexes under something like std::unordered_map in the future.
+			bool added = false;
+			auto source_idx = m_state->inspector->get_plugin_manager()->source_idx_by_plugin_id(plugin->id(), added);
+			auto source_idx_engine = m_state->engine->add_source(plugin->event_source(), filter_factory, formatter_factory);
+			if (!added || source_idx != source_idx_engine)
+			{
+				return run_result::fatal("Could not add event source in the engine: " + plugin->event_source());
+			}
+		}
+	}
+
+	// Iterate over the plugins with extractor capability and add them to the
+	// filtercheck list of their compatible sources
+	std::vector<const filter_check_info*> filtercheck_info;
+	for(const auto& p : m_state->inspector->get_plugin_manager()->plugins())
+	{
+		if (!(p->caps() & CAP_EXTRACTION))
+		{
+			continue;
+		}
+
+		bool used = false;
+		for (auto &it : m_state->plugin_filter_checks)
+		{
+			// check if the event source is compatible with this plugin
+			if (p->is_source_compatible(it.first))
+			{
+				// check if some fields are overlapping on this event sources
+				filtercheck_info.clear();
+				it.second.get_all_fields(filtercheck_info);
+				for (auto &info : filtercheck_info)
+				{
+					for (int32_t i = 0; i < info->m_nfields; i++)
+					{
+						// check if one of the fields extractable by the plugin
+						// is already provided by another filtercheck for this source
+						std::string fname = info->m_fields[i].m_name;
+						for (auto &f : p->fields())
+						{
+							if (std::string(f.m_name) == fname)
+							{
+								return run_result::fatal(
+									"Plugin '" + p->name()
+									+ "' supports extraction of field '" + fname
+									+ "' that is overlapping for source '" + it.first + "'");
+							}
+						}
+					}
+				}
+
+				// add plugin filterchecks to the event source
+				it.second.add_filter_check(sinsp_plugin::new_filtercheck(p));
+				used = true;
+			}
+		}
+		if (!used)
+		{
+			return run_result::fatal("Plugin '" + p->name()
+				+ "' has field extraction capability but is not compatible with any enabled event source");
 		}
 	}

--- a/userspace/falco/app_actions/load_rules_files.cpp
+++ b/userspace/falco/app_actions/load_rules_files.cpp
@@ -17,57 +17,55 @@ limitations under the License.
 #include "application.h"
 #include <plugin_manager.h>

-#include <unordered_set>
-
 using namespace falco::app;

-bool application::check_rules_plugin_requirements(std::string& err)
-{
-	// Ensure that all plugins are compatible with the loaded set of rules
-	// note: offline inspector contains all the loaded plugins
-	std::vector<falco_engine::plugin_version_requirement> plugin_reqs;
-	for (const auto &plugin : m_state->offline_inspector->get_plugin_manager()->plugins())
- 	{
-		falco_engine::plugin_version_requirement req;
-		req.name = plugin->name();
-		req.version = plugin->plugin_version().as_string();
-		plugin_reqs.push_back(req);
- 	}
-	return m_state->engine->check_plugin_requirements(plugin_reqs, err);
-}
-
 void application::check_for_ignored_events()
 {
-	/* Get the events from the rules. */
-	std::set<uint16_t> rule_events;
+	std::set<uint16_t> evttypes;
+	sinsp_evttables* einfo = m_state->inspector->get_event_info_tables();
+	const struct ppm_event_info* etable = einfo->m_event_info;
+
 	std::string source = falco_common::syscall_source;
-	m_state->engine->evttypes_for_ruleset(source, rule_events);
+	m_state->engine->evttypes_for_ruleset(source, evttypes);

-	/* Get the events we consider interesting from the application state `ppm_sc` codes. */
-	std::unique_ptr<sinsp> inspector(new sinsp());
-	std::unordered_set<uint32_t> events(rule_events.begin(), rule_events.end());
+	// Save event names so we don't warn for both the enter and exit event.
+	std::set<std::string> warn_event_names;

-	auto event_names = inspector->get_events_names(events);
-	for (const auto& n : inspector->get_events_names(m_state->ppm_event_info_of_interest))
+	for(auto evtnum : evttypes)
 	{
-		event_names.erase(n);
+		if(evtnum == PPME_GENERIC_E || evtnum == PPME_GENERIC_X)
+		{
+			continue;
+		}
+
+		if(!sinsp::simple_consumer_consider_evtnum(evtnum))
+		{
+			std::string name = etable[evtnum].name;
+			if(warn_event_names.find(name) == warn_event_names.end())
+			{
+				warn_event_names.insert(name);
+			}
+		}
 	}

-	if(event_names.empty())
+	// Print a single warning with the list of ignored events
+	if (!warn_event_names.empty())
 	{
-		return;
+		std::string skipped_events;
+		bool first = true;
+		for (const auto& evtname : warn_event_names)
+		{
+			if (first)
+			{
+				skipped_events += evtname;
+				first = false;
+			} else
+			{
+				skipped_events += "," + evtname;
+			}
+		}
+		fprintf(stderr,"Rules match ignored syscall: warning (ignored-evttype):\n         loaded rules match the following events: %s;\n         but these events are not returned unless running falco with -A\n", skipped_events.c_str());
 	}
-
-	/* Get the names of the ignored events and print them. */
-	std::cerr << "Rules match ignored syscall: warning (ignored-evttype):" << std::endl;
-	std::cerr << "Loaded rules match the following events: ";
-	bool first = true;
-	for(const auto& it : event_names)
-	{
-		std::cerr << (first ? "" : ", ") << it.c_str();
-		first = false;
-	}
-	std::cerr << std::endl << "But these events are not returned unless running falco with -A" << std::endl;
 }

 application::run_result application::load_rules_files()
@@ -95,44 +93,43 @@ application::run_result application::load_rules_files()
 		falco_configuration::read_rules_file_directory(path, m_state->config->m_loaded_rules_filenames, m_state->config->m_loaded_rules_folders);
 	}

-	std::vector<std::string> rules_contents;
-	falco::load_result::rules_contents_t rc;
-
-	try {
-		read_files(m_state->config->m_loaded_rules_filenames.begin(),
-			   m_state->config->m_loaded_rules_filenames.end(),
-			   rules_contents,
-			   rc);
-	}
-	catch(falco_exception& e)
-	{
-		return run_result::fatal(e.what());
-	}
-
-	for(auto &filename : m_state->config->m_loaded_rules_filenames)
+	for (const auto& filename : m_state->config->m_loaded_rules_filenames)
 	{
 		falco_logger::log(LOG_INFO, "Loading rules from file " + filename + "\n");
 		std::unique_ptr<falco::load_result> res;

-		res = m_state->engine->load_rules(rc.at(filename), filename);
+		res = m_state->engine->load_rules_file(filename);
+
+		// Print the full output if verbose is true
+		if(m_options.verbose &&
+		   (!res->successful() || res->has_warnings()))
+		{
+			printf("%s\n",
+			       (m_state->config->m_json_output ?
+				res->as_json().dump().c_str() :
+				res->as_string(true).c_str()));
+		}

 		if(!res->successful())
 		{
 			// Return the summary version as the error
-			return run_result::fatal(res->as_string(true, rc));
-		}
-
-		// If verbose is true, also print any warnings
-		if(m_options.verbose && res->has_warnings())
-		{
-			fprintf(stderr, "%s\n", res->as_string(true, rc).c_str());
+			return run_result::fatal(res->as_string(false));
 		}
 	}

-	std::string err = "";
-	if (!check_rules_plugin_requirements(err))
+	// Ensure that all plugins are compatible with the loaded set of rules
+	std::string plugin_vers_err = "";
+	std::vector<falco_engine::plugin_version_requirement> plugin_reqs;
+	for (const auto &plugin : m_state->inspector->get_plugin_manager()->plugins())
+ 	{
+		falco_engine::plugin_version_requirement req;
+		req.name = plugin->name();
+		req.version = plugin->plugin_version().as_string();
+		plugin_reqs.push_back(req);
+ 	}
+	if (!m_state->engine->check_plugin_requirements(plugin_reqs, plugin_vers_err))
 	{
-		return run_result::fatal(err);
+		return run_result::fatal(plugin_vers_err);
 	}

 	for (const auto& substring : m_options.disabled_rule_substrings)
@@ -162,13 +159,11 @@ application::run_result application::load_rules_files()
 		m_state->engine->enable_rule_by_tag(m_options.enabled_rule_tags, true);
 	}

-	/* Reading a scap file we have no concepts of ignored events we read all we need. */
-	if(!m_options.all_events && !is_capture_mode())
+	if(!m_options.all_events)
 	{
-		/* Here we have already initialized the application state with the interesting syscalls,
-		 * so we have to check if any event types used by the loaded rules are not considered by 
-		 * Falco interesting set.
-		 */
+		// For syscalls, see if any event types used by the
+		// loaded rules are ones with the EF_DROP_SIMPLE_CONS
+		// label.
 		check_for_ignored_events();
 	}

--- a/userspace/falco/app_actions/open_inspector.cpp
+++ b/userspace/falco/app_actions/open_inspector.cpp
@@ -18,115 +18,94 @@ limitations under the License.
 #include <sys/stat.h>
 #include <fcntl.h>

-#include <plugin_manager.h>
-
 #include "application.h"

-/* DEPRECATED: we will remove it in Falco 0.34. */
-#define FALCO_BPF_ENV_VARIABLE "FALCO_BPF_PROBE"
-
 using namespace falco::app;

-application::run_result application::open_offline_inspector()
-{
-	try
-	{
-		m_state->offline_inspector->open_savefile(m_options.trace_filename);
-		falco_logger::log(LOG_INFO, "Reading system call events from file: " + m_options.trace_filename + "\n");
-		return run_result::ok();
-	}
-	catch (sinsp_exception &e)
-	{
-		return run_result::fatal("Could not open trace filename " + m_options.trace_filename + " for reading: " + e.what());
-	}
-}
+typedef std::function<void(std::shared_ptr<sinsp> inspector)> open_t;

-application::run_result application::open_live_inspector(
-		std::shared_ptr<sinsp> inspector,
-		const std::string& source)
+application::run_result application::open_inspector()
 {
-	try
+	// Notify engine that we finished loading and enabling all rules
+	m_state->engine->complete_rule_loading();
+	
+	if(is_capture_mode())
 	{
-		if (source != falco_common::syscall_source) /* Plugin engine */
+		// Try to open the trace file as a
+		// capture file first.
+		try {
+			m_state->inspector->open(m_options.trace_filename);
+			falco_logger::log(LOG_INFO, "Reading system call events from file: " + m_options.trace_filename + "\n");
+		}
+		catch(sinsp_exception &e)
 		{
-			for (const auto& p: inspector->get_plugin_manager()->plugins())
+			return run_result::fatal("Could not open trace filename " + m_options.trace_filename + " for reading: " + e.what());
+		}
+	}
+	else
+	{
+		try
+		{
+			if(m_options.userspace)
 			{
-				if (p->caps() & CAP_SOURCING && p->event_source() == source)
-				{
-					auto cfg = m_state->plugin_configs.at(p->name());
-					falco_logger::log(LOG_INFO, "Opening capture with plugin '" + cfg->m_name + "'\n");
-					inspector->open_plugin(cfg->m_name, cfg->m_open_params);
-					return run_result::ok();
-				}
+				// open_udig() is the underlying method used in the capture code to parse userspace events from the kernel.
+				//
+				// Falco uses a ptrace(2) based userspace implementation.
+				// Regardless of the implementation, the underlying method remains the same.
+				m_state->inspector->open_udig();
 			}
-			return run_result::fatal("Can't open inspector for plugin event source: " + source);
-		}
-		else if (m_options.userspace) /* udig engine. */
-		{
-			// open_udig() is the underlying method used in the capture code to parse userspace events from the kernel.
-			//
-			// Falco uses a ptrace(2) based userspace implementation.
-			// Regardless of the implementation, the underlying method remains the same.
-			falco_logger::log(LOG_INFO, "Opening capture with udig\n");
-			inspector->open_udig();
-		}
-		else if(!m_options.gvisor_config.empty()) /* gvisor engine. */
-		{
-			falco_logger::log(LOG_INFO, "Opening capture with gVisor. Configuration path: " + m_options.gvisor_config);
-			inspector->open_gvisor(m_options.gvisor_config, m_options.gvisor_root);
-		}
-		else if(m_options.modern_bpf) /* modern BPF engine. */
-		{
-			falco_logger::log(LOG_INFO, "Opening capture with modern BPF probe");
-			inspector->open_modern_bpf(m_state->syscall_buffer_bytes_size, m_state->ppm_sc_of_interest, m_state->tp_of_interest);
-		}
-		else if(getenv(FALCO_BPF_ENV_VARIABLE) != NULL) /* BPF engine. */
-		{
-			const char *bpf_probe_path = std::getenv(FALCO_BPF_ENV_VARIABLE);
-			char full_path[PATH_MAX];
-			/* If the path is empty try to load the probe from the default path. */
-			if(strncmp(bpf_probe_path, "", 1) == 0)
+			else if(m_options.gvisor_config != "")
 			{
-				const char *home = std::getenv("HOME");
-				if(!home)
-				{
-					return run_result::fatal("Cannot get the env variable 'HOME'");
-				}
-				snprintf(full_path, PATH_MAX, "%s/%s", home, FALCO_PROBE_BPF_FILEPATH);
-				bpf_probe_path = full_path;
+				falco_logger::log(LOG_INFO, "Enabled event collection from gVisor. Configuration path: " + m_options.gvisor_config);
+				m_state->inspector->open_gvisor(m_options.gvisor_config, m_options.gvisor_root);
 			}
-			falco_logger::log(LOG_INFO, "Opening capture with BPF probe. BPF probe path: " + std::string(bpf_probe_path));
-			inspector->open_bpf(bpf_probe_path, m_state->syscall_buffer_bytes_size, m_state->ppm_sc_of_interest, m_state->tp_of_interest);
-		}
-		else /* Kernel module (default). */
-		{
-			try
+			else
 			{
-				falco_logger::log(LOG_INFO, "Opening capture with Kernel module");
-				inspector->open_kmod(m_state->syscall_buffer_bytes_size, m_state->ppm_sc_of_interest, m_state->tp_of_interest);
+				m_state->inspector->open();
 			}
-			catch(sinsp_exception &e)
+		}
+		catch(sinsp_exception &e)
+		{
+			// If syscall input source is enabled and not through userspace instrumentation
+			if (is_syscall_source_enabled() && !m_options.userspace)
 			{
 				// Try to insert the Falco kernel module
-				falco_logger::log(LOG_INFO, "Trying to inject the Kernel module and opening the capture again...");
 				if(system("modprobe " DRIVER_NAME " > /dev/null 2> /dev/null"))
 				{
-					falco_logger::log(LOG_ERR, "Unable to load the driver\n");
+					falco_logger::log(LOG_ERR, "Unable to load the driver.\n");
 				}
-				inspector->open_kmod(m_state->syscall_buffer_bytes_size, m_state->ppm_sc_of_interest, m_state->tp_of_interest);
+				m_state->inspector->open();
+			}
+			else
+			{
+				return run_result::fatal(e.what());
 			}
 		}
 	}
-	catch (sinsp_exception &e)
+
+	/// TODO: we can add a method to the inspector that tells us what 
+	/// is the underline engine used. Right now we print something only 
+	/// in case of BPF engine
+	if(m_state->inspector->is_bpf_enabled())
 	{
-		return run_result::fatal(e.what());
+		falco_logger::log(LOG_INFO, "Falco is using the BPF probe\n");	
 	}

 	// This must be done after the open
-	if (!m_options.all_events)
+	if(!m_options.all_events)
 	{
-		inspector->start_dropping_mode(1);
+		m_state->inspector->start_dropping_mode(1);
 	}

 	return run_result::ok();
 }
+
+bool application::close_inspector(std::string &errstr)
+{
+	if(m_state->inspector != nullptr)
+	{
+		m_state->inspector->close();
+	}
+
+	return true;
+}
--- a/userspace/falco/app_actions/print_ignored_events.cpp
+++ b/userspace/falco/app_actions/print_ignored_events.cpp
@@ -18,51 +18,53 @@ limitations under the License.

 using namespace falco::app;

-/// TODO: probably in the next future would be more meaningful to print the ignored syscalls rather than
-/// the ignored events, or maybe change the name of the events since right now they are almost the same of
-/// the syscalls.
-application::run_result application::print_ignored_events()
+void application::print_all_ignored_events()
 {
-	/* If the option is true we print the events ignored with Falco `-A`, otherwise
-	 * we return immediately.
-	 */
-	if(!m_options.print_ignored_events)
-	{
-		return run_result::ok();
-	}
+	sinsp_evttables* einfo = m_state->inspector->get_event_info_tables();
+	const struct ppm_event_info* etable = einfo->m_event_info;
+	const struct ppm_syscall_desc* stable = einfo->m_syscall_info_table;

-	/* Fill the application syscall and tracepoint sets.
-	 * The execution will be interrupted after this call so
-	 * we don't care if we populate these sets even if the `-A` flag
-	 * is not set.
-	 */
-	configure_interesting_sets();
-
-	/* Search for all the ignored syscalls. */
-	std::unordered_set<uint32_t> all_events;
-	for (uint32_t j = 0; j < PPM_EVENT_MAX; j++)
+	std::set<string> ignored_event_names;
+	for(uint32_t j = 0; j < PPM_EVENT_MAX; j++)
 	{
-		if (!sinsp::is_old_version_event(j)
-				&& !sinsp::is_unused_event(j)
-				&& !sinsp::is_unknown_event(j))
+		if(!sinsp::simple_consumer_consider_evtnum(j))
 		{
-			all_events.insert(j);
+			std::string name = etable[j].name;
+			// Ignore event names NA*
+			if(name.find("NA") != 0)
+			{
+				ignored_event_names.insert(name);
+			}
 		}
 	}

-	std::unique_ptr<sinsp> inspector(new sinsp());
-	auto ignored_event_names = inspector->get_events_names(all_events);
-	for (const auto &n : inspector->get_events_names(m_state->ppm_event_info_of_interest))
+	for(uint32_t j = 0; j < PPM_SC_MAX; j++)
 	{
-		ignored_event_names.erase(n);
+		if(!sinsp::simple_consumer_consider_syscallid(j))
+		{
+			std::string name = stable[j].name;
+			// Ignore event names NA*
+			if(name.find("NA") != 0)
+			{
+				ignored_event_names.insert(name);
+			}
+		}
 	}

-	std::cout << "Ignored Event(s):" << std::endl;
-	for(const auto& it : ignored_event_names)
+	printf("Ignored Event(s):");
+	for(auto it : ignored_event_names)
 	{
-		std::cout << "- " << it.c_str() << std::endl;
+		printf(" %s", it.c_str());
 	}
-	std::cout << std::endl;
-
-	return run_result::exit();
+	printf("\n");
+}
+
+application::run_result application::print_ignored_events()
+{
+	if(m_options.print_ignored_events)
+	{
+		print_all_ignored_events();
+		return run_result::exit();
+	}
+	return run_result::ok();
 }
--- a/userspace/falco/app_actions/print_page_size.cpp
+++ b/userspace/falco/app_actions/print_page_size.cpp
@@ -1,37 +0,0 @@
-/*
-Copyright (C) 2022 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 "application.h"
-
-using namespace falco::app;
-
-application::run_result application::print_page_size()
-{
-	if(m_options.print_page_size)
-	{
-		long page_size = getpagesize();
-		if(page_size <= 0)
-		{
-			return run_result::fatal("\nUnable to get the system page size through 'getpagesize()'\n");
-		}
-		else
-		{
-			falco_logger::log(LOG_INFO, "Your system page size is: " + std::to_string(page_size) + " bytes\n");
-		}
-		return run_result::exit();
-	}
-	return run_result::ok();
-}
--- a/userspace/falco/app_actions/print_plugin_info.cpp
+++ b/userspace/falco/app_actions/print_plugin_info.cpp
@@ -47,14 +47,13 @@ application::run_result application::print_plugin_info()
 #else  // MUSL_OPTIMIZED
 	if(!m_options.print_plugin_info.empty())
 	{
-		std::unique_ptr<sinsp> inspector(new sinsp());
 		for(auto &pc : m_state->config->m_plugins)
 		{
 			if (pc.m_name == m_options.print_plugin_info
 				|| pc.m_library_path == m_options.print_plugin_info)
 			{
 				// load the plugin
-				auto p = inspector->register_plugin(pc.m_library_path);
+				auto p = m_state->inspector->register_plugin(pc.m_library_path);

 				// print plugin descriptive info
 				std::ostringstream os;
--- a/userspace/falco/app_actions/print_support.cpp
+++ b/userspace/falco/app_actions/print_support.cpp
@@ -21,7 +21,7 @@ limitations under the License.

 using namespace falco::app;

-static std::string read_file(const std::string &filename)
+static std::string read_file(std::string &filename)
 {
 	std::ifstream t(filename);
 	std::string str((std::istreambuf_iterator<char>(t)),
--- a/userspace/falco/app_actions/print_syscall_events.cpp
+++ b/userspace/falco/app_actions/print_syscall_events.cpp
@@ -1,114 +0,0 @@
-/*
-Copyright (C) 2022 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 "application.h"
-
-using namespace falco::app;
-
-struct event_entry
-{
-	bool is_enter;
-	bool available;
-	std::string name;
-	struct ppm_event_info info;
-};
-
-static std::vector<event_entry> get_event_entries(bool include_generics, const std::unordered_set<uint32_t>& available)
-{
-	event_entry entry;
-	std::vector<event_entry> events;
-	std::unique_ptr<sinsp> inspector(new sinsp());
-	const struct ppm_event_info* etable = inspector->get_event_info_tables()->m_event_info;
-
-	// skip generic events
-	for(uint32_t evt = PPME_GENERIC_X + 1; evt < PPM_EVENT_MAX; evt++)
-	{
-		if (!sinsp::is_old_version_event(evt)
-				&& !sinsp::is_unused_event(evt)
-				&& !sinsp::is_unknown_event(evt))
-		{
-			entry.is_enter = PPME_IS_ENTER(evt);
-			entry.available = available.find(evt) != available.end();
-			entry.name = etable[evt].name;
-			entry.info = etable[evt];
-			events.push_back(entry);
-		}
-	}
-
-	if (include_generics)
-	{
-		// append generic events
-		const auto generic_syscalls = inspector->get_events_names({PPME_GENERIC_E});
-		for (const auto& name : generic_syscalls)
-		{
-			for(uint32_t evt = PPME_GENERIC_E; evt <= PPME_GENERIC_X; evt++)
-			{
-				entry.is_enter = PPME_IS_ENTER(evt);
-				entry.available = available.find(evt) != available.end();
-				entry.name = name;
-				entry.info = etable[evt];
-				events.push_back(entry);
-			}
-		}
-	}
-
-	return events;
-}
-
-application::run_result application::print_syscall_events()
-{
-	if(m_options.list_syscall_events)
-	{
-		configure_interesting_sets();
-		const auto events = get_event_entries(false, m_state->ppm_event_info_of_interest);
-
-		if(m_options.markdown)
-		{
-			printf("Falco | Dir | Event\n");
-			printf(":-----|:----|:-----\n");
-		}
-
-		for (const auto& e : events)
-		{
-			char dir = e.is_enter ? '>' : '<';
-			if (m_options.markdown)
-			{
-				printf(e.available ? "Yes" : "No");
-				printf(" | %c | **%s**(", dir, e.name.c_str());
-			}
-			else
-			{
-				printf("%c %s(", dir, e.name.c_str());
-			}
-
-			for(uint32_t k = 0; k < e.info.nparams; k++)
-			{
-				if(k != 0)
-				{
-					printf(", ");
-				}
-
-				printf("%s %s", param_type_to_string(e.info.params[k].type),
-					e.info.params[k].name);
-			}
-			printf(")\n");
-		}
-
-		return run_result::exit();
-	}
-
-	return run_result::ok();
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leonardo Grasso	359bd41b2e	chore(userspace/falco): correct comment Co-authored-by: Andrea Terzolo <andrea.terzolo@polito.it> Signed-off-by: Leonardo Grasso <me@leonardograsso.com>	2022-08-09 13:15:43 +02:00
Leonardo Grasso	27fb674406	chore: cleanup Mesos references Co-authored-by: Andrea Terzolo <andrea.terzolo@polito.it> Signed-off-by: Leonardo Grasso <me@leonardograsso.com>	2022-08-09 11:18:36 +02:00
Leonardo Grasso	4b35d71c99	chore(userspace/falco): remove unused `mesos_api` var Co-authored-by: Andrea Terzolo <andrea.terzolo@polito.it> Signed-off-by: Leonardo Grasso <me@leonardograsso.com>	2022-08-09 11:15:35 +02:00
Leonardo Grasso	710d15a2fd	chore(userspace/falco/app_actions): remove Mesos support Signed-off-by: Leonardo Grasso <me@leonardograsso.com>	2022-08-09 11:13:27 +02:00
Leonardo Grasso	3a445c6457	update!: remove `--mesos-api` and `-pm` command-line flags Signed-off-by: Leonardo Grasso <me@leonardograsso.com>	2022-08-09 11:12:30 +02:00