Merge branch 'dev' into agent-master

.travis.yml

@@ -2,9 +2,6 @@ language: c
 env:
     - BUILD_TYPE=Debug
     - BUILD_TYPE=Release
-sudo: required
-services:
-    - docker
 before_install:
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
     - sudo apt-get update
@@ -12,12 +9,12 @@ install:
     - sudo apt-get --force-yes install g++-4.8
     - sudo apt-get install rpm linux-headers-$(uname -r)
     - git clone https://github.com/draios/sysdig.git ../sysdig
-    - sudo apt-get install -y python-pip libvirt-dev jq dkms
+    - sudo apt-get install -y python-pip libvirt-dev jq
     - cd ..
     - curl -Lo avocado-36.0-tar.gz https://github.com/avocado-framework/avocado/archive/36.0lts.tar.gz
     - tar -zxvf avocado-36.0-tar.gz
     - cd avocado-36.0lts
-    - sudo -H pip install -r requirements.txt
+    - sudo pip install -r requirements-travis.txt
     - sudo python setup.py install
     - cd ../falco
 before_script:
@@ -38,10 +35,7 @@ script:
     - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDRAIOS_DEBUG_FLAGS="-D_DEBUG -DNDEBUG"
     - make VERBOSE=1
     - make package
-    - cp falco*.deb ../docker/local
-    - cd ../docker/local
-    - docker build -t sysdig/falco:test .
-    - cd ../..
+    - cd ..
     - sudo test/run_regression_tests.sh $TRAVIS_BRANCH
 notifications:
   webhooks:

CHANGELOG.md

