Merging upstream version 1.12.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 889 insertions, 331 deletions

diff --git a/collectors/nfacct.plugin/Makefile.in b/collectors/nfacct.plugin/Makefile.in
new file mode 100644
index 000000000..79ae0c62e
--- /dev/null
+++ b/collectors/nfacct.plugin/Makefile.in
@@ -0,0 +1,466 @@
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = collectors/nfacct.plugin
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(dist_noinst_DATA)
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/build/m4/ax_c___atomic.m4 \
+	$(top_srcdir)/build/m4/ax_c__generic.m4 \
+	$(top_srcdir)/build/m4/ax_c_lto.m4 \
+	$(top_srcdir)/build/m4/ax_c_mallinfo.m4 \
+	$(top_srcdir)/build/m4/ax_c_mallopt.m4 \
+	$(top_srcdir)/build/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/build/m4/ax_gcc_func_attribute.m4 \
+	$(top_srcdir)/build/m4/ax_pthread.m4 \
+	$(top_srcdir)/build/m4/jemalloc.m4 \
+	$(top_srcdir)/build/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+DATA = $(dist_noinst_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CUPSCONFIG = @CUPSCONFIG@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IPMIMONITORING_CFLAGS = @IPMIMONITORING_CFLAGS@
+IPMIMONITORING_LIBS = @IPMIMONITORING_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBCAP_CFLAGS = @LIBCAP_CFLAGS@
+LIBCAP_LIBS = @LIBCAP_LIBS@
+LIBMNL_CFLAGS = @LIBMNL_CFLAGS@
+LIBMNL_LIBS = @LIBMNL_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MATH_CFLAGS = @MATH_CFLAGS@
+MATH_LIBS = @MATH_LIBS@
+MKDIR_P = @MKDIR_P@
+NFACCT_CFLAGS = @NFACCT_CFLAGS@
+NFACCT_LIBS = @NFACCT_LIBS@
+OBJEXT = @OBJEXT@
+OPTIONAL_CUPS_CFLAGS = @OPTIONAL_CUPS_CFLAGS@
+OPTIONAL_CUPS_LIBS = @OPTIONAL_CUPS_LIBS@
+OPTIONAL_IPMIMONITORING_CFLAGS = @OPTIONAL_IPMIMONITORING_CFLAGS@
+OPTIONAL_IPMIMONITORING_LIBS = @OPTIONAL_IPMIMONITORING_LIBS@
+OPTIONAL_LIBCAP_CFLAGS = @OPTIONAL_LIBCAP_CFLAGS@
+OPTIONAL_LIBCAP_LIBS = @OPTIONAL_LIBCAP_LIBS@
+OPTIONAL_MATH_CLFAGS = @OPTIONAL_MATH_CLFAGS@
+OPTIONAL_MATH_LIBS = @OPTIONAL_MATH_LIBS@
+OPTIONAL_NFACCT_CLFAGS = @OPTIONAL_NFACCT_CLFAGS@
+OPTIONAL_NFACCT_LIBS = @OPTIONAL_NFACCT_LIBS@
+OPTIONAL_UUID_CLFAGS = @OPTIONAL_UUID_CLFAGS@
+OPTIONAL_UUID_LIBS = @OPTIONAL_UUID_LIBS@
+OPTIONAL_ZLIB_CLFAGS = @OPTIONAL_ZLIB_CLFAGS@
+OPTIONAL_ZLIB_LIBS = @OPTIONAL_ZLIB_LIBS@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_RPM_VERSION = @PACKAGE_RPM_VERSION@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SSE_CANDIDATE = @SSE_CANDIDATE@
+STRIP = @STRIP@
+UUID_CFLAGS = @UUID_CFLAGS@
+UUID_LIBS = @UUID_LIBS@
+VERSION = @VERSION@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+ax_pthread_config = @ax_pthread_config@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_target = @build_target@
+build_vendor = @build_vendor@
+builddir = @builddir@
+cachedir = @cachedir@
+chartsdir = @chartsdir@
+configdir = @configdir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+has_jemalloc = @has_jemalloc@
+has_tcmalloc = @has_tcmalloc@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libconfigdir = @libconfigdir@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+logdir = @logdir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+nodedir = @nodedir@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pluginsdir = @pluginsdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pythondir = @pythondir@
+registrydir = @registrydir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+varlibdir = @varlibdir@
+webdir = @webdir@
+AUTOMAKE_OPTIONS = subdir-objects
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+dist_noinst_DATA = \
+	README.md \
+	$(NULL)
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu collectors/nfacct.plugin/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu collectors/nfacct.plugin/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+	ctags-am distclean distclean-generic distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/collectors/nfacct.plugin/README.md b/collectors/nfacct.plugin/README.md
index 5f1ee2e7c..b60fc6a44 100644
--- a/collectors/nfacct.plugin/README.md
+++ b/collectors/nfacct.plugin/README.md
@@ -1,12 +1,47 @@
 # nfacct.plugin
 
-This plugin that collects NFACCT statistics.
+`nfacct.plugin` collects Netfilter statistics.
 
-It is currently disabled by default, because it requires root access.
-We have to move the code to an external plugin to setuid just the plugin not the whole netdata server.
+## Prerequisites
 
-You can build netdata with it to test it though.
-Just run `./configure` (or `netdata-installer.sh`) with the option `--enable-plugin-nfacct` (and any other options you may need).
-Remember, you have to tell netdata you want it to run as `root` for this plugin to work.
+1. install `libmnl-dev` and `libnetfilter_acct-dev` using the package manager of your system.
+
+2. re-install netdata from source. The installer will detect that the required libraries are now available and will also build netdata.plugin.
+
+Keep in mind that NFACCT requires root access, so the plugin is setuid to root.
+
+## Charts
+
+The plugin provides Netfilter connection tracker statistics and nfacct packet and bandwidth accounting:
+
+Connection tracker:
+1. Connections.
+2. Changes.
+3. Expectations.
+4. Errors.
+5. Searches.
+
+Netfilter accounting:
+1. Packets.
+2. Bandwidth.
+
+## Configuration
+
+If you need to disable NFACCT for netdata, edit /etc/netdata/netdata.conf and set:
+
+```
+[plugins]
+    nfacct = no
+```
+
+## Debugging
+
+You can run the plugin by hand:
+
+```
+sudo /usr/libexec/netdata/plugins.d/nfacct.plugin 1 debug
+```
+
+You will get verbose output on what the plugin does.
 
 [![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fnfacct.plugin%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]()
diff --git a/collectors/nfacct.plugin/plugin_nfacct.c b/collectors/nfacct.plugin/plugin_nfacct.c
index 7d42dd189..b6788e618 100644
--- a/collectors/nfacct.plugin/plugin_nfacct.c
+++ b/collectors/nfacct.plugin/plugin_nfacct.c
@@ -1,11 +1,18 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-#include "plugin_nfacct.h"
-
-#if defined(INTERNAL_PLUGIN_NFACCT)
+#include "../../libnetdata/libnetdata.h"
 
 #define PLUGIN_NFACCT_NAME "nfacct.plugin"
 
+#define NETDATA_CHART_PRIO_NETFILTER_NEW              8701
+#define NETDATA_CHART_PRIO_NETFILTER_CHANGES          8702
+#define NETDATA_CHART_PRIO_NETFILTER_EXPECT           8703
+#define NETDATA_CHART_PRIO_NETFILTER_ERRORS           8705
+#define NETDATA_CHART_PRIO_NETFILTER_SEARCH           8710
+
+#define NETDATA_CHART_PRIO_NETFILTER_PACKETS          8906
+#define NETDATA_CHART_PRIO_NETFILTER_BYTES            8907
+
 #ifdef HAVE_LIBMNL
 #include <libmnl/libmnl.h>
 
@@ -15,6 +22,41 @@ static inline size_t mnl_buffer_size() {
     return (size_t)s;
 }
 
+// callback required by fatal()
+void netdata_cleanup_and_exit(int ret) {
+    exit(ret);
+}
+
+void send_statistics( const char *action, const char *action_result, const char *action_data) {
+    (void) action;
+    (void) action_result;
+    (void) action_data;
+    return;
+}
+
+// callbacks required by popen()
+void signals_block(void) {};
+void signals_unblock(void) {};
+void signals_reset(void) {};
+
+// callback required by eval()
+int health_variable_lookup(const char *variable, uint32_t hash, struct rrdcalc *rc, calculated_number *result) {
+    (void)variable;
+    (void)hash;
+    (void)rc;
+    (void)result;
+    return 0;
+};
+
+// required by get_system_cpus()
+char *netdata_configured_host_prefix = "";
+
+// Variables
+
+static int debug = 0;
+
+static int netdata_update_every = 1;
+
 // ----------------------------------------------------------------------------
 // DO_NFSTAT - collect netfilter connection tracker statistics via netlink
 // example: https://github.com/formorer/pkg-conntrack-tools/blob/master/src/conntrack.c
@@ -103,17 +145,6 @@ static int nfstat_init(int update_every) {
     return 0;
 }
 
-static void nfstat_cleanup() {
-    if(nfstat_root.mnl) {
-        mnl_socket_close(nfstat_root.mnl);
-        nfstat_root.mnl = NULL;
-    }
-
-    freez(nfstat_root.buf);
-    nfstat_root.buf = NULL;
-    nfstat_root.buf_size = 0;
-}
-
 static struct nlmsghdr * nfct_mnl_nlmsghdr_put(char *buf, uint16_t subsys, uint16_t type, uint8_t family, uint32_t seq) {
     struct nlmsghdr *nlh;
     struct nfgenmsg *nfh;
@@ -292,191 +323,211 @@ static int nfstat_collect() {
 }
 
 static void nfstat_send_metrics() {
-
-    {
-        static RRDSET *st_new = NULL;
-        static RRDDIM *rd_new = NULL, *rd_ignore = NULL, *rd_invalid = NULL;
-
-        if(!st_new) {
-            st_new = rrdset_create_localhost(
-                    RRD_TYPE_NET_STAT_NETFILTER
-                    , RRD_TYPE_NET_STAT_CONNTRACK "_new"
-                    , NULL
-                    , RRD_TYPE_NET_STAT_CONNTRACK
-                    , NULL
-                    , "Connection Tracker New Connections"
-                    , "connections/s"
-                    , PLUGIN_NFACCT_NAME
-                    , NULL
-                    , NETDATA_CHART_PRIO_NETFILTER_NEW
-                    , nfstat_root.update_every
-                    , RRDSET_TYPE_LINE
-            );
-
-            rd_new     = rrddim_add(st_new, nfstat_root.attr2name[CTA_STATS_NEW], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_ignore  = rrddim_add(st_new, nfstat_root.attr2name[CTA_STATS_IGNORE], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_invalid = rrddim_add(st_new, nfstat_root.attr2name[CTA_STATS_INVALID], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-        }
-        else
-            rrdset_next(st_new);
-
-        rrddim_set_by_pointer(st_new, rd_new, (collected_number) nfstat_root.metrics[CTA_STATS_NEW]);
-        rrddim_set_by_pointer(st_new, rd_ignore, (collected_number) nfstat_root.metrics[CTA_STATS_IGNORE]);
-        rrddim_set_by_pointer(st_new, rd_invalid, (collected_number) nfstat_root.metrics[CTA_STATS_INVALID]);
-
-        rrdset_done(st_new);
-    }
+    static int new_chart_generated = 0, changes_chart_generated = 0, search_chart_generated = 0, errors_chart_generated = 0, expect_chart_generated = 0;
+
+    if(!new_chart_generated) {
+        new_chart_generated = 1;
+
+        printf("CHART %s.%s '' 'Connection Tracker New Connections' 'connections/s' %s '' line %d %d %s\n"
+               , RRD_TYPE_NET_STAT_NETFILTER
+               , RRD_TYPE_NET_STAT_CONNTRACK "_new"
+               , RRD_TYPE_NET_STAT_CONNTRACK
+               , NETDATA_CHART_PRIO_NETFILTER_NEW
+               , nfstat_root.update_every
+               , PLUGIN_NFACCT_NAME
+        );
+        printf("DIMENSION %s '' incremental 1 1\n", nfstat_root.attr2name[CTA_STATS_NEW]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_IGNORE]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_INVALID]);
+    }
+
+    printf(
+           "BEGIN %s.%s\n"
+           , RRD_TYPE_NET_STAT_NETFILTER
+           , RRD_TYPE_NET_STAT_CONNTRACK "_new"
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_NEW]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_NEW]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_IGNORE]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_IGNORE]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_INVALID]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_INVALID]
+    );
+    printf("END\n");
 
     // ----------------------------------------------------------------
 