@@ -2,64 +2,6 @@
 
 This file documents all notable changes to Falco. The release numbering uses [semantic versioning](http://semver.org).
 
-## v0.6.1
-
-Released 2016-05-15
-
-### Major Changes
-
-None
-
-### Minor Changes
-
-* Small changes to token bucket used to throttle falco events [[#234](https://github.com/draios/falco/pull/234)]] [[#235](https://github.com/draios/falco/pull/235)]] [[#236](https://github.com/draios/falco/pull/236)]] [[#238](https://github.com/draios/falco/pull/238)]]
-
-### Bug Fixes
-
-* Update the falco driver to work with kernel 4.11 [[#829](https://github.com/draios/sysdig/pull/829)]
-
-### Rule Changes
-
-* Don't allow apache2 to spawn shells in containers [[#231](https://github.com/draios/falco/issues/231)] [[#232](https://github.com/draios/falco/pull/232)]
-
-## v0.6.0
-
-Released 2016-03-29
-
-### Major Changes
-
-* Add the notion of tagged falco rules. Full documentation for this feature is available on the [wiki](https://github.com/draios/falco/wiki/Falco-Rules#rule-tags). [[#58](https://github.com/draios/falco/issues/58)] [[#59](https://github.com/draios/falco/issues/59)] [[#60](https://github.com/draios/falco/issues/60)] [[#206](https://github.com/draios/falco/pull/206)]
-* Falco now has its own dedicated kernel module. Previously, it would depend on sysdig being installed and would use sysdig's `sysdig-probe` kernel module. This ensures you can upgrade sysdig and falco without kernel driver compatibility problems. More details on the kernel module and its installation are on the [wiki](https://github.com/draios/falco/wiki/Falco-Kernel-Module). [[#215](https://github.com/draios/falco/issues/215)] [[#223](https://github.com/draios/falco/issues/223)] [[#224](https://github.com/draios/falco/pull/224)]
-* When providing multiple rules files by specifying `-r' multiple times, make sure that you can override rules/lists/macros. Previously, a list/macro/rule specified in an earlier file could not be overridden in a later file. [[#176](https://github.com/draios/falco/issues/176)] [[#177](https://github.com/draios/falco/pull/177)]
-* Add example k8s yaml files that show how to run falco as a k8s DaemonSet, and how to run falco-event-generator as a deployment running on one node. [[#222](https://github.com/draios/falco/pull/222)] [[#225](https://github.com/draios/falco/issues/225)] [[#226](https://github.com/draios/falco/pull/226)]
-* Update third party libraries to address security vulnerabilities. [[#182](https://github.com/draios/falco/pull/182)]
-* Falco can now be built on OSX. Like sysdig, on OSX it is limited to reading existing trace files. [[#210](https://github.com/draios/falco/pull/210)]
-
-### Minor Changes
-* Several changes to [falco-event-generator](https://github.com/draios/falco/wiki/Generating-Sample-Events) to improve usability. [[#205](https://github.com/draios/falco/pull/205)]
-* Switch to a formatter cache provided by sysdig code instead of using our own. [[#212](https://github.com/draios/falco/pull/212)]
-* Add automated tests that use locally-built docker images. [[#188](https://github.com/draios/falco/issues/188)]
-
-### Bug Fixes
-
-* Make sure output strings are not truncated when a given %field expression has a NULL value. [[#180](https://github.com/draios/falco/issues/180)] [[#181](https://github.com/draios/falco/pull/181)]
-* Allow ASSERTs when running travisci tests. [[#199](https://github.com/draios/falco/pull/199)]
-* Fix make dependencies for lyaml. [[#204](https://github.com/draios/falco/pull/204)] [[#130](https://github.com/draios/falco/issues/130)]
-* (This was a change in sysdig, but affected falco). Prevent hangs when traversing malformed parent thread state. [[#208](https://github.com/draios/falco/issues/208)]
-
-### Rule Changes
-
-* Add confd as a program that can write files below /etc and fleetctl as a program that can spawn shells. [[#175](https://github.com/draios/falco/pull/175)]
-* Add [exechealthz](https://github.com/kubernetes/contrib/tree/master/exec-healthz), a k8s liveness checking utility, to the list of shell spawners. [[#190](https://github.com/draios/falco/pull/190)]
-* Eliminate FPs related to weekly ubuntu cron jobs. [[#192](https://github.com/draios/falco/pull/192)]
-* Allow shells spawned by ansible, and eliminate FPs when managing machines via ansible. [[#193](https://github.com/draios/falco/pull/193)] [[#196](https://github.com/draios/falco/pull/196)] [[#202](https://github.com/draios/falco/pull/202)]
-* Eliminate FPs related to use of other security products. Thanks to @juju4 for the useful rule updates. [[#200](https://github.com/draios/falco/pull/200)]
-* Add additional possible locations for denyhosts, add [PM2](http://pm2.keymetrics.io/) as a shell spawner. [[#202](https://github.com/draios/falco/pull/202)]
-* Add flanneld as a privileged container, improve grouping for the "x running y" macros, allow denyhosts to spawn shells. [[#207](https://github.com/draios/falco/pull/207)]
-* Handle systemd changing its name to "(systemd)", add sv (part of [runit](http://smarden.org/runit/)) as a program that can write below /etc, allow writing to all `/dev/tty*` files. [[#209](https://github.com/draios/falco/pull/209)]
-* Add erl_child_setup as a shell spawner. Thanks to @dkerwin for the useful rule updates. [[#218](https://github.com/draios/falco/pull/218)]  [[#221](https://github.com/draios/falco/pull/221)]
-* Add support for gitlab omnibus containers/pods. Thanks to @dkerwin for the useful rule updates. [[#220](https://github.com/draios/falco/pull/220)]
-
 ## v0.5.0
 
 Released 2016-12-22

CMakeLists.txt

@@ -29,9 +29,7 @@ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -fno-strict-aliasing -DNDEBUG")
 
 add_definitions(-DPLATFORM_NAME="${CMAKE_SYSTEM_NAME}")
 add_definitions(-DK8S_DISABLE_THREAD)
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	add_definitions(-DHAS_CAPTURE)
-endif()
+add_definitions(-DHAS_CAPTURE)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 	set(KBUILD_FLAGS "${DRAIOS_DEBUG_FLAGS} ${DRAIOS_FEATURE_FLAGS}")
@@ -41,17 +39,13 @@ endif()
 
 set(PACKAGE_NAME "falco")
 set(PROBE_VERSION "${FALCO_VERSION}")
-set(PROBE_NAME "falco-probe")
-set(PROBE_DEVICE_NAME "falco")
+set(PROBE_NAME "sysdig-probe")
+set(PROBE_DEVICE_NAME "sysdig")
 set(CMAKE_INSTALL_PREFIX /usr)
 
 set(CMD_MAKE make)
 
 set(SYSDIG_DIR "${PROJECT_SOURCE_DIR}/../sysdig")
-# make luaJIT work on OS X
-if(APPLE)
-	set(CMAKE_EXE_LINKER_FLAGS "-pagezero_size 10000 -image_base 100000000")
-endif()
 
 include(ExternalProject)
 
@@ -301,18 +295,14 @@ if(NOT USE_BUNDLED_LPEG)
 else()
 	set(LPEG_SRC "${PROJECT_BINARY_DIR}/lpeg-prefix/src/lpeg")
 	set(LPEG_LIB "${PROJECT_BINARY_DIR}/lpeg-prefix/src/lpeg/build/lpeg.a")
-	set(LPEG_DEPENDENCIES "")
-	if(USE_BUNDLED_LUAJIT)
-		list(APPEND LPEG_DEPENDENCIES "luajit")
-	endif()
 	ExternalProject_Add(lpeg
-		DEPENDS ${LPEG_DEPENDENCIES}
+                DEPENDS luajit
 		URL "http://s3.amazonaws.com/download.draios.com/dependencies/lpeg-1.0.0.tar.gz"
-		URL_MD5 "0aec64ccd13996202ad0c099e2877ece"
-		BUILD_COMMAND LUA_INCLUDE=${LUAJIT_INCLUDE} "${PROJECT_SOURCE_DIR}/scripts/build-lpeg.sh" "${LPEG_SRC}/build"
-		BUILD_IN_SOURCE 1
+                URL_MD5 "0aec64ccd13996202ad0c099e2877ece"
+                BUILD_COMMAND LUA_INCLUDE=${LUAJIT_INCLUDE} "${PROJECT_SOURCE_DIR}/scripts/build-lpeg.sh" "${LPEG_SRC}/build"
+                BUILD_IN_SOURCE 1
 		CONFIGURE_COMMAND ""
-		INSTALL_COMMAND "")
+                INSTALL_COMMAND "")
 endif()
 
 #
@@ -342,11 +332,11 @@ else()
 	set(LIBYAML_LIB "${LIBYAML_SRC}/.libs/libyaml.a")
 	ExternalProject_Add(libyaml
 		URL "http://download.draios.com/dependencies/libyaml-0.1.4.tar.gz"
-		URL_MD5 "4a4bced818da0b9ae7fc8ebc690792a7"
-		BUILD_COMMAND ${CMD_MAKE}
-		BUILD_IN_SOURCE 1
+                URL_MD5 "4a4bced818da0b9ae7fc8ebc690792a7"
+                BUILD_COMMAND ${CMD_MAKE}
+                BUILD_IN_SOURCE 1
 		CONFIGURE_COMMAND ./bootstrap && ./configure
-		INSTALL_COMMAND "")
+                INSTALL_COMMAND "")
 endif()
 
 #
@@ -367,15 +357,8 @@ if(NOT USE_BUNDLED_LYAML)
 else()
 	set(LYAML_SRC "${PROJECT_BINARY_DIR}/lyaml-prefix/src/lyaml/ext/yaml")
 	set(LYAML_LIB "${LYAML_SRC}/.libs/yaml.a")
-	set(LYAML_DEPENDENCIES "")
-	if(USE_BUNDLED_LUAJIT)
-		list(APPEND LYAML_DEPENDENCIES "luajit")
-	endif()
-	if(USE_BUNDLED_LIBYAML)
-		list(APPEND LYAML_DEPENDENCIES "libyaml")
-	endif()
 	ExternalProject_Add(lyaml
-		DEPENDS ${LYAML_DEPENDENCIES}
+		DEPENDS libyaml luajit
 		URL "http://download.draios.com/dependencies/lyaml-release-v6.0.tar.gz"
                 URL_MD5 "dc3494689a0dce7cf44e7a99c72b1f30"
                 BUILD_COMMAND ${CMD_MAKE}
@@ -387,9 +370,7 @@ endif()
 install(FILES falco.yaml
 	DESTINATION "${FALCO_ETC_DIR}")
 
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-	add_subdirectory("${SYSDIG_DIR}/driver" "${PROJECT_BINARY_DIR}/driver")
-endif()
+add_subdirectory("${SYSDIG_DIR}/driver" "${PROJECT_BINARY_DIR}/driver")
 add_subdirectory("${SYSDIG_DIR}/userspace/libscap" "${PROJECT_BINARY_DIR}/userspace/libscap")
 add_subdirectory("${SYSDIG_DIR}/userspace/libsinsp" "${PROJECT_BINARY_DIR}/userspace/libsinsp")
 
@@ -415,12 +396,12 @@ set(CPACK_GENERATOR DEB RPM TGZ)
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Sysdig <support@sysdig.com>")
 set(CPACK_DEBIAN_PACKAGE_SECTION "utils")
 set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://www.sysdig.org")
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "dkms (>= 2.1.0.0)")
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/scripts/debian/postinst;${CMAKE_BINARY_DIR}/scripts/debian/prerm;${PROJECT_SOURCE_DIR}/scripts/debian/postrm")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "sysdig")
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${PROJECT_SOURCE_DIR}/scripts/debian/postinst;${PROJECT_SOURCE_DIR}/scripts/debian/prerm;${PROJECT_SOURCE_DIR}/scripts/debian/postrm")
 
 set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
 set(CPACK_RPM_PACKAGE_URL "http://www.sysdig.org")
-set(CPACK_RPM_PACKAGE_REQUIRES "dkms, gcc, make, kernel-devel, perl")
+set(CPACK_RPM_PACKAGE_REQUIRES "sysdig")
 set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/scripts/rpm/postinstall")
 set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/scripts/rpm/preuninstall")
 set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/scripts/rpm/postuninstall")

README.md

@@ -1,8 +1,8 @@
 # Sysdig Falco
 
-#### Latest release
+####Latest release
 
-**v0.6.1**
+**v0.5.0**
 Read the [change log](https://github.com/draios/falco/blob/dev/CHANGELOG.md)
 
 Dev Branch: [![Build Status](https://travis-ci.org/draios/falco.svg?branch=dev)](https://travis-ci.org/draios/falco)<br />
@@ -44,7 +44,7 @@ Falco is licensed to you under the [GPL 2.0](./COPYING) open source license.
 
 Contributor License Agreements
 ---
-### Background
+###Background
  As we did for sysdig, we are formalizing the way that we accept contributions of code from the contributing community. We must now ask that contributions to falco be provided subject to the terms and conditions of a [Contributor License Agreement (CLA)](./cla). The CLA comes in two forms, applicable to contributions by individuals, or by legal entities such as corporations and their employees. We recognize that entering into a CLA with us involves real consideration on your part, and we’ve tried to make this process as clear and simple as possible.
 
  We’ve modeled our CLA off of industry standards, such as [the CLA used by Kubernetes](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). Note that this agreement is not a transfer of copyright ownership, this simply is a license agreement for contributions, intended to clarify the intellectual property license granted with contributions from any person or entity. It is for your protection as a contributor as well as the protection of falco; it does not change your rights to use your own contributions for any other purpose.
@@ -57,7 +57,7 @@ Contributor License Agreements
 
 As always, we are grateful for your past and present contributions to falco.
 
-### What do I need to do in order to contribute code?
+###What do I need to do in order to contribute code?
 
 **Individual contributions**: Individuals who wish to make contributions must review the [Individual Contributor License Agreement](./cla/falco_contributor_agreement.txt) and indicate agreement by adding the following line to every GIT commit message:
 

docker/dev/docker-entrypoint.sh

@@ -11,7 +11,7 @@ if [[ -z "${SYSDIG_SKIP_LOAD}" ]]; then
         ln -s $SYSDIG_HOST_ROOT/usr/src/$i /usr/src/$i
     done
 
-    /usr/bin/falco-probe-loader
+    /usr/bin/sysdig-probe-loader
 fi
 
 exec "$@"

docker/local/Dockerfile

@@ -25,7 +25,7 @@ RUN echo "deb http://httpredir.debian.org/debian jessie main" > /etc/apt/sources
 	gcc \
 	gcc-5 \
 	gcc-4.9 \
-	dkms && rm -rf /var/lib/apt/lists/*
+	sysdig && rm -rf /var/lib/apt/lists/*
 
 # Since our base Debian image ships with GCC 5.0 which breaks older kernels, revert the
 # default to gcc-4.9. Also, since some customers use some very old distributions whose kernel

docker/local/docker-entrypoint.sh

@@ -11,7 +11,7 @@ if [[ -z "${SYSDIG_SKIP_LOAD}" ]]; then
         ln -s $SYSDIG_HOST_ROOT/usr/src/$i /usr/src/$i
     done
 
-    /usr/bin/falco-probe-loader
+    /usr/bin/sysdig-probe-loader
 fi
 
 exec "$@"

docker/stable/docker-entrypoint.sh

@@ -11,7 +11,7 @@ if [[ -z "${SYSDIG_SKIP_LOAD}" ]]; then
         ln -s $SYSDIG_HOST_ROOT/usr/src/$i /usr/src/$i
     done
 
-    /usr/bin/falco-probe-loader
+    /usr/bin/sysdig-probe-loader
 fi
 
 exec "$@"

examples/k8s-using-daemonset/README.md

@@ -1,5 +0,0 @@
-# Example K8s Services for Falco
-
-The yaml file in this directory installs the following:
- - Open Source Falco, as a DaemonSet. Falco is configured to communicate with the K8s API server via its service account, and changes its output to be K8s-friendly. It also sends to a slack webhook for the `#demo-falco-alerts` channel on our [public slack](https://sysdig.slack.com/messages/demo-falco-alerts/).
- - The [Falco Event Generator](https://github.com/draios/falco/wiki/Generating-Sample-Events), as a deployment that ensures it runs on exactly 1 node.

examples/k8s-using-daemonset/falco-daemonset.yaml

@@ -1,59 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: DaemonSet
-metadata:
-  name: falco
-  labels:
-    name: falco-daemonset
-    app: demo
-spec:
-  template:
-    metadata:
-      labels:
-        name: falco
-        app: demo
-        role: security
-    spec:
-      containers:
-        - name: falco
-          image: sysdig/falco:latest
-          securityContext:
-            privileged: true
-          args: [ "/usr/bin/falco", "-K", "/var/run/secrets/kubernetes.io/serviceaccount/token", "-k", "https://kubernetes", "-pk", "-o", "json_output=true", "-o", "program_output.enabled=true", "-o",  "program_output.program=jq '{text: .output}' | curl -d @- -X POST https://hooks.slack.com/services/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"]
-          volumeMounts:
-            - mountPath: /host/var/run/docker.sock
-              name: docker-socket
-              readOnly: true
-            - mountPath: /host/dev
-              name: dev-fs
-              readOnly: true
-            - mountPath: /host/proc
-              name: proc-fs
-              readOnly: true
-            - mountPath: /host/boot
-              name: boot-fs
-              readOnly: true
-            - mountPath: /host/lib/modules
-              name: lib-modules
-              readOnly: true
-            - mountPath: /host/usr
-              name: usr-fs
-              readOnly: true
-      volumes:
-        - name: docker-socket
-          hostPath:
-            path: /var/run/docker.sock
-        - name: dev-fs
-          hostPath:
-            path: /dev
-        - name: proc-fs
-          hostPath:
-            path: /proc
-        - name: boot-fs
-          hostPath:
-            path: /boot
-        - name: lib-modules
-          hostPath:
-            path: /lib/modules
-        - name: usr-fs
-          hostPath:
-            path: /usr

examples/k8s-using-daemonset/falco-event-generator-deployment.yaml

@@ -1,17 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: falco-event-generator-deployment
-  labels:
-    name: falco-event-generator-deployment
-    app: demo
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: falco-event-generator
-    spec:
-      containers:
-      - name: falco-event-generator
-        image: sysdig/falco-event-generator:latest

rules/falco_rules.yaml

@@ -76,7 +76,7 @@
 
 # dpkg -L login | grep bin | xargs ls -ld | grep -v '^d' | awk '{print $9}' | xargs -L 1 basename | tr "\\n" ","
 - list: login_binaries
-  items: [login, systemd, '"(systemd)"', systemd-logind, su, nologin, faillog, lastlog, newgrp, sg]
+  items: [login, systemd, systemd-logind, su, nologin, faillog, lastlog, newgrp, sg]
 
 # dpkg -L passwd | grep bin | xargs ls -ld | grep -v '^d' | awk '{print $9}' | xargs -L 1 basename | tr "\\n" ","
 - list: passwd_binaries
@@ -113,9 +113,6 @@
 - list: db_server_binaries
   items: [mysqld]
 
-- list: gitlab_binaries
-  items: [gitlab-shell, git]
-
 - macro: server_procs
   condition: proc.name in (http_server_binaries, db_server_binaries, docker_binaries, sshd)
 
@@ -259,7 +256,7 @@
                           package_mgmt_binaries, ssl_mgmt_binaries, dhcp_binaries,
                           ldconfig.real, ldconfig, confd, gpg, insserv,
                           apparmor_parser, update-mime, tzdata.config, tzdata.postinst,
-                          systemd-machine, debconf-show, rollerd, bind9.postinst, sv)
+                          systemd-machine, debconf-show, rollerd, bind9.postinst)
     and not proc.pname in (sysdigcloud_binaries)
     and not fd.directory in (/etc/cassandra, /etc/ssl/certs/java)
     and not ansible_running_python
@@ -368,7 +365,7 @@
     logrotate, ansible, less, adduser, pycompile, py3compile,
     pyclean, py3clean, pip, pip2, ansible-playboo, man-db,
     init, pluto, mkinitramfs, unattended-upgr, watch, sysdig,
-    landscape-sysin, nessusd, PM2, syslog-summary, erl_child_setup
+    landscape-sysin, nessusd, PM2, syslog-summary
     ]
 
 - rule: Run shell untrusted
@@ -433,7 +430,7 @@
     and shell_procs
     and proc.pname exists
     and not proc.pname in (shell_binaries, docker_binaries, k8s_binaries, lxd_binaries, aide_wrapper_binaries, nids_binaries,
-                           monitoring_binaries, gitlab_binaries, initdb, pg_ctl, awk, falco, cron, erl_child_setup)
+                           monitoring_binaries, initdb, pg_ctl, awk, apache2, falco, cron)
     and not trusted_containers
   output: "Shell spawned in a container other than entrypoint (user=%user.name %container.info shell=%proc.name parent=%proc.pname cmdline=%proc.cmdline)"
   priority: WARNING
@@ -472,7 +469,7 @@
   tags: [host, users]
 
 - list: allowed_dev_files
-  items: [/dev/null, /dev/stdin, /dev/stdout, /dev/stderr, /dev/random, /dev/urandom, /dev/console]
+  items: [/dev/null, /dev/stdin, /dev/stdout, /dev/stderr, /dev/tty, /dev/random, /dev/urandom, /dev/console]
 
 # (we may need to add additional checks against false positives, see: https://bugs.launchpad.net/ubuntu/+source/rkhunter/+bug/86153)
 - rule: Create files below dev
@@ -482,7 +479,6 @@
     (evt.type = creat or (evt.type = open and evt.arg.flags contains O_CREAT))
     and not proc.name in (dev_creation_binaries)
     and not fd.name in (allowed_dev_files)
-    and not fd.name startswith /dev/tty
   output: "File created below /dev by untrusted program (user=%user.name command=%proc.cmdline file=%fd.name)"
   priority: WARNING
   tags: [filesystem]

scripts/CMakeLists.txt

@@ -1,12 +1,5 @@
-configure_file(debian/postinst.in debian/postinst)
-configure_file(debian/prerm.in debian/prerm)
-
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/debian/falco"
 	DESTINATION "${PROJECT_BINARY_DIR}/scripts/debian")
 
 file(COPY "${PROJECT_SOURCE_DIR}/scripts/rpm/falco"
 	DESTINATION "${PROJECT_BINARY_DIR}/scripts/rpm")
-
-install(PROGRAMS ${SYSDIG_DIR}/scripts/sysdig-probe-loader
-	DESTINATION bin
-	RENAME falco-probe-loader)

scripts/debian/postinst

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+NAME=falco
+
+if [ -x "/etc/init.d/$NAME" ]; then
+        update-rc.d $NAME defaults >/dev/null
+fi
+

scripts/debian/postinst.in

@@ -1,32 +0,0 @@
-#!/bin/sh
-set -e
-
-DKMS_PACKAGE_NAME="@PACKAGE_NAME@"
-DKMS_VERSION="@PROBE_VERSION@"
-NAME="@PACKAGE_NAME@"
-
-postinst_found=0
-
-case "$1" in
-	configure)
-		for DKMS_POSTINST in /usr/lib/dkms/common.postinst /usr/share/$DKMS_PACKAGE_NAME/postinst; do
-			if [ -f $DKMS_POSTINST ]; then
-				$DKMS_POSTINST $DKMS_PACKAGE_NAME $DKMS_VERSION /usr/share/$DKMS_PACKAGE_NAME "" $2
-				postinst_found=1
-				break
-			fi
-		done
-		if [ "$postinst_found" -eq 0 ]; then
-			echo "ERROR: DKMS version is too old and $DKMS_PACKAGE_NAME was not"
-			echo "built with legacy DKMS support."
-			echo "You must either rebuild $DKMS_PACKAGE_NAME with legacy postinst"
-			echo "support or upgrade DKMS to a more current version."
-			exit 1
-		fi
-	;;
-esac
-
-if [ -x "/etc/init.d/$NAME" ]; then
-        update-rc.d $NAME defaults >/dev/null
-fi
-

scripts/debian/prerm

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+NAME=falco
+
+if [ -x "/etc/init.d/$NAME" ]; then
+		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+				invoke-rc.d $NAME stop || exit $?
+		else
+				/etc/init.d/$NAME stop || exit $?
+		fi
+fi
+

scripts/debian/prerm.in

@@ -1,23 +0,0 @@
-#!/bin/sh
-set -e
-
-NAME="@PACKAGE_NAME@"
-
-if [ -x "/etc/init.d/$NAME" ]; then
-		if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-				invoke-rc.d $NAME stop || exit $?
-		else
-				/etc/init.d/$NAME stop || exit $?
-		fi
-fi
-
-DKMS_PACKAGE_NAME="@PACKAGE_NAME@"
-DKMS_VERSION="@PROBE_VERSION@"
-
-case "$1" in
-	remove|upgrade|deconfigure)
-		if [  "$(dkms status -m $DKMS_PACKAGE_NAME -v $DKMS_VERSION)" ]; then
-			dkms remove -m $DKMS_PACKAGE_NAME -v $DKMS_VERSION --all
-		fi
-	;;
-esac

scripts/rpm/postinstall

@@ -1,15 +1 @@
-dkms add -m falco -v %{version} --rpm_safe_upgrade
-if [ `uname -r | grep -c "BOOT"` -eq 0 ] && [ -e /lib/modules/`uname -r`/build/include ]; then
-	dkms build -m falco -v %{version}
-	dkms install --force -m falco -v %{version}
-elif [ `uname -r | grep -c "BOOT"` -gt 0 ]; then
-	echo -e ""
-	echo -e "Module build for the currently running kernel was skipped since you"
-	echo -e "are running a BOOT variant of the kernel."
-else
-	echo -e ""
-	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
-
 /sbin/chkconfig --add falco

scripts/rpm/preuninstall

@@ -2,5 +2,3 @@ if [ $1 = 0 ]; then
 	/sbin/service falco stop > /dev/null 2>&1
 	/sbin/chkconfig --del falco
 fi
-
-dkms remove -m falco -v %{version} --all --rpm_safe_upgrade

test/falco_test.py

@@ -4,9 +4,6 @@ import os
 import re
 import json
 import sets
-import glob
-import shutil
-import subprocess
 
 from avocado import Test
 from avocado.utils import process
@@ -24,9 +21,9 @@ class FalcoTest(Test):
         self.stderr_contains = self.params.get('stderr_contains', '*', default='')
         self.exit_status = self.params.get('exit_status', '*', default=0)
         self.should_detect = self.params.get('detect', '*', default=False)