-    {
-        static RRDSET *st_changes = NULL;
-        static RRDDIM *rd_inserted = NULL, *rd_deleted = NULL, *rd_delete_list = NULL;
-
-        if(!st_changes) {
-            st_changes = rrdset_create_localhost(
-                    RRD_TYPE_NET_STAT_NETFILTER
-                    , RRD_TYPE_NET_STAT_CONNTRACK "_changes"
-                    , NULL
-                    , RRD_TYPE_NET_STAT_CONNTRACK
-                    , NULL
-                    , "Connection Tracker Changes"
-                    , "changes/s"
-                    , PLUGIN_NFACCT_NAME
-                    , NULL
-                    , NETDATA_CHART_PRIO_NETFILTER_CHANGES
-                    , nfstat_root.update_every
-                    , RRDSET_TYPE_LINE
-            );
-            rrdset_flag_set(st_changes, RRDSET_FLAG_DETAIL);
-
-            rd_inserted = rrddim_add(st_changes, nfstat_root.attr2name[CTA_STATS_INSERT], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_deleted = rrddim_add(st_changes, nfstat_root.attr2name[CTA_STATS_DELETE], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_delete_list = rrddim_add(st_changes, nfstat_root.attr2name[CTA_STATS_DELETE_LIST], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-        }
-        else
-            rrdset_next(st_changes);
-
-        rrddim_set_by_pointer(st_changes, rd_inserted, (collected_number) nfstat_root.metrics[CTA_STATS_INSERT]);
-        rrddim_set_by_pointer(st_changes, rd_deleted, (collected_number) nfstat_root.metrics[CTA_STATS_DELETE]);
-        rrddim_set_by_pointer(st_changes, rd_delete_list, (collected_number) nfstat_root.metrics[CTA_STATS_DELETE_LIST]);
+    if(!changes_chart_generated) {
+        changes_chart_generated = 1;
 
-        rrdset_done(st_changes);
-    }
+        printf("CHART %s.%s '' 'Connection Tracker Changes' 'changes/s' %s '' line %d %d detail %s\n"
+               , RRD_TYPE_NET_STAT_NETFILTER
+               , RRD_TYPE_NET_STAT_CONNTRACK "_changes"
+               , RRD_TYPE_NET_STAT_CONNTRACK
+               , NETDATA_CHART_PRIO_NETFILTER_CHANGES
+               , nfstat_root.update_every
+               , PLUGIN_NFACCT_NAME
+        );
+        printf("DIMENSION %s '' incremental  1 1\n", nfstat_root.attr2name[CTA_STATS_INSERT]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_DELETE]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_DELETE_LIST]);
+    }
+
+    printf(
+           "BEGIN %s.%s\n"
+           , RRD_TYPE_NET_STAT_NETFILTER
+           , RRD_TYPE_NET_STAT_CONNTRACK "_changes"
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_INSERT]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_INSERT]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_DELETE]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_DELETE]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_DELETE_LIST]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_DELETE_LIST]
+    );
+    printf("END\n");
 
     // ----------------------------------------------------------------
 
-    {
-        static RRDSET *st_search = NULL;
-        static RRDDIM *rd_searched = NULL, *rd_restarted = NULL, *rd_found = NULL;
-
-        if(!st_search) {
-            st_search = rrdset_create_localhost(
-                    RRD_TYPE_NET_STAT_NETFILTER
-                    , RRD_TYPE_NET_STAT_CONNTRACK "_search"
-                    , NULL
-                    , RRD_TYPE_NET_STAT_CONNTRACK
-                    , NULL
-                    , "Connection Tracker Searches"
-                    , "searches/s"
-                    , PLUGIN_NFACCT_NAME
-                    , NULL
-                    , NETDATA_CHART_PRIO_NETFILTER_SEARCH
-                    , nfstat_root.update_every
-                    , RRDSET_TYPE_LINE
-            );
-            rrdset_flag_set(st_search, RRDSET_FLAG_DETAIL);
-
-            rd_searched = rrddim_add(st_search, nfstat_root.attr2name[CTA_STATS_SEARCHED], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_restarted = rrddim_add(st_search, nfstat_root.attr2name[CTA_STATS_SEARCH_RESTART], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_found = rrddim_add(st_search, nfstat_root.attr2name[CTA_STATS_FOUND], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-        }
-        else
-            rrdset_next(st_search);
+    if(!search_chart_generated) {
+        search_chart_generated = 1;
 
-        rrddim_set_by_pointer(st_search, rd_searched, (collected_number) nfstat_root.metrics[CTA_STATS_SEARCHED]);
-        rrddim_set_by_pointer(st_search, rd_restarted, (collected_number) nfstat_root.metrics[CTA_STATS_SEARCH_RESTART]);
-        rrddim_set_by_pointer(st_search, rd_found, (collected_number) nfstat_root.metrics[CTA_STATS_FOUND]);
-
-        rrdset_done(st_search);
-    }
+        printf("CHART %s.%s '' 'Connection Tracker Searches' 'searches/s' %s '' line %d %d detail %s\n"
+               , RRD_TYPE_NET_STAT_NETFILTER
+               , RRD_TYPE_NET_STAT_CONNTRACK "_search"
+               , RRD_TYPE_NET_STAT_CONNTRACK
+               , NETDATA_CHART_PRIO_NETFILTER_SEARCH
+               , nfstat_root.update_every
+               , PLUGIN_NFACCT_NAME
+        );
+        printf("DIMENSION %s '' incremental  1 1\n", nfstat_root.attr2name[CTA_STATS_SEARCHED]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_SEARCH_RESTART]);
+        printf("DIMENSION %s '' incremental  1 1\n", nfstat_root.attr2name[CTA_STATS_FOUND]);
+    }
+
+    printf(
+           "BEGIN %s.%s\n"
+           , RRD_TYPE_NET_STAT_NETFILTER
+           , RRD_TYPE_NET_STAT_CONNTRACK "_search"
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_SEARCHED]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_SEARCHED]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_SEARCH_RESTART]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_SEARCH_RESTART]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_FOUND]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_FOUND]
+    );
+    printf("END\n");
 
     // ----------------------------------------------------------------
 