-        self.trace_file = self.params.get('trace_file', '*', default='')
+        self.trace_file = self.params.get('trace_file', '*')
 
-        if self.trace_file and not os.path.isabs(self.trace_file):
+        if not os.path.isabs(self.trace_file):
             self.trace_file = os.path.join(self.basedir, self.trace_file)
 
         self.json_output = self.params.get('json_output', '*', default=False)
@@ -46,8 +43,6 @@ class FalcoTest(Test):
         if not os.path.isabs(self.conf_file):
             self.conf_file = os.path.join(self.basedir, self.conf_file)
 
-        self.run_duration = self.params.get('run_duration', '*', default='')
-
         self.disabled_rules = self.params.get('disabled_rules', '*', default='')
 
         if self.disabled_rules == '':
@@ -94,23 +89,15 @@ class FalcoTest(Test):
             if not isinstance(self.detect_level, list):
                 self.detect_level = [self.detect_level]
 
-        self.package = self.params.get('package', '*', default='None')
+        # Doing this in 2 steps instead of simply using
+        # module_is_loaded to avoid logging lsmod output to the log.
+        lsmod_output = process.system_output("lsmod", verbose=False)
 
-        if self.package == 'None':
-            # Doing this in 2 steps instead of simply using
-            # module_is_loaded to avoid logging lsmod output to the log.
-            lsmod_output = process.system_output("lsmod", verbose=False)
+        if linux_modules.parse_lsmod_for_module(lsmod_output, 'sysdig_probe') == {}:
+            self.log.debug("Loading sysdig kernel module")
+            process.run('sudo insmod {}/driver/sysdig-probe.ko'.format(self.falcodir))
 