-    {
-        static RRDSET *st_errors = NULL;
-        static RRDDIM *rd_error = NULL, *rd_insert_failed = NULL, *rd_drop = NULL, *rd_early_drop = NULL;
-
-        if(!st_errors) {
-            st_errors = rrdset_create_localhost(
-                    RRD_TYPE_NET_STAT_NETFILTER
-                    , RRD_TYPE_NET_STAT_CONNTRACK "_errors"
-                    , NULL
-                    , RRD_TYPE_NET_STAT_CONNTRACK
-                    , NULL
-                    , "Connection Tracker Errors"
-                    , "events/s"
-                    , PLUGIN_NFACCT_NAME
-                    , NULL
-                    , NETDATA_CHART_PRIO_NETFILTER_ERRORS
-                    , nfstat_root.update_every
-                    , RRDSET_TYPE_LINE
-            );
-            rrdset_flag_set(st_errors, RRDSET_FLAG_DETAIL);
-
-            rd_error = rrddim_add(st_errors, nfstat_root.attr2name[CTA_STATS_ERROR], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_insert_failed = rrddim_add(st_errors, nfstat_root.attr2name[CTA_STATS_INSERT_FAILED], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_drop = rrddim_add(st_errors, nfstat_root.attr2name[CTA_STATS_DROP], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_early_drop = rrddim_add(st_errors, nfstat_root.attr2name[CTA_STATS_EARLY_DROP], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-        }
-        else
-            rrdset_next(st_errors);
+    if(!errors_chart_generated) {
+        errors_chart_generated = 1;
 
-        rrddim_set_by_pointer(st_errors, rd_error, (collected_number) nfstat_root.metrics[CTA_STATS_ERROR]);
-        rrddim_set_by_pointer(st_errors, rd_insert_failed, (collected_number) nfstat_root.metrics[CTA_STATS_INSERT_FAILED]);
-        rrddim_set_by_pointer(st_errors, rd_drop, (collected_number) nfstat_root.metrics[CTA_STATS_DROP]);
-        rrddim_set_by_pointer(st_errors, rd_early_drop, (collected_number) nfstat_root.metrics[CTA_STATS_EARLY_DROP]);
-
-        rrdset_done(st_errors);
-    }
+        printf("CHART %s.%s '' 'Connection Tracker Errors' 'events/s' %s '' line %d %d detail %s\n"
+               , RRD_TYPE_NET_STAT_NETFILTER
+               , RRD_TYPE_NET_STAT_CONNTRACK "_errors"
+               , RRD_TYPE_NET_STAT_CONNTRACK
+               , NETDATA_CHART_PRIO_NETFILTER_ERRORS
+               , nfstat_root.update_every
+               , PLUGIN_NFACCT_NAME
+        );
+        printf("DIMENSION %s '' incremental  1 1\n", nfstat_root.attr2name[CTA_STATS_ERROR]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_INSERT_FAILED]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_DROP]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_EARLY_DROP]);
+    }
+
+    printf(
+           "BEGIN %s.%s\n"
+           , RRD_TYPE_NET_STAT_NETFILTER
+           , RRD_TYPE_NET_STAT_CONNTRACK "_errors"
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_ERROR]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_ERROR]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_INSERT_FAILED]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_INSERT_FAILED]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_DROP]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_DROP]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_EARLY_DROP]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_EARLY_DROP]
+    );
+    printf("END\n");
 
     // ----------------------------------------------------------------
 