-            if linux_modules.parse_lsmod_for_module(lsmod_output, 'falco_probe') == {}:
-                self.log.debug("Loading falco kernel module")
-                process.run('insmod {}/driver/falco-probe.ko'.format(self.falcodir), sudo=True)
-
-        self.addl_docker_run_args = self.params.get('addl_docker_run_args', '*', default='')
-
-        self.copy_local_driver = self.params.get('copy_local_driver', '*', default=False)
-
-        # Used by possibly_copy_local_driver as well as docker run
-        self.module_dir = os.path.expanduser("~/.sysdig")
+        self.str_variant = self.trace_file
 
         self.outputs = self.params.get('outputs', '*', default='')
 
@@ -124,10 +111,6 @@ class FalcoTest(Test):
                     output['file'] = item2[0]
                     output['line'] = item2[1]
                     outputs.append(output)
-                    filedir = os.path.dirname(output['file'])
-                    # Create the parent directory for the trace file if it doesn't exist.
-                    if not os.path.isdir(filedir):
-                        os.makedirs(filedir)
             self.outputs = outputs
 
         self.disable_tags = self.params.get('disable_tags', '*', default='')
@@ -140,10 +123,6 @@ class FalcoTest(Test):
         if self.run_tags == '':
             self.run_tags=[]
 
-    def tearDown(self):
-        if self.package != 'None':
-            self.uninstall_package()
-
     def check_rules_warnings(self, res):
 
         found_warning = sets.Set()
@@ -252,103 +231,12 @@ class FalcoTest(Test):
                         if not attr in obj:
                             self.fail("Falco JSON object {} does not contain property \"{}\"".format(line, attr))
 
-    def install_package(self):
-
-        if self.package.startswith("docker:"):
-
-            image = self.package.split(":", 1)[1]
-            # Remove an existing falco-test container first. Note we don't check the output--docker rm
-            # doesn't have an -i equivalent.
-            res = process.run("docker rm falco-test", ignore_status=True)
-            rules_dir = os.path.abspath(os.path.join(self.basedir, "./rules"))
-            conf_dir = os.path.abspath(os.path.join(self.basedir, "../"))
-            traces_dir = os.path.abspath(os.path.join(self.basedir, "./trace_files"))
-            self.falco_binary_path = "docker run -i -t --name falco-test --privileged " \
-                                     "-v {}:/host/rules -v {}:/host/conf -v {}:/host/traces " \
-                                     "-v /var/run/docker.sock:/host/var/run/docker.sock " \
-                                     "-v /dev:/host/dev -v /proc:/host/proc:ro -v /boot:/host/boot:ro " \
-                                     "-v /lib/modules:/host/lib/modules:ro -v {}:/root/.sysdig:ro -v " \
-                                     "/usr:/host/usr:ro {} {} falco".format(
-                                         rules_dir, conf_dir, traces_dir,
-                                         self.module_dir, self.addl_docker_run_args, image)
-
-        elif self.package.endswith(".deb"):
-            self.falco_binary_path = '/usr/bin/falco';
-
-            package_glob = "{}/{}".format(self.falcodir, self.package)
-
-            matches = glob.glob(package_glob)
-
-            if len(matches) != 1:
-                self.fail("Package path {} did not match exactly 1 file. Instead it matched: {}", package_glob, ",".join(matches))
-
-            package_path = matches[0]
-
-            cmdline = "dpkg -i {}".format(package_path)
-            self.log.debug("Installing debian package via \"{}\"".format(cmdline))
-            res = process.run(cmdline, timeout=120, sudo=True)
-
-    def uninstall_package(self):
-
-        if self.package.startswith("docker:"):
-            # Remove the falco-test image. Here we *do* check the return value
-            res = process.run("docker rm falco-test")
-
-        elif self.package.endswith(".deb"):
-            cmdline = "dpkg -r falco"
-            self.log.debug("Uninstalling debian package via \"{}\"".format(cmdline))
-            res = process.run(cmdline, timeout=120, sudo=True)
-
-    def possibly_copy_driver(self):
-        # Remove the contents of ~/.sysdig regardless of
-        # copy_local_driver.
-        self.log.debug("Checking for module dir {}".format(self.module_dir))
-        if os.path.isdir(self.module_dir):
-            self.log.info("Removing files below directory {}".format(self.module_dir))
-            for rmfile in glob.glob(self.module_dir + "/*"):
-                self.log.debug("Removing file {}".format(rmfile))
-                os.remove(rmfile)
-
-        if self.copy_local_driver:
-            verstr = subprocess.check_output([self.falco_binary_path, "--version"]).rstrip()
-            self.log.info("verstr {}".format(verstr))
-            falco_version = verstr.split(" ")[2]
-            self.log.info("falco_version {}".format(falco_version))
-            arch = subprocess.check_output(["uname", "-m"]).rstrip()
-            self.log.info("arch {}".format(arch))
-            kernel_release = subprocess.check_output(["uname", "-r"]).rstrip()
-            self.log.info("kernel release {}".format(kernel_release))
-
-            # sysdig-probe-loader has a more comprehensive set of ways to
-            # find the config hash. We only look at /boot/config-<kernel release>
-            md5_output = subprocess.check_output(["md5sum", "/boot/config-{}".format(kernel_release)]).rstrip()
-            config_hash = md5_output.split(" ")[0]
-
-            probe_filename = "falco-probe-{}-{}-{}-{}.ko".format(falco_version, arch, kernel_release, config_hash)
-            driver_path = os.path.join(self.falcodir, "driver", "falco-probe.ko")
-            module_path = os.path.join(self.module_dir, probe_filename)
-            self.log.debug("Copying {} to {}".format(driver_path, module_path))
-            shutil.copyfile(driver_path, module_path)
-
     def test(self):
         self.log.info("Trace file %s", self.trace_file)
 
-        self.falco_binary_path = '{}/userspace/falco/falco'.format(self.falcodir)
-
-        self.possibly_copy_driver()
-
-        if self.package != 'None':
-            # This sets falco_binary_path as a side-effect.
-            self.install_package()
-
-        trace_arg = self.trace_file
-
-        if self.trace_file:
-            trace_arg = "-e {}".format(self.trace_file)
-
-        # Run falco
-        cmd = '{} {} {} -c {} {} -o json_output={} -v'.format(
-            self.falco_binary_path, self.rules_args, self.disabled_args, self.conf_file, trace_arg, self.json_output)
+        # Run the provided trace file though falco
+        cmd = '{}/userspace/falco/falco {} {} -c {} -e {} -o json_output={} -v'.format(
+            self.falcodir, self.rules_args, self.disabled_args, self.conf_file, self.trace_file, self.json_output)
 
         for tag in self.disable_tags:
             cmd += ' -T {}'.format(tag)
@@ -356,9 +244,6 @@ class FalcoTest(Test):
         for tag in self.run_tags:
             cmd += ' -t {}'.format(tag)
 
-        if self.run_duration:
-            cmd += ' -M {}'.format(self.run_duration)
-
         self.falco_proc = process.SubProcess(cmd)
 
         res = self.falco_proc.run(timeout=180, sig=9)

test/falco_tests.yaml.in

@@ -1,38 +1,4 @@
 trace_files: !mux
-
-  docker_package:
-    package: docker:sysdig/falco:test
-    detect: True
-    detect_level: WARNING
-    rules_file: /host/rules/rule_names_with_spaces.yaml
-    trace_file: /host/traces/cat_write.scap
-    conf_file: /host/conf/falco.yaml
-
-  # This uses a volume mount to overwrite and prevent /usr/sbin/dkms
-  # from being run. As a result, it will force falco-probe-loader to
-  # fall back to loading the driver from ~/.sysdig. Setting
-  # copy_local_driver to True copied the driver to ~/.sysdig, so it
-  # will be available. In this case, we're running live for 5 seconds
-  # just to see if falco can load the driver.
-
-  docker_package_local_driver:
-    package: docker:sysdig/falco:test
-    addl_docker_run_args: -v /dev/null:/usr/sbin/dkms
-    copy_local_driver: True
-    detect: False
-    detect_level: WARNING
-    rules_file: /host/rules/tagged_rules.yaml
-    conf_file: /host/conf/falco.yaml
-    run_duration: 5
-
-  debian_package:
-    package: falco*.deb
-    detect: True
-    detect_level: WARNING
-    rules_file:
-      - rules/rule_names_with_spaces.yaml
-    trace_file: trace_files/cat_write.scap
-
   builtin_rules_no_warnings:
     detect: False
     trace_file: trace_files/empty.scap

userspace/engine/falco_common.cpp

@@ -24,10 +24,6 @@ along with falco.  If not, see <http://www.gnu.org/licenses/>.
 falco_common::falco_common()
 {
 	m_ls = lua_open();
-	if(!m_ls)
-	{
-		throw falco_exception("Cannot open lua");
-	}
 	luaL_openlibs(m_ls);
 }
 

userspace/engine/formats.cpp

@@ -24,14 +24,12 @@ along with falco.  If not, see <http://www.gnu.org/licenses/>.
 
 
 sinsp* falco_formats::s_inspector = NULL;