-    {
-        static RRDSET *st_expect = NULL;
-        static RRDDIM *rd_new = NULL, *rd_created = NULL, *rd_deleted = NULL;
-
-        if(!st_expect) {
-            st_expect = rrdset_create_localhost(
-                    RRD_TYPE_NET_STAT_NETFILTER
-                    , RRD_TYPE_NET_STAT_CONNTRACK "_expect"
-                    , NULL
-                    , RRD_TYPE_NET_STAT_CONNTRACK
-                    , NULL
-                    , "Connection Tracker Expectations"
-                    , "expectations/s"
-                    , PLUGIN_NFACCT_NAME
-                    , NULL
-                    , NETDATA_CHART_PRIO_NETFILTER_EXPECT
-                    , nfstat_root.update_every
-                    , RRDSET_TYPE_LINE
-            );
-            rrdset_flag_set(st_expect, RRDSET_FLAG_DETAIL);
-
-            rd_created = rrddim_add(st_expect, nfstat_root.attr2name_exp[CTA_STATS_EXP_CREATE], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_deleted = rrddim_add(st_expect, nfstat_root.attr2name_exp[CTA_STATS_EXP_DELETE], NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
-            rd_new = rrddim_add(st_expect, nfstat_root.attr2name_exp[CTA_STATS_EXP_NEW], NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
-        }
-        else
-            rrdset_next(st_expect);
-
-        rrddim_set_by_pointer(st_expect, rd_created, (collected_number) nfstat_root.metrics_exp[CTA_STATS_EXP_CREATE]);
-        rrddim_set_by_pointer(st_expect, rd_deleted, (collected_number) nfstat_root.metrics_exp[CTA_STATS_EXP_DELETE]);
-        rrddim_set_by_pointer(st_expect, rd_new, (collected_number) nfstat_root.metrics_exp[CTA_STATS_EXP_NEW]);
-
-        rrdset_done(st_expect);
-    }
+    if(!expect_chart_generated) {
+        expect_chart_generated = 1;
 
+        printf("CHART %s.%s '' 'Connection Tracker Expectations' 'expectations/s' %s '' line %d %d detail %s\n"
+               , RRD_TYPE_NET_STAT_NETFILTER
+               , RRD_TYPE_NET_STAT_CONNTRACK "_expect"
+               , RRD_TYPE_NET_STAT_CONNTRACK
+               , NETDATA_CHART_PRIO_NETFILTER_EXPECT
+               , nfstat_root.update_every
+               , PLUGIN_NFACCT_NAME
+        );
+        printf("DIMENSION %s '' incremental  1 1\n", nfstat_root.attr2name[CTA_STATS_EXP_CREATE]);
+        printf("DIMENSION %s '' incremental -1 1\n", nfstat_root.attr2name[CTA_STATS_EXP_DELETE]);
+        printf("DIMENSION %s '' incremental  1 1\n", nfstat_root.attr2name[CTA_STATS_EXP_NEW]);
+    }
+
+    printf(
+           "BEGIN %s.%s\n"
+           , RRD_TYPE_NET_STAT_NETFILTER
+           , RRD_TYPE_NET_STAT_CONNTRACK "_expect"
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_EXP_CREATE]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_EXP_CREATE]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_EXP_DELETE]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_EXP_DELETE]
+    );
+    printf(
+           "SET %s = %lld\n"
+           , nfstat_root.attr2name[CTA_STATS_EXP_NEW]
+           , (collected_number) nfstat_root.metrics[CTA_STATS_EXP_NEW]
+    );
+    printf("END\n");
 }
 
 #endif // HAVE_LINUX_NETFILTER_NFNETLINK_CONNTRACK_H