-bool falco_formats::s_json_output = false;
-sinsp_evt_formatter_cache *falco_formats::s_formatters = NULL;
+bool s_json_output = false;
 
 const static struct luaL_reg ll_falco [] =
 {
 	{"formatter", &falco_formats::formatter},
 	{"free_formatter", &falco_formats::free_formatter},
-	{"free_formatters", &falco_formats::free_formatters},
 	{"format_event", &falco_formats::format_event},
 	{NULL,NULL}
 };
@@ -40,10 +38,6 @@ void falco_formats::init(sinsp* inspector, lua_State *ls, bool json_output)
 {
 	s_inspector = inspector;
 	s_json_output = json_output;
-	if(!s_formatters)
-	{
-		s_formatters = new sinsp_evt_formatter_cache(s_inspector);
-	}
 
 	luaL_openlib(ls, "formats", ll_falco, 0);
 }
@@ -79,43 +73,22 @@ int falco_formats::free_formatter(lua_State *ls)
 	return 0;
 }
 
-int falco_formats::free_formatters(lua_State *ls)
-{
-	if(s_formatters)
-	{
-		delete(s_formatters);
-		s_formatters = NULL;
-	}
-	return 0;
-}
-
 int falco_formats::format_event (lua_State *ls)
 {
 	string line;
 
-	if (!lua_isstring(ls, -1) ||
+	if (!lua_islightuserdata(ls, -1) ||
 	    !lua_isstring(ls, -2) ||
 	    !lua_isstring(ls, -3) ||
 	    !lua_islightuserdata(ls, -4)) {
-		lua_pushstring(ls, "Invalid arguments passed to format_event()");
-		lua_error(ls);
+		throw falco_exception("Invalid arguments passed to format_event()\n");
 	}
 	sinsp_evt* evt = (sinsp_evt*)lua_topointer(ls, 1);
 	const char *rule = (char *) lua_tostring(ls, 2);
 	const char *level = (char *) lua_tostring(ls, 3);
-	const char *format = (char *) lua_tostring(ls, 4);
+	sinsp_evt_formatter* formatter = (sinsp_evt_formatter*)lua_topointer(ls, 4);
 
-	string sformat = format;
-
-	try {
-		s_formatters->tostring(evt, sformat, &line);
-	}
-	catch (sinsp_exception& e)
-	{
-		string err = "Invalid output format '" + sformat + "': '" + string(e.what()) + "'";
-		lua_pushstring(ls, err.c_str());
-		lua_error(ls);
-	}
+	formatter->tostring(evt, &line);
 
 	// For JSON output, the formatter returned just the output
 	// string containing the format text and values. Use this to

userspace/engine/formats.h

@@ -39,13 +39,8 @@ class falco_formats
 	// falco.free_formatter(formatter)
 	static int free_formatter(lua_State *ls);
 
-	// falco.free_formatters()
-	static int free_formatters(lua_State *ls);
-
 	// formatted_string = falco.format_event(evt, formatter)
 	static int format_event(lua_State *ls);
 
 	static sinsp* s_inspector;
-	static sinsp_evt_formatter_cache *s_formatters;
-	static bool s_json_output;
 };

userspace/engine/rules.cpp

@@ -49,8 +49,7 @@ int falco_rules::clear_filters(lua_State *ls)
 {
 	if (! lua_islightuserdata(ls, -1))
 	{
-		lua_pushstring(ls, "Invalid arguments passed to clear_filters()");
-		lua_error(ls);
+		throw falco_exception("Invalid arguments passed to clear_filters()\n");
 	}
 
 	falco_rules *rules = (falco_rules *) lua_topointer(ls, -1);
@@ -71,8 +70,7 @@ int falco_rules::add_filter(lua_State *ls)
 	    ! lua_istable(ls, -2) ||
 	    ! lua_istable(ls, -1))
 	{
-		lua_pushstring(ls, "Invalid arguments passed to add_filter()");
-		lua_error(ls);
+		throw falco_exception("Invalid arguments passed to add_filter()\n");
 	}
 
 	falco_rules *rules = (falco_rules *) lua_topointer(ls, -4);
@@ -124,8 +122,7 @@ int falco_rules::enable_rule(lua_State *ls)
 	    ! lua_isstring(ls, -2) ||
 	    ! lua_isnumber(ls, -1))
 	{
-		lua_pushstring(ls, "Invalid arguments passed to enable_rule()");
-		lua_error(ls);
+		throw falco_exception("Invalid arguments passed to enable_rule()\n");
 	}
 
 	falco_rules *rules = (falco_rules *) lua_topointer(ls, -3);

userspace/engine/token_bucket.cpp

@@ -31,30 +31,20 @@ token_bucket::~token_bucket()
 {
 }
 
-void token_bucket::init(double rate, double max_tokens, uint64_t now)
+void token_bucket::init(uint32_t rate, uint32_t max_tokens)
 {
 	m_rate = rate;
 	m_max_tokens = max_tokens;
 	m_tokens = max_tokens;
-
-	if(now == 0)
-	{
-		now = sinsp_utils::get_current_time_ns();
-	}
-
-	m_last_seen = now;
+	m_last_seen = sinsp_utils::get_current_time_ns();
 }
 
 bool token_bucket::claim()
 {
+	// Determine the number of tokens gained. Delta between
+	// last_seen and now, divided by the rate.
 	uint64_t now = sinsp_utils::get_current_time_ns();
-
-	return claim(1, now);
-}
-
-bool token_bucket::claim(double tokens, uint64_t now)
-{
-	double tokens_gained = m_rate * ((now - m_last_seen) / (1000000000.0));
+	uint64_t tokens_gained = (now - m_last_seen) / (m_rate * 1000000000);
 	m_last_seen = now;
 
 	m_tokens += tokens_gained;
@@ -68,24 +58,14 @@ bool token_bucket::claim(double tokens, uint64_t now)
 	}
 
 	//
-	// If m_tokens is < tokens, can't claim.
+	// If tokens is < 1, can't claim.
 	//
-	if(m_tokens < tokens)
+	if(m_tokens < 1)
 	{
 		return false;
 	}
 
-	m_tokens -= tokens;
+	m_tokens--;
 
 	return true;
 }
-
-double token_bucket::get_tokens()
-{
-	return m_tokens;
-}
-
-uint64_t token_bucket::get_last_seen()
-{
-	return m_last_seen;
-}

userspace/engine/token_bucket.h

@@ -31,42 +31,30 @@ public:
 	//
 	// Initialize the token bucket and start accumulating tokens
 	//
-	void init(double rate, double max_tokens, uint64_t now = 0);
+	void init(uint32_t rate, uint32_t max_tokens);
 
 	//
-	// Try to claim tokens tokens from the token bucket, using a
-	// timestamp of now. Returns true if the tokens could be
-	// claimed. Also updates internal metrics.
+	// Returns true if a token can be claimed. Also updates
+	// internal metrics.
 	//
-	bool claim(double tokens, uint64_t now);
-
-	// Simpler version of claim that claims a single token and
-	// uses the current time for now
 	bool claim();
-
-	// Return the current number of tokens available
-	double get_tokens();
-
-	// Return the last time someone tried to claim a token.
-	uint64_t get_last_seen();
-
 private:
 
 	//
 	// The number of tokens generated per second.
 	//
-	double m_rate;
+	uint64_t m_rate;
 
 	//
 	// The maximum number of tokens that can be banked for future
 	// claim()s.
 	//
-	double m_max_tokens;
+	uint64_t m_max_tokens;
 
 	//
 	// The current number of tokens
 	//
-	double m_tokens;
+	uint64_t m_tokens;
 
 	//
 	// The last time claim() was called (or the object was created).

userspace/falco/falco.cpp

@@ -53,7 +53,6 @@ static void signal_callback(int signal)
 static void usage()
 {
     printf(
-	   "falco version " FALCO_VERSION "\n"
 	   "Usage: falco [options]\n\n"
 	   "Options:\n"
 	   " -h, --help                    Print this page\n"
@@ -87,7 +86,6 @@ static void usage()
 	   "                               Marathon url is optional and defaults to Mesos address, port 8080.\n"
 	   "                               The API servers can also be specified via the environment variable\n"
 	   "                               FALCO_MESOS_API.\n"
-	   " -M <num_seconds>              Stop collecting after <num_seconds> reached.\n"
 	   " -o, --option <key>=<val>      Set the value of option <key> to <val>. Overrides values in configuration file.\n"
 	   "                               <key> can be a two-part <key>.<subkey>\n"
 	   " -p <output_format>, --print=<output_format>\n"
@@ -108,7 +106,6 @@ static void usage()
 	   " -t <tag>                      Only run those rules with a tag=<tag>. Can be specified multiple times.\n"
 	   "                               Can not be specified with -T/-D.\n"
 	   " -v                            Verbose output.\n"
-           " --version                     Print version number.\n"
 	   "\n"
     );
 }
@@ -136,14 +133,12 @@ std::list<string> cmdline_options;
 uint64_t do_inspect(falco_engine *engine,
 		    falco_outputs *outputs,
 		    sinsp* inspector,
-		    uint64_t duration_to_tot_ns,
 		    string &stats_filename)
 {
 	uint64_t num_evts = 0;
 	int32_t res;
 	sinsp_evt* ev;
 	StatsFileWriter writer;
-	uint64_t duration_start = 0;
 
 	if (stats_filename != "")
 	{
@@ -187,17 +182,6 @@ uint64_t do_inspect(falco_engine *engine,
 			throw sinsp_exception(inspector->getlasterr().c_str());
 		}
 
-		if (duration_start == 0)
-		{
-			duration_start = ev->get_ts();
-		} else if(duration_to_tot_ns > 0)
-		{
-			if(ev->get_ts() - duration_start >= duration_to_tot_ns)
-			{
-				break;
-			}
-		}
-
 		if(!inspector->is_debug_enabled() &&
 			ev->get_category() & EC_INTERNAL)
 		{
@@ -248,7 +232,6 @@ int falco_init(int argc, char **argv)
 	string* mesos_api = 0;
 	string output_format = "";
 	bool replace_container_info = false;
-	int duration_to_tot = 0;
 
 	// Used for writing trace files
 	int duration_seconds = 0;
@@ -272,7 +255,6 @@ int falco_init(int argc, char **argv)
 		{"option", required_argument, 0, 'o'},
 		{"print", required_argument, 0, 'p' },
 		{"pidfile", required_argument, 0, 'P' },
-		{"version", no_argument, 0, 0 },
 		{"writefile", required_argument, 0, 'w' },
 
 		{0, 0, 0, 0}
@@ -290,7 +272,7 @@ int falco_init(int argc, char **argv)
 		// Parse the args
 		//
 		while((op = getopt_long(argc, argv,
-                                        "hc:AdD:e:k:K:Ll:m:M:o:P:p:r:s:T:t:vw:",
+                                        "hc:AdD:e:k:K:Ll:m:o:P:p:r:s:T:t:vw:",
                                         long_options, &long_index)) != -1)
 		{
 			switch(op)
@@ -331,13 +313,6 @@ int falco_init(int argc, char **argv)
 			case 'm':
 				mesos_api = new string(optarg);
 				break;
-			case 'M':
-				duration_to_tot = atoi(optarg);
-				if(duration_to_tot <= 0)
-				{
-					throw sinsp_exception(string("invalid duration") + optarg);
-				}
-				break;
 			case 'o':
 				cmdline_options.push_back(optarg);
 				break;
@@ -393,13 +368,6 @@ int falco_init(int argc, char **argv)
 
 		}
 
-		if(string(long_options[long_index].name) == "version")
-		{
-			printf("falco version %s\n", FALCO_VERSION);
-			return EXIT_SUCCESS;
-		}
-
-
 		inspector = new sinsp();
 		engine = new falco_engine();
 		engine->set_inspector(inspector);
@@ -684,7 +652,6 @@ int falco_init(int argc, char **argv)
 		num_evts = do_inspect(engine,
 				      outputs,
 				      inspector,
-				      uint64_t(duration_to_tot*ONE_SECOND_IN_NS),
 				      stats_filename);
 
 		duration = ((double)clock()) / CLOCKS_PER_SEC - duration;

userspace/falco/lua/output.lua

@@ -24,6 +24,8 @@ mod.levels = levels
 
 local outputs = {}
 
+local formatters = {}
+
 function mod.stdout(level, msg)
    print (msg)
 end
@@ -82,8 +84,14 @@ function output_event(event, rule, priority, format)
    end
 
    format = "*%evt.time: "..levels[level+1].." "..format
+   if formatters[rule] == nil then
+      formatter = formats.formatter(format)
+      formatters[rule] = formatter
+   else
+      formatter = formatters[rule]
+   end
 
-   msg = formats.format_event(event, rule, levels[level+1], format)
+   msg = formats.format_event(event, rule, levels[level+1], formatter)
 
    for index,o in ipairs(outputs) do
       o.output(level, msg, o.config)
@@ -91,7 +99,11 @@ function output_event(event, rule, priority, format)
 end
 
 function output_cleanup()
-   formats.free_formatters()
+   for rule, formatter in pairs(formatters) do
+      formats.free_formatter(formatter)
+   end
+
+   formatters = {}
 end
 
 function add_output(output_name, config)