@@ -497,8 +548,8 @@ struct nfacct_data {
     uint64_t pkts;
     uint64_t bytes;
 
-    RRDDIM *rd_bytes;
-    RRDDIM *rd_packets;
+    int packets_dimension_added;
+    int bytes_dimension_added;
 
     int updated;
 
@@ -579,24 +630,6 @@ static int nfacct_init(int update_every) {
     return 0;
 }
 
-static void nfacct_cleanup() {
-    if(nfacct_root.mnl) {
-        mnl_socket_close(nfacct_root.mnl);
-        nfacct_root.mnl = NULL;
-    }
-
-    if(nfacct_root.nfacct_buffer) {
-        nfacct_free(nfacct_root.nfacct_buffer);
-        nfacct_root.nfacct_buffer = NULL;
-    }
-
-    freez(nfacct_root.buf);
-    nfacct_root.buf = NULL;
-    nfacct_root.buf_size = 0;
-
-    // TODO: cleanup the metrics linked list
-}
-
 static int nfacct_callback(const struct nlmsghdr *nlh, void *data) {
     (void)data;
 
@@ -661,162 +694,216 @@ static int nfacct_collect() {
 }
 
 static void nfacct_send_metrics() {
-    static RRDSET *st_bytes = NULL, *st_packets = NULL;
+    static int bytes_chart_generated = 0, packets_chart_generated = 0;
 
     if(!nfacct_root.nfacct_metrics) return;
     struct nfacct_data *d;
 
-    if(!st_packets) {
-        st_packets = rrdset_create_localhost(
-                "netfilter"
-                , "nfacct_packets"
-                , NULL
-                , "nfacct"
-                , NULL
-                , "Netfilter Accounting Packets"
-                , "packets/s"
-                , PLUGIN_NFACCT_NAME
-                , NULL
-                , NETDATA_CHART_PRIO_NETFILTER_PACKETS
-                , nfacct_root.update_every
-                , RRDSET_TYPE_STACKED
+    if(!packets_chart_generated) {
+        packets_chart_generated = 1;
+        printf("CHART netfilter.nfacct_packets '' 'Netfilter Accounting Packets' 'packets/s' 'nfacct' '' stacked %d %d %s\n"
+               , NETDATA_CHART_PRIO_NETFILTER_PACKETS
+               , nfacct_root.update_every
+               , PLUGIN_NFACCT_NAME
         );
     }
-    else rrdset_next(st_packets);
 
     for(d = nfacct_root.nfacct_metrics; d ; d = d->next) {
         if(likely(d->updated)) {
-            if(unlikely(!d->rd_packets))
-                d->rd_packets = rrddim_add(
-                        st_packets
-                        , d->name
-                        , NULL
-                        , 1
-                        , nfacct_root.update_every
-                        , RRD_ALGORITHM_INCREMENTAL
-                );
-
-            rrddim_set_by_pointer(
-                    st_packets
-                    , d->rd_packets
+            if(unlikely(!d->packets_dimension_added)) {
+                d->packets_dimension_added = 1;
+                printf("CHART netfilter.nfacct_packets '' 'Netfilter Accounting Packets' 'packets/s'\n");
+                printf("DIMENSION %s '' incremental 1 %d\n", d->name, nfacct_root.update_every);
+            }
+            printf(
+                    "BEGIN netfilter.nfacct_packets\n"
+                    "SET %s = %lld\n"
+                    "END\n"
+                    , d->name
                     , (collected_number)d->pkts
             );
         }
     }
 
-    rrdset_done(st_packets);
-
     // ----------------------------------------------------------------
 
-    st_bytes = rrdset_find_bytype_localhost("netfilter", "nfacct_bytes");
-    if(!st_bytes) {
-        st_bytes = rrdset_create_localhost(
-                "netfilter"
-                , "nfacct_bytes"
-                , NULL
-                , "nfacct"
-                , NULL
-                , "Netfilter Accounting Bandwidth"
-                , "kilobytes/s"
-                , PLUGIN_NFACCT_NAME
-                , NULL
-                , NETDATA_CHART_PRIO_NETFILTER_BYTES
-                , nfacct_root.update_every
-                , RRDSET_TYPE_STACKED
+    if(!bytes_chart_generated) {
+        bytes_chart_generated = 1;
+        printf("CHART netfilter.nfacct_bytes '' 'Netfilter Accounting Bandwidth' 'kilobytes/s' 'nfacct' '' stacked %d %d %s\n"
+               , NETDATA_CHART_PRIO_NETFILTER_BYTES
+               , nfacct_root.update_every
+               , PLUGIN_NFACCT_NAME
         );
     }
-    else rrdset_next(st_bytes);
 
     for(d = nfacct_root.nfacct_metrics; d ; d = d->next) {
         if(likely(d->updated)) {
-            if(unlikely(!d->rd_bytes))
-                d->rd_bytes = rrddim_add(
-                        st_bytes
-                        , d->name
-                        , NULL
-                        , 1
-                        , 1000 * nfacct_root.update_every
-                        , RRD_ALGORITHM_INCREMENTAL
-                );
-
-            rrddim_set_by_pointer(
-                    st_bytes
-                    , d->rd_bytes
-                    , (collected_number)d->bytes
+            if(unlikely(!d->bytes_dimension_added)) {
+                d->bytes_dimension_added = 1;
+                printf("CHART netfilter.nfacct_bytes '' 'Netfilter Accounting Bandwidth' 'kilobytes/s'\n");
+                printf("DIMENSION %s '' incremental 1 %d\n", d->name, 1000 * nfacct_root.update_every);
+            }
+            printf(
+                   "BEGIN netfilter.nfacct_bytes\n"
+                   "SET %s = %lld\n"
+                   "END\n"
+                   , d->name
+                   , (collected_number)d->bytes
             );
         }
     }
-
-    rrdset_done(st_bytes);
 }
 
 #endif // HAVE_LIBNETFILTER_ACCT
-#endif // HAVE_LIBMNL
 
-// ----------------------------------------------------------------------------
+int main(int argc, char **argv) {
 
-static void nfacct_main_cleanup(void *ptr) {
-    struct netdata_static_thread *static_thread = (struct netdata_static_thread *)ptr;
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITING;
-    info("cleaning up...");
+    // ------------------------------------------------------------------------
+    // initialization of netdata plugin
 
-#ifdef DO_NFACCT
-    nfacct_cleanup();
-#endif
+    program_name = "nfacct.plugin";
 
-#ifdef DO_NFSTAT
-    nfstat_cleanup();
-#endif
+    // disable syslog
+    error_log_syslog = 0;
 
-    static_thread->enabled = NETDATA_MAIN_THREAD_EXITED;
-}
+    // set errors flood protection to 100 logs per hour
+    error_log_errors_per_period = 100;
+    error_log_throttle_period = 3600;
+
+    // ------------------------------------------------------------------------
+    // parse command line parameters
+
+    int i, freq = 0;
+    for(i = 1; i < argc ; i++) {
+        if(isdigit(*argv[i]) && !freq) {
+            int n = str2i(argv[i]);
+            if(n > 0 && n < 86400) {
+                freq = n;
+                continue;
+            }
+        }
+        else if(strcmp("version", argv[i]) == 0 || strcmp("-version", argv[i]) == 0 || strcmp("--version", argv[i]) == 0 || strcmp("-v", argv[i]) == 0 || strcmp("-V", argv[i]) == 0) {
+            printf("nfacct.plugin %s\n", VERSION);
+            exit(0);
+        }
+        else if(strcmp("debug", argv[i]) == 0) {
+            debug = 1;
+            continue;
+        }
+        else if(strcmp("-h", argv[i]) == 0 || strcmp("--help", argv[i]) == 0) {
+            fprintf(stderr,
+                    "\n"
+                    " netdata nfacct.plugin %s\n"
+                    " Copyright (C) 2015-2017 Costa Tsaousis <costa@tsaousis.gr>\n"
+                    " Released under GNU General Public License v3 or later.\n"
+                    " All rights reserved.\n"
+                    "\n"
+                    " This program is a data collector plugin for netdata.\n"
+                    "\n"
+                    " Available command line options:\n"
+                    "\n"
+                    "  COLLECTION_FREQUENCY    data collection frequency in seconds\n"
+                    "                          minimum: %d\n"
+                    "\n"
+                    "  debug                   enable verbose output\n"
+                    "                          default: disabled\n"
+                    "\n"
+                    "  -v\n"
+                    "  -V\n"
+                    "  --version               print version and exit\n"
+                    "\n"
+                    "  -h\n"
+                    "  --help                  print this message and exit\n"
+                    "\n"
+                    " For more information:\n"
+                    " https://github.com/netdata/netdata/tree/master/collectors/nfacct.plugin\n"
+                    "\n"
+                    , VERSION
+                    , netdata_update_every
+            );
+            exit(1);
+        }
 
-void *nfacct_main(void *ptr) {
-    netdata_thread_cleanup_push(nfacct_main_cleanup, ptr);
+        error("nfacct.plugin: ignoring parameter '%s'", argv[i]);
+    }
 
-    int update_every = (int)config_get_number("plugin:netfilter", "update every", localhost->rrd_update_every);
-    if(update_every < localhost->rrd_update_every)
-        update_every = localhost->rrd_update_every;
+    errno = 0;
+
+    if(freq >= netdata_update_every)
+        netdata_update_every = freq;
+    else if(freq)
+        error("update frequency %d seconds is too small for NFACCT. Using %d.", freq, netdata_update_every);
 
 #ifdef DO_NFACCT
-    int nfacct = !nfacct_init(update_every);
+    if(debug) fprintf(stderr, "freeipmi.plugin: calling nfacct_init()\n");
+    int nfacct = !nfacct_init(netdata_update_every);
 #endif
 
 #ifdef DO_NFSTAT
-    int nfstat = !nfstat_init(update_every);
+    if(debug) fprintf(stderr, "freeipmi.plugin: calling nfstat_init()\n");
+    int nfstat = !nfstat_init(netdata_update_every);
 #endif
 
     // ------------------------------------------------------------------------
+    // the main loop
+
+    if(debug) fprintf(stderr, "nfacct.plugin: starting data collection\n");
+
+    time_t started_t = now_monotonic_sec();
+
+    size_t iteration;
+    usec_t step = netdata_update_every * USEC_PER_SEC;
 
-    usec_t step = update_every * USEC_PER_SEC;
     heartbeat_t hb;
     heartbeat_init(&hb);
-    for(;;) {
-        heartbeat_next(&hb, step);
+    for(iteration = 0; 1; iteration++) {
+        usec_t dt = heartbeat_next(&hb, step);
 
         if(unlikely(netdata_exit)) break;
 
+        if(debug && iteration)
+            fprintf(stderr, "nfacct.plugin: iteration %zu, dt %llu usec\n"
+                    , iteration
+                    , dt
+            );
+
 #ifdef DO_NFACCT
         if(likely(nfacct)) {
+            if(debug) fprintf(stderr, "nfacct.plugin: calling nfacct_collect()\n");
             nfacct = !nfacct_collect();
 
-            if(likely(nfacct))
+            if(likely(nfacct)) {
+                if(debug) fprintf(stderr, "nfacct.plugin: calling nfacct_send_metrics()\n");
                 nfacct_send_metrics();
+            }
         }
 #endif
 
 #ifdef DO_NFSTAT
         if(likely(nfstat)) {
+            if(debug) fprintf(stderr, "nfacct.plugin: calling nfstat_collect()\n");
             nfstat = !nfstat_collect();
 
-            if(likely(nfstat))
+            if(likely(nfstat)) {
+                if(debug) fprintf(stderr, "nfacct.plugin: calling nfstat_send_metrics()\n");
                 nfstat_send_metrics();
+            }
         }
 #endif
+
+        fflush(stdout);
+
+        // restart check (14400 seconds)
+        if(now_monotonic_sec() - started_t > 14400) break;
     }
 
-    netdata_thread_cleanup_pop(1);
-    return NULL;
+    info("NFACCT process exiting");
+}
+
+#else // !HAVE_LIBMNL
+
+int main(int argc, char **argv) {
+    fatal("nfacct.plugin is not compiled.");
 }
 
-#endif // INTERNAL_PLUGIN_NFACCT
+#endif // !HAVE_LIBMNL
diff --git a/collectors/nfacct.plugin/plugin_nfacct.h b/collectors/nfacct.plugin/plugin_nfacct.h
deleted file mode 100644
index 4311ccecf..000000000
--- a/collectors/nfacct.plugin/plugin_nfacct.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#ifndef NETDATA_NFACCT_H
-#define NETDATA_NFACCT_H 1
-
-#include "../../daemon/common.h"
-
-#if defined(INTERNAL_PLUGIN_NFACCT)
-
-#define NETDATA_PLUGIN_HOOK_LINUX_NFACCT \
-    { \
-        .name = "PLUGIN[nfacct]", \
-        .config_section = CONFIG_SECTION_PLUGINS, \
-        .config_name = "nfacct", \
-        .enabled = 1, \
-        .thread = NULL, \
-        .init_routine = NULL, \
-        .start_routine = nfacct_main \
-    },
-
-extern void *nfacct_main(void *ptr);
-
-#else // !defined(INTERNAL_PLUGIN_NFACCT)
-
-#define NETDATA_PLUGIN_HOOK_LINUX_NFACCT
-
-#endif // defined(INTERNAL_PLUGIN_NFACCT)
-
-#endif /* NETDATA_NFACCT_H */
-