Merging upstream version 1.11.0+dfsg.

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

15 files changed, 1390 insertions, 129 deletions

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
new file mode 100644
index 000000000..bdd02774c
--- /dev/null
+++ b/daemon/Makefile.am
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+AUTOMAKE_OPTIONS = subdir-objects
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+	README.md \
+	$(NULL)
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
new file mode 100644
index 000000000..8c7ad21a5
--- /dev/null
+++ b/daemon/Makefile.in
@@ -0,0 +1,464 @@
+# 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 = daemon
+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@
+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_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_RELEASE = @PACKAGE_RPM_RELEASE@
+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 daemon/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu daemon/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/daemon/README.md b/daemon/README.md
new file mode 100644
index 000000000..2a5ebfa0c
--- /dev/null
+++ b/daemon/README.md
@@ -0,0 +1,445 @@
+# Netdata daemon
+
+
+
+## Command line options
+
+Normally you don't need to supply any command line arguments to netdata.
+
+If you do though, they override the configuration equivalent options.
+
+To get a list of all command line parameters supported, run:
+
+```sh
+netdata -h
+```
+
+The program will print the supported command line parameters.
+
+The command line options of the netdata 1.10.0 version are the following:
+```
+
+ ^
+ |.-.   .-.   .-.   .-.   .  netdata                                         
+ |   '-'   '-'   '-'   '-'   real-time performance monitoring, done right!   
+ +----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+--->
+
+ Copyright (C) 2016-2017, Costa Tsaousis <costa@tsaousis.gr>
+ Released under GNU General Public License v3 or later.
+ All rights reserved.
+
+ Home Page  : https://my-netdata.io
+ Source Code: https://github.com/netdata/netdata
+ Wiki / Docs: https://github.com/netdata/netdata/wiki
+ Support    : https://github.com/netdata/netdata/issues
+ License    : https://github.com/netdata/netdata/blob/master/LICENSE.md
+
+ Twitter    : https://twitter.com/linuxnetdata
+ Facebook   : https://www.facebook.com/linuxnetdata/
+
+
+ SYNOPSIS: netdata [options]
+
+ Options:
+
+  -c filename              Configuration file to load.
+                           Default: /etc/netdata/netdata.conf
+
+  -D                       Do not fork. Run in the foreground.
+                           Default: run in the background
+
+  -h                       Display this help message.
+
+  -P filename              File to save a pid while running.
+                           Default: do not save pid to a file
+
+  -i IP                    The IP address to listen to.
+                           Default: all IP addresses IPv4 and IPv6
+
+  -p port                  API/Web port to use.
+                           Default: 19999
+
+  -s path                  Prefix for /proc and /sys (for containers).
+                           Default: no prefix
+
+  -t seconds               The internal clock of netdata.
+                           Default: 1
+
+  -u username              Run as user.
+                           Default: netdata
+
+  -v                       Print netdata version and exit.
+
+  -V                       Print netdata version and exit.
+
+  -W options               See Advanced options below.
+
+
+ Advanced options:
+
+  -W stacksize=N           Set the stacksize (in bytes).
+
+  -W debug_flags=N         Set runtime tracing to debug.log.
+
+  -W unittest              Run internal unittests and exit.
+
+  -W set section option value
+                           set netdata.conf option from the command line.
+
+  -W simple-pattern pattern string
+                           Check if string matches pattern and exit.
+
+
+ Signals netdata handles:
+
+  - HUP                    Close and reopen log files.
+  - USR1                   Save internal DB to disk.
+  - USR2                   Reload health configuration.
+```
+
+## Log files
+
+netdata uses 3 log files:
+
+1. `error.log`
+2. `access.log`
+3. `debug.log`
+
+Any of them can be disabled by setting it to `/dev/null` or `none` in `netdata.conf`.
+By default `error.log` and `access.log` are enabled. `debug.log` is only enabled if
+debugging/tracing is also enabled (netdata needs to be compiled with debugging enabled).
+
+Log files are stored in `/var/log/netdata/` by default.
+
+#### error.log
+
+The `error.log` is the `stderr` of the netdata daemon and all external plugins run by netdata.
+
+So if any process, in the netdata process tree, writes anything to its standard error,
+it will appear in `error.log`.
+
+For most netdata programs (including standard external plugins shipped by netdata), the
+following lines may appear:
+
+tag|description
+:---:|:----
+`INFO`|Something important the user should know.
+`ERROR`|Something that might disable a part of netdata.<br/>The log line includes `errno` (if it is not zero).
+`FATAL`|Something prevented a program from running.<br/>The log line includes `errno` (if it is not zero) and the program exited.
+
+So, when auto-detection of data collection fail, `ERROR` lines are logged and the relevant modules
+are disabled, but the program continues to run.
+
+When a netdata program cannot run at all, a `FATAL` line is logged.
+
+#### access.log
+
+The `access.log` logs web requests. The format is:
+
+```txt
+DATE: ID: (sent/all = SENT_BYTES/ALL_BYTES bytes PERCENT_COMPRESSION%, prep/sent/total PREP_TIME/SENT_TIME/TOTAL_TIME ms): ACTION CODE URL
+```
+
+where:
+
+ - `ID` is the client ID. Client IDs are auto-incremented every time a client connects to netdata.
+ - `SENT_BYTES` is the number of bytes sent to the client, without the HTTP response header.
+ - `ALL_BYTES` is the number of bytes of the response, before compression.
+ - `PERCENT_COMPRESSION` is the percentage of traffic saved due to compression.
+ - `PREP_TIME` is the time in milliseconds needed to prepared the response.
+ - `SENT_TIME` is the time in milliseconds needed to sent the response to the client.
+ - `TOTAL_TIME` is the total time the request was inside netdata (from the first byte of the request to the last byte of the response).
+ - `ACTION` can be `filecopy`, `options` (used in CORS), `data` (API call).
+
+
+#### debug.log
+
+See [debugging](#debugging).
+
+
+## OOM Score
+
+netdata runs with `OOMScore = 1000`. This means netdata will be the first to be killed when your
+server runs out of memory.
+
+You can set netdata OOMScore in `netdata.conf`, like this:
+
+```
+[global]
+    OOM score = 1000
+```
+
+netdata logs its OOM score when it starts:
+
+```sh
+# grep OOM /var/log/netdata/error.log
+2017-10-15 03:47:31: netdata INFO : Adjusted my Out-Of-Memory (OOM) score from 0 to 1000.
+```
+
+#### OOM score and systemd
+
+netdata will not be able to lower its OOM Score below zero, when it is started as the `netdata`
+user (systemd case).
+
+To allow netdata control its OOM Score in such cases, you will need to edit
+`netdata.service` and set:
+
+```
+[Service]
+# The minimum netdata Out-Of-Memory (OOM) score.
+# netdata (via [global].OOM score in netdata.conf) can only increase the value set here.
+# To decrease it, set the minimum here and set the same or a higher value in netdata.conf.
+# Valid values: -1000 (never kill netdata) to 1000 (always kill netdata).
+OOMScoreAdjust=-1000
+```
+
+Run `systemctl daemon-reload` to reload these changes.
+
+The above, sets and OOMScore for netdata to `-1000`, so that netdata can increase it via
+`netdata.conf`.
+
+If you want to control it entirely via systemd, you can set in `netdata.conf`:
+
+```
+[global]
+    OOM score = keep
+```
+
+Using the above, whatever OOM Score you have set at `netdata.service` will be maintained by netdata.
+
+
+## netdata process scheduling policy
+
+By default netdata runs with the `idle` process scheduling policy, so that it uses CPU resources, only when there is idle CPU to spare. On very busy servers (or weak servers), this can lead to gaps on the charts.
+
+You can set netdata scheduling policy in `netdata.conf`, like this:
+
+```
+[global]
+  process scheduling policy = idle
+```
+
+You can use the following:
+
+policy|description
+:-----:|:--------
+`idle`|use CPU only when there is spare - this is lower than nice 19 - it is the default for netdata and it is so low that netdata will run in "slow motion" under extreme system load, resulting in short (1-2 seconds) gaps at the charts.
+`other`<br/>or<br/>`nice`|this is the default policy for all processes under Linux. It provides dynamic priorities based on the `nice` level of each process. Check below for setting this `nice` level for netdata.
+`batch`|This policy is similar to `other` in that it schedules the thread according to its dynamic priority (based on the `nice` value).  The difference is that this policy will cause the scheduler to always assume that the thread is CPU-intensive.  Consequently, the scheduler will  apply a small scheduling penalty with respect to wake-up behavior, so that this thread is mildly disfavored in scheduling decisions.
+`fifo`|`fifo` can be used only with static priorities higher than 0, which means that when a `fifo` threads becomes runnable, it will always  immediately  preempt  any  currently running  `other`, `batch`, or `idle` thread.  `fifo` is a simple scheduling algorithm without time slicing.
+`rr`|a simple enhancement of `fifo`.  Everything described above for `fifo` also applies to `rr`, except that each thread is allowed to run only for a  maximum time quantum.
+`keep`<br/>or<br/>`none`|do not set scheduling policy, priority or nice level - i.e. keep running with whatever it is set already (e.g. by systemd).
+
+For more information see `man sched`.
+
+### scheduling priority for `rr` and `fifo`
+
+Once the policy is set to one of `rr` or `fifo`, the following will appear:
+
+```
+[global]
+    process scheduling priority = 0
+```
+
+These priorities are usually from 0 to 99. Higher numbers make the process more important.
+
+### nice level for policies `other` or `batch`
+
+When the policy is set to `other`, `nice`, or `batch`, the following will appear:
+
+```
+[global]
+    process nice level = 19
+```
+
+## scheduling settings and systemd
+
+netdata will not be able to set its scheduling policy and priority to more important values when it is started as the `netdata` user (systemd case).
+
+You can set these settings at `/etc/systemd/system/netdata.service`:
+
+```
+[Service]
+# By default netdata switches to scheduling policy idle, which makes it use CPU, only
+# when there is spare available.
+# Valid policies: other (the system default) | batch | idle | fifo | rr
+#CPUSchedulingPolicy=other
+
+# This sets the maximum scheduling priority netdata can set (for policies: rr and fifo).
+# netdata (via [global].process scheduling priority in netdata.conf) can only lower this value.
+# Priority gets values 1 (lowest) to 99 (highest).
+#CPUSchedulingPriority=1
+
+# For scheduling policy 'other' and 'batch', this sets the lowest niceness of netdata.
+# netdata (via [global].process nice level in netdata.conf) can only increase the value set here.
+#Nice=0
+```
+
+Run `systemctl daemon-reload` to reload these changes.
+
+Now, tell netdata to keep these settings, as set by systemd, by editing `netdata.conf` and setting:
+
+```
+[global]
+    process scheduling policy = keep
+```
+
+Using the above, whatever scheduling settings you have set at `netdata.service` will be maintained by netdata.
+
+
+#### Example 1: netdata with nice -1 on non-systemd systems
+
+On a system that is not based on systemd, to make netdata run with nice level -1 (a little bit higher to the default for all programs), edit netdata.conf and set:
+
+```
+[global]
+  process scheduling policy = other
+  process nice level = -1
+```
+
+then execute this to restart netdata:
+
+```sh
+sudo service netdata restart
+```
+
+
+#### Example 2: netdata with nice -1 on systemd systems
+
+On a system that is based on systemd, to make netdata run with nice level -1 (a little bit higher to the default for all programs), edit netdata.conf and set:
+
+```
+[global]
+  process scheduling policy = keep
+```
+
+edit /etc/systemd/system/netdata.service and set:
+
+```
+[Service]
+CPUSchedulingPolicy=other
+Nice=-1
+```
+
+then execute:
+
+```sh
+sudo systemctl daemon-reload
+sudo systemctl restart netdata
+```
+
+## virtual memory
+
+You may notice that netdata's virtual memory size, as reported by `ps` or `/proc/pid/status`
+(or even netdata's applications virtual memory chart)  is unrealistically high.
+
+For example, it may be reported to be 150+MB, even if the resident memory size is just 25MB.
+Similar values may be reported for netdata plugins too.
+
+Check this for example: A netdata installation with default settings on Ubuntu 16.04LTS.
+The top chart is **real memory used**, while the bottom one is **virtual memory**:
+
+![image](https://cloud.githubusercontent.com/assets/2662304/19013772/5eb7173e-87e3-11e6-8f2b-a2ccfeb06faf.png)
+
+#### why this happens?
+
+The system memory allocator allocates virtual memory arenas, per thread running.
+On Linux systems this defaults to 16MB per thread on 64 bit machines. So, if you get the
+difference between real and virtual memory and divide it by 16MB you will roughly get the
+number of threads running.
+
+The system does this for speed. Having a separate memory arena for each thread, allows the
+threads to run in parallel in multi-core systems, without any locks between them.
+
+This behaviour is system specific. For example, the chart above when running netdata on alpine
+linux (that uses **musl** instead of **glibc**) is this:
+
+![image](https://cloud.githubusercontent.com/assets/2662304/19013807/7cf5878e-87e4-11e6-9651-082e68701eab.png)
+
+#### can we do anything to lower it?
+
+Since netdata already uses minimal memory allocations while it runs (i.e. it adapts its memory
+on start, so that while repeatedly collects data it does not do memory allocations), it already
+instructs the system memory allocator to minimize the memory arenas for each thread. We have also
+added [2 configuration options](https://github.com/netdata/netdata/blob/5645b1ee35248d94e6931b64a8688f7f0d865ec6/src/main.c#L410-L418)
+to allow you tweak these settings.
+
+However, even if we instructed the memory allocator to use just one arena, it seems it allocates
+an arena per thread.
+
+netdata also supports `jemalloc` and `tcmalloc`, however both behave exactly the same to the
+glibc memory allocator in this aspect.
+
+#### Is this a problem?
+
+No, it is not.
+
+Linux reserves real memory (physical RAM) in pages (on x86 machines pages are 4KB each).
+So even if the system memory allocator is allocating huge amounts of virtual memory,
+only the 4KB pages that are actually used are reserving physical RAM. The **real memory** chart
+on netdata application section, shows the amount of physical memory these pages occupy(it
+accounts the whole pages, even if parts of them are actually used).
+
+
+## Debugging
+
+When you compile netdata with debugging:
+
+1. compiler optimizations for your CPU are disabled (netdata will run somewhat slower)
+
+2. a lot of code is added all over netdata, to log debug messages to `/var/log/netdata/debug.log`. However, nothing is printed by default. netdata allows you to select which sections of netdata you want to trace. Tracing is activated via the config option `debug flags`. It accepts a hex number, to enable or disable specific sections. You can find the options supported at [log.h](https://github.com/netdata/netdata/blob/master/libnetdata/log/log.h). They are the `D_*` defines. The value `0xffffffffffffffff` will enable all possible debug flags.
+
+Once netdata is compiled with debugging and tracing is enabled for a few sections, the file `/var/log/netdata/debug.log` will contain the messages.
+
+> Do not forget to disable tracing (`debug flags = 0`) when you are done tracing. The file `debug.log` can grow too fast.
+
+#### compiling netdata with debugging
+
+To compile netdata with debugging, use this:
+
+```sh
+# step into the netdata source directory
+cd /usr/src/netdata.git
+
+# run the installer with debugging enabled
+CFLAGS="-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1" ./netdata-installer.sh
+```
+
+The above will compile and install netdata with debugging info embedded. You can now use `debug flags` to set the section(s) you need to trace.
+
+#### debugging crashes
+
+We have made the most to make netdata crash free. If however, netdata crashes on your system, it would be very helpful to provide stack traces of the crash. Without them, is will be almost impossible to find the issue (the code base is quite large to find such an issue by just objerving it).
+
+To provide stack traces, **you need to have netdata compiled with debugging**. There is no need to enable any tracing (`debug flags`).
+
+Then you need to be in one of the following 2 cases:
+
+1. netdata crashes and you have a core dump
+
+2. you can reproduce the crash
+
+If you are not on these cases, you need to find a way to be (i.e. if your system does not produce core dumps, check your distro documentation to enable them).
+
+#### netdata crashes and you have a core dump
+
+> you need to have netdata compiled with debugging info for this to work (check above)
+
+Run the following command and post the output on a github issue.
+
+```sh
+gdb $(which netdata) /path/to/core/dump
+```
+
+#### you can reproduce a netdata crash on your system
+
+> you need to have netdata compiled with debugging info for this to work (check above)
+
+Install the package `valgrind` and run:
+
+```sh
+valgrind $(which netdata) -D
+```
+
+netdata will start and it will be a lot slower. Now reproduce the crash and `valgrind` will dump on your console the stack trace. Open a new github issue and post the output.
+
diff --git a/daemon/common.c b/daemon/common.c
new file mode 100644
index 000000000..e278cdf7c
--- /dev/null
+++ b/daemon/common.c
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "common.h"
+
+char *netdata_configured_hostname         = NULL;
+char *netdata_configured_user_config_dir  = CONFIG_DIR;
+char *netdata_configured_stock_config_dir = LIBCONFIG_DIR;
+char *netdata_configured_log_dir          = LOG_DIR;
+char *netdata_configured_plugins_dir      = NULL;
+char *netdata_configured_web_dir          = WEB_DIR;
+char *netdata_configured_cache_dir        = CACHE_DIR;
+char *netdata_configured_varlib_dir       = VARLIB_DIR;
+char *netdata_configured_home_dir         = CACHE_DIR;
+char *netdata_configured_host_prefix      = NULL;
+char *netdata_configured_timezone         = NULL;
+
diff --git a/daemon/common.h b/daemon/common.h
new file mode 100644
index 000000000..d912a30e7
--- /dev/null
+++ b/daemon/common.h
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#ifndef NETDATA_COMMON_H
+#define NETDATA_COMMON_H 1
+
+#include "../libnetdata/libnetdata.h"
+
+// ----------------------------------------------------------------------------
+// shortcuts for the default netdata configuration
+
+#define config_load(filename, overwrite_used) appconfig_load(&netdata_config, filename, overwrite_used)
+#define config_get(section, name, default_value) appconfig_get(&netdata_config, section, name, default_value)
+#define config_get_number(section, name, value) appconfig_get_number(&netdata_config, section, name, value)
+#define config_get_float(section, name, value) appconfig_get_float(&netdata_config, section, name, value)
+#define config_get_boolean(section, name, value) appconfig_get_boolean(&netdata_config, section, name, value)
+#define config_get_boolean_ondemand(section, name, value) appconfig_get_boolean_ondemand(&netdata_config, section, name, value)
+
+#define config_set(section, name, default_value) appconfig_set(&netdata_config, section, name, default_value)
+#define config_set_default(section, name, value) appconfig_set_default(&netdata_config, section, name, value)
+#define config_set_number(section, name, value) appconfig_set_number(&netdata_config, section, name, value)
+#define config_set_float(section, name, value) appconfig_set_float(&netdata_config, section, name, value)
+#define config_set_boolean(section, name, value) appconfig_set_boolean(&netdata_config, section, name, value)
+
+#define config_exists(section, name) appconfig_exists(&netdata_config, section, name)
+#define config_move(section_old, name_old, section_new, name_new) appconfig_move(&netdata_config, section_old, name_old, section_new, name_new)
+
+#define config_generate(buffer, only_changed) appconfig_generate(&netdata_config, buffer, only_changed)
+
+
+// ----------------------------------------------------------------------------
+// netdata include files
+
+#include "global_statistics.h"
+
+// the netdata database
+#include "database/rrd.h"
+
+// the netdata webserver(s)
+#include "web/server/web_server.h"
+
+// streaming metrics between netdata servers
+#include "streaming/rrdpush.h"
+
+// health monitoring and alarm notifications
+#include "health/health.h"
+
+// the netdata registry
+// the registry is actually an API feature
+#include "registry/registry.h"
+
+// backends for archiving the metrics
+#include "backends/backends.h"
+
+// the netdata API
+#include "web/api/web_api_v1.h"
+
+// all data collection plugins
+#include "collectors/all.h"
+
+// netdata unit tests
+#include "unit_test.h"
+
+// the netdata deamon
+#include "daemon.h"
+#include "main.h"
+#include "signals.h"
+
+// global netdata daemon variables
+extern char *netdata_configured_hostname;
+extern char *netdata_configured_user_config_dir;
+extern char *netdata_configured_stock_config_dir;
+extern char *netdata_configured_log_dir;
+extern char *netdata_configured_plugins_dir_base;
+extern char *netdata_configured_plugins_dir;
+extern char *netdata_configured_web_dir;
+extern char *netdata_configured_cache_dir;
+extern char *netdata_configured_varlib_dir;
+extern char *netdata_configured_home_dir;
+extern char *netdata_configured_host_prefix;
+extern char *netdata_configured_timezone;
+
+#endif /* NETDATA_COMMON_H */
diff --git a/src/daemon.c b/daemon/daemon.c
index 471c62c6e..4ad082b95 100644
--- a/src/daemon.c
+++ b/daemon/daemon.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common.h"
 #include <sched.h>
 
@@ -151,6 +153,10 @@ static void oom_score_adj(void) {
     s = config_get(CONFIG_SECTION_GLOBAL, "OOM score", s);
     if(s && *s && (isdigit(*s) || *s == '-' || *s == '+'))
         wanted_score = atoll(s);
+    else if(s && !strcmp(s, "keep")) {
+        info("Out-Of-Memory (OOM) kept as-is (running with %d)", (int) old_score);
+        return;
+    }
     else {
         info("Out-Of-Memory (OOM) score not changed due to non-numeric setting: '%s' (running with %d)", s, (int)old_score);
         return;
@@ -202,8 +208,6 @@ static void process_nice_level(void) {
 #endif // HAVE_NICE
 };
 
-#ifdef HAVE_SCHED_SETSCHEDULER
-
 #define SCHED_FLAG_NONE                      0x00
 #define SCHED_FLAG_PRIORITY_CONFIGURABLE     0x01 // the priority is user configurable
 #define SCHED_FLAG_KEEP_AS_IS                0x04 // do not attempt to set policy, priority or nice()
@@ -227,8 +231,8 @@ struct sched_def {
 #endif
 
 #ifdef SCHED_OTHER
-        { "nice",  SCHED_OTHER, 0, SCHED_FLAG_USE_NICE },
         { "other", SCHED_OTHER, 0, SCHED_FLAG_USE_NICE },
+        { "nice",  SCHED_OTHER, 0, SCHED_FLAG_USE_NICE },
 #endif
 
 #ifdef SCHED_RR
@@ -251,6 +255,55 @@ struct sched_def {
         { NULL, 0, 0, 0 }
 };
 
+
+#ifdef HAVE_SCHED_GETSCHEDULER
+static void sched_getscheduler_report(void) {
+    int sched = sched_getscheduler(0);
+    if(sched == -1) {
+        error("Cannot get my current process scheduling policy.");
+        return;
+    }
+    else {
+        int i;
+        for(i = 0 ; scheduler_defaults[i].name ; i++) {
+            if(scheduler_defaults[i].policy == sched) {
+                if(scheduler_defaults[i].flags & SCHED_FLAG_PRIORITY_CONFIGURABLE) {
+                    struct sched_param param;
+                    if(sched_getparam(0, &param) == -1) {
+                        error("Cannot get the process scheduling priority for my policy '%s'", scheduler_defaults[i].name);
+                        return;
+                    }
+                    else {
+                        info("Running with process scheduling policy '%s', priority %d", scheduler_defaults[i].name, param.sched_priority);
+                    }
+                }
+                else if(scheduler_defaults[i].flags & SCHED_FLAG_USE_NICE) {
+                    #ifdef HAVE_GETPRIORITY
+                    int n = getpriority(PRIO_PROCESS, 0);
+                    info("Running with process scheduling policy '%s', nice level %d", scheduler_defaults[i].name, n);
+                    #else // !HAVE_GETPRIORITY
+                    info("Running with process scheduling policy '%s'", scheduler_defaults[i].name);
+                    #endif // !HAVE_GETPRIORITY
+                }
+                else {
+                    info("Running with process scheduling policy '%s'", scheduler_defaults[i].name);
+                }
+
+                return;
+            }
+        }
+    }
+}
+#else // !HAVE_SCHED_GETSCHEDULER
+static void sched_getscheduler_report(void) {
+#ifdef HAVE_GETPRIORITY
+    info("Running with priority %d", getpriority(PRIO_PROCESS, 0));
+#endif // HAVE_GETPRIORITY
+}
+#endif // !HAVE_SCHED_GETSCHEDULER
+
+#ifdef HAVE_SCHED_SETSCHEDULER
+
 static void sched_setscheduler_set(void) {
 
     if(scheduler_defaults[0].name) {
@@ -270,7 +323,7 @@ static void sched_setscheduler_set(void) {
                 flags = scheduler_defaults[i].flags;
 
                 if(flags & SCHED_FLAG_KEEP_AS_IS)
-                    return;
+                    goto report;
 
                 if(flags & SCHED_FLAG_PRIORITY_CONFIGURABLE)
                     priority = (int)config_get_number(CONFIG_SECTION_GLOBAL, "process scheduling priority", priority);
@@ -310,18 +363,21 @@ static void sched_setscheduler_set(void) {
         else {
             info("Adjusted netdata scheduling policy to %s (%d), with priority %d.", name, policy, priority);
             if(!(flags & SCHED_FLAG_USE_NICE))
-                return;
+                goto report;
         }
     }
 
 fallback:
     process_nice_level();
+
+report:
+    sched_getscheduler_report();
 }
-#else
+#else // !HAVE_SCHED_SETSCHEDULER
 static void sched_setscheduler_set(void) {
     process_nice_level();
 }
-#endif
+#endif // !HAVE_SCHED_SETSCHEDULER
 
 int become_daemon(int dont_fork, const char *user)
 {
diff --git a/src/daemon.h b/daemon/daemon.h
index 150d74e3a..412691107 100644
--- a/src/daemon.h
+++ b/daemon/daemon.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef NETDATA_DAEMON_H
 #define NETDATA_DAEMON_H 1
 
diff --git a/src/global_statistics.c b/daemon/global_statistics.c
index 4f34e92df..68933e195 100644
--- a/src/global_statistics.c
+++ b/daemon/global_statistics.c
@@ -1,6 +1,27 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common.h"
 
-volatile struct global_statistics global_statistics = {
+#define GLOBAL_STATS_RESET_WEB_USEC_MAX 0x01
+
+
+static struct global_statistics {
+    volatile uint16_t connected_clients;
+
+    volatile uint64_t web_requests;
+    volatile uint64_t web_usec;
+    volatile uint64_t web_usec_max;
+    volatile uint64_t bytes_received;
+    volatile uint64_t bytes_sent;
+    volatile uint64_t content_size;
+    volatile uint64_t compressed_content_size;
+
+    volatile uint64_t web_client_count;
+
+    volatile uint64_t rrdr_queries_made;
+    volatile uint64_t rrdr_db_points_read;
+    volatile uint64_t rrdr_result_points_generated;
+} global_statistics = {
         .connected_clients = 0,
         .web_requests = 0,
         .web_usec = 0,
@@ -8,18 +29,45 @@ volatile struct global_statistics global_statistics = {
         .bytes_sent = 0,
         .content_size = 0,
         .compressed_content_size = 0,
-        .web_client_count = 1
+        .web_client_count = 1,
+
+        .rrdr_queries_made = 0,
+        .rrdr_db_points_read = 0,
+        .rrdr_result_points_generated = 0,
 };
 
+#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
+#else
 netdata_mutex_t global_statistics_mutex = NETDATA_MUTEX_INITIALIZER;
 
-inline void global_statistics_lock(void) {
+static inline void global_statistics_lock(void) {
     netdata_mutex_lock(&global_statistics_mutex);
 }
 
-inline void global_statistics_unlock(void) {
+static inline void global_statistics_unlock(void) {
     netdata_mutex_unlock(&global_statistics_mutex);
 }
+#endif
+
+
+void rrdr_query_completed(uint64_t db_points_read, uint64_t result_points_generated) {
+#if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
+    __atomic_fetch_add(&global_statistics.rrdr_queries_made, 1, __ATOMIC_SEQ_CST);
+    __atomic_fetch_add(&global_statistics.rrdr_db_points_read, db_points_read, __ATOMIC_SEQ_CST);
+    __atomic_fetch_add(&global_statistics.rrdr_result_points_generated, result_points_generated, __ATOMIC_SEQ_CST);
+#else
+    #warning NOT using atomic operations - using locks for global statistics
+    if (web_server_is_multithreaded)
+        global_statistics_lock();
+
+    global_statistics.rrdr_queries_made++;
+    global_statistics.rrdr_db_points_read += db_points_read;
+    global_statistics.rrdr_result_points_generated += result_points_generated;
+
+    if (web_server_is_multithreaded)
+        global_statistics_unlock();
+#endif
+}
 
 void finished_web_request_statistics(uint64_t dt,
                                      uint64_t bytes_received,
@@ -90,17 +138,21 @@ void web_client_disconnected(void) {
 }
 
 
-inline void global_statistics_copy(struct global_statistics *gs, uint8_t options) {
+static inline void global_statistics_copy(struct global_statistics *gs, uint8_t options) {
 #if defined(HAVE_C___ATOMIC) && !defined(NETDATA_NO_ATOMIC_INSTRUCTIONS)
-    gs->connected_clients       = __atomic_fetch_add(&global_statistics.connected_clients, 0, __ATOMIC_SEQ_CST);
-    gs->web_requests            = __atomic_fetch_add(&global_statistics.web_requests, 0, __ATOMIC_SEQ_CST);
-    gs->web_usec                = __atomic_fetch_add(&global_statistics.web_usec, 0, __ATOMIC_SEQ_CST);
-    gs->web_usec_max            = __atomic_fetch_add(&global_statistics.web_usec_max, 0, __ATOMIC_SEQ_CST);
-    gs->bytes_received          = __atomic_fetch_add(&global_statistics.bytes_received, 0, __ATOMIC_SEQ_CST);
-    gs->bytes_sent              = __atomic_fetch_add(&global_statistics.bytes_sent, 0, __ATOMIC_SEQ_CST);
-    gs->content_size            = __atomic_fetch_add(&global_statistics.content_size, 0, __ATOMIC_SEQ_CST);
-    gs->compressed_content_size = __atomic_fetch_add(&global_statistics.compressed_content_size, 0, __ATOMIC_SEQ_CST);
-    gs->web_client_count        = __atomic_fetch_add(&global_statistics.web_client_count, 0, __ATOMIC_SEQ_CST);
+    gs->connected_clients            = __atomic_fetch_add(&global_statistics.connected_clients, 0, __ATOMIC_SEQ_CST);
+    gs->web_requests                 = __atomic_fetch_add(&global_statistics.web_requests, 0, __ATOMIC_SEQ_CST);
+    gs->web_usec                     = __atomic_fetch_add(&global_statistics.web_usec, 0, __ATOMIC_SEQ_CST);
+    gs->web_usec_max                 = __atomic_fetch_add(&global_statistics.web_usec_max, 0, __ATOMIC_SEQ_CST);
+    gs->bytes_received               = __atomic_fetch_add(&global_statistics.bytes_received, 0, __ATOMIC_SEQ_CST);
+    gs->bytes_sent                   = __atomic_fetch_add(&global_statistics.bytes_sent, 0, __ATOMIC_SEQ_CST);
+    gs->content_size                 = __atomic_fetch_add(&global_statistics.content_size, 0, __ATOMIC_SEQ_CST);
+    gs->compressed_content_size      = __atomic_fetch_add(&global_statistics.compressed_content_size, 0, __ATOMIC_SEQ_CST);
+    gs->web_client_count             = __atomic_fetch_add(&global_statistics.web_client_count, 0, __ATOMIC_SEQ_CST);
+
+    gs->rrdr_queries_made            = __atomic_fetch_add(&global_statistics.rrdr_queries_made, 0, __ATOMIC_SEQ_CST);
+    gs->rrdr_db_points_read          = __atomic_fetch_add(&global_statistics.rrdr_db_points_read, 0, __ATOMIC_SEQ_CST);
+    gs->rrdr_result_points_generated = __atomic_fetch_add(&global_statistics.rrdr_result_points_generated, 0, __ATOMIC_SEQ_CST);
 
     if(options & GLOBAL_STATS_RESET_WEB_USEC_MAX) {
         uint64_t n = 0;
@@ -411,4 +463,71 @@ void global_statistics_charts(void) {
 
         rrdset_done(st_compression);
     }
+
+    // ----------------------------------------------------------------
+
+    if(gs.rrdr_queries_made) {
+        static RRDSET *st_rrdr_queries = NULL;
+        static RRDDIM *rd_queries = NULL;
+
+        if (unlikely(!st_rrdr_queries)) {
+            st_rrdr_queries = rrdset_create_localhost(
+                    "netdata"
+                    , "queries"
+                    , NULL
+                    , "queries"
+                    , NULL
+                    , "NetData API Queries"
+                    , "queries/s"
+                    , "netdata"
+                    , "stats"
+                    , 130500
+                    , localhost->rrd_update_every
+                    , RRDSET_TYPE_LINE
+            );
+
+            rd_queries = rrddim_add(st_rrdr_queries, "queries", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+        }
+        else
+            rrdset_next(st_rrdr_queries);
+
+        rrddim_set_by_pointer(st_rrdr_queries, rd_queries, (collected_number)gs.rrdr_queries_made);
+
+        rrdset_done(st_rrdr_queries);
+    }
+
+    // ----------------------------------------------------------------
+
+    if(gs.rrdr_db_points_read || gs.rrdr_result_points_generated) {
+        static RRDSET *st_rrdr_points = NULL;
+        static RRDDIM *rd_points_read = NULL;
+        static RRDDIM *rd_points_generated = NULL;
+
+        if (unlikely(!st_rrdr_points)) {
+            st_rrdr_points = rrdset_create_localhost(
+                    "netdata"
+                    , "db_points"
+                    , NULL
+                    , "queries"
+                    , NULL
+                    , "NetData API Points"
+                    , "points/s"
+                    , "netdata"
+                    , "stats"
+                    , 130501
+                    , localhost->rrd_update_every
+                    , RRDSET_TYPE_AREA
+            );
+
+            rd_points_read = rrddim_add(st_rrdr_points, "read", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
+            rd_points_generated = rrddim_add(st_rrdr_points, "generated", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
+        }
+        else
+            rrdset_next(st_rrdr_points);
+
+        rrddim_set_by_pointer(st_rrdr_points, rd_points_read, (collected_number)gs.rrdr_db_points_read);
+        rrddim_set_by_pointer(st_rrdr_points, rd_points_generated, (collected_number)gs.rrdr_result_points_generated);
+
+        rrdset_done(st_rrdr_points);
+    }
 }
diff --git a/src/global_statistics.h b/daemon/global_statistics.h
index 62fee6e36..9dd7db51a 100644
--- a/src/global_statistics.h
+++ b/daemon/global_statistics.h
@@ -1,27 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef NETDATA_GLOBAL_STATISTICS_H
 #define NETDATA_GLOBAL_STATISTICS_H 1
 
+#include "common.h"
+
 // ----------------------------------------------------------------------------
 // global statistics
 
-struct global_statistics {
-    volatile uint16_t connected_clients;
-
-    volatile uint64_t web_requests;
-    volatile uint64_t web_usec;
-    volatile uint64_t web_usec_max;
-    volatile uint64_t bytes_received;
-    volatile uint64_t bytes_sent;
-    volatile uint64_t content_size;
-    volatile uint64_t compressed_content_size;
+extern void rrdr_query_completed(uint64_t db_points_read, uint64_t result_points_generated);
 
-    volatile uint64_t web_client_count;
-};
-
-extern volatile struct global_statistics global_statistics;
-
-extern void global_statistics_lock(void);
-extern void global_statistics_unlock(void);
 extern void finished_web_request_statistics(uint64_t dt,
                                      uint64_t bytes_received,
                                      uint64_t bytes_sent,
@@ -30,9 +18,6 @@ extern void finished_web_request_statistics(uint64_t dt,
 
 extern uint64_t web_client_connected(void);
 extern void web_client_disconnected(void);
-
-#define GLOBAL_STATS_RESET_WEB_USEC_MAX 0x01
-extern void global_statistics_copy(struct global_statistics *gs, uint8_t options);
 extern void global_statistics_charts(void);
 
 #endif /* NETDATA_GLOBAL_STATISTICS_H */
diff --git a/src/main.c b/daemon/main.c
index 798c7f0fc..b2c4c80bf 100644
--- a/src/main.c
+++ b/daemon/main.c
@@ -1,6 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common.h"
 
-extern void *cgroups_main(void *ptr);
+struct config netdata_config = {
+        .sections = NULL,
+        .mutex = NETDATA_MUTEX_INITIALIZER,
+        .index = {
+                .avl_tree = {
+                        .root = NULL,
+                        .compar = appconfig_section_compare
+                },
+                .rwlock = AVL_LOCK_INITIALIZER
+        }
+};
 
 void netdata_cleanup_and_exit(int ret) {
     // enabling this, is wrong
@@ -39,43 +51,31 @@ void netdata_cleanup_and_exit(int ret) {
 
 struct netdata_static_thread static_threads[] = {
 
-#ifdef INTERNAL_PLUGIN_NFACCT
-    // nfacct requires root access
-    // so, we build it as an external plugin with setuid to root
-    {"PLUGIN[nfacct]",       CONFIG_SECTION_PLUGINS,  "nfacct",     1, NULL, NULL, nfacct_main},
-#endif
-
-#ifdef NETDATA_INTERNAL_CHECKS
-    // debugging plugin
-    {"PLUGIN[check]",        CONFIG_SECTION_PLUGINS,  "checks",     0, NULL, NULL, checks_main},
-#endif
+    NETDATA_PLUGIN_HOOK_CHECKS
+    NETDATA_PLUGIN_HOOK_FREEBSD
+    NETDATA_PLUGIN_HOOK_MACOS
 
-#if defined(__FreeBSD__)
-    // FreeBSD internal plugins
-    {"PLUGIN[freebsd]",      CONFIG_SECTION_PLUGINS,  "freebsd",    1, NULL, NULL, freebsd_main},
-#elif defined(__APPLE__)
-    // macOS internal plugins
-    {"PLUGIN[macos]",        CONFIG_SECTION_PLUGINS,  "macos",      1, NULL, NULL, macos_main},
-#else
     // linux internal plugins
-    {"PLUGIN[proc]",         CONFIG_SECTION_PLUGINS,  "proc",       1, NULL, NULL, proc_main},
-    {"PLUGIN[diskspace]",    CONFIG_SECTION_PLUGINS,  "diskspace",  1, NULL, NULL, proc_diskspace_main},
-    {"PLUGIN[cgroup]",       CONFIG_SECTION_PLUGINS,  "cgroups",    1, NULL, NULL, cgroups_main},
-    {"PLUGIN[tc]",           CONFIG_SECTION_PLUGINS,  "tc",         1, NULL, NULL, tc_main},
-#endif /* __FreeBSD__, __APPLE__*/
-
-    // common plugins for all systems
-    {"PLUGIN[idlejitter]",   CONFIG_SECTION_PLUGINS,  "idlejitter", 1, NULL, NULL, cpuidlejitter_main},
-    {"BACKENDS",            NULL,                    NULL,         1, NULL, NULL, backends_main},
-    {"HEALTH",              NULL,                    NULL,         1, NULL, NULL, health_main},
-    {"PLUGINSD",            NULL,                    NULL,         1, NULL, NULL, pluginsd_main},
-    {"WEB_SERVER[multi]",   NULL,                    NULL,         1, NULL, NULL, socket_listen_main_multi_threaded},
-    {"WEB_SERVER[single]",  NULL,                    NULL,         0, NULL, NULL, socket_listen_main_single_threaded},
-    {"WEB_SERVER[static1]", NULL,                    NULL,         0, NULL, NULL, socket_listen_main_static_threaded},
-    {"STREAM",              NULL,                    NULL,         0, NULL, NULL, rrdpush_sender_thread},
-    {"STATSD",              NULL,                    NULL,         1, NULL, NULL, statsd_main},
-
-    {NULL,                  NULL,                    NULL,         0, NULL, NULL, NULL}
+    NETDATA_PLUGIN_HOOK_LINUX_NFACCT
+    NETDATA_PLUGIN_HOOK_LINUX_PROC
+    NETDATA_PLUGIN_HOOK_LINUX_DISKSPACE
+    NETDATA_PLUGIN_HOOK_LINUX_CGROUPS
+    NETDATA_PLUGIN_HOOK_LINUX_TC
+
+    NETDATA_PLUGIN_HOOK_IDLEJITTER
+    NETDATA_PLUGIN_HOOK_STATSD
+
+        // common plugins for all systems
+    {"BACKENDS",             NULL,                    NULL,         1, NULL, NULL, backends_main},
+    {"WEB_SERVER[multi]",    NULL,                    NULL,         1, NULL, NULL, socket_listen_main_multi_threaded},
+    {"WEB_SERVER[single]",   NULL,                    NULL,         0, NULL, NULL, socket_listen_main_single_threaded},
+    {"WEB_SERVER[static1]",  NULL,                    NULL,         0, NULL, NULL, socket_listen_main_static_threaded},
+    {"STREAM",               NULL,                    NULL,         0, NULL, NULL, rrdpush_sender_thread},
+
+    NETDATA_PLUGIN_HOOK_PLUGINSD
+    NETDATA_PLUGIN_HOOK_HEALTH
+
+    {NULL,                   NULL,                    NULL,         0, NULL, NULL, NULL}
 };
 
 void web_server_threading_selection(void) {
@@ -101,6 +101,7 @@ void web_server_threading_selection(void) {
 void web_server_config_options(void) {
     web_client_timeout = (int) config_get_number(CONFIG_SECTION_WEB, "disconnect idle clients after seconds", web_client_timeout);
     web_client_first_request_timeout = (int) config_get_number(CONFIG_SECTION_WEB, "timeout for first request", web_client_first_request_timeout);
+    web_client_streaming_rate_t = config_get_number(CONFIG_SECTION_WEB, "accept a streaming request every seconds", web_client_streaming_rate_t);
 
     respect_web_browser_do_not_track_policy = config_get_boolean(CONFIG_SECTION_WEB, "respect do not track policy", respect_web_browser_do_not_track_policy);
     web_x_frame_options = config_get(CONFIG_SECTION_WEB, "x-frame-options response header", "");
@@ -145,7 +146,7 @@ void web_server_config_options(void) {
 }
 
 
-int killpid(pid_t pid, int sig)
+int killpid(pid_t pid, int signal)
 {
     int ret = -1;
     debug(D_EXIT, "Request to kill pid %d", pid);
@@ -168,7 +169,7 @@ int killpid(pid_t pid, int sig)
     }
     else {
         errno = 0;
-        ret = kill(pid, sig);
+        ret = kill(pid, signal);
         if(ret == -1) {
             switch(errno) {
                 case ESRCH:
@@ -192,7 +193,8 @@ int killpid(pid_t pid, int sig)
 void cancel_main_threads() {
     error_log_limit_unlimited();
 
-    int i, found = 0, max = 5 * USEC_PER_SEC, step = 100000;
+    int i, found = 0;
+    usec_t max = 5 * USEC_PER_SEC, step = 100000;
     for (i = 0; static_threads[i].name != NULL ; i++) {
         if(static_threads[i].enabled == NETDATA_MAIN_THREAD_RUNNING) {
             info("EXIT: Stopping master thread: %s", static_threads[i].name);
@@ -226,6 +228,7 @@ struct option_def option_definitions[] = {
     // opt description                                    arg name       default value
     { 'c', "Configuration file to load.",                 "filename",    CONFIG_DIR "/" CONFIG_FILENAME},
     { 'D', "Do not fork. Run in the foreground.",         NULL,          "run in the background"},
+    { 'd', "Fork. Run in the background.",                NULL,          "run in the background"},
     { 'h', "Display this help message.",                  NULL,          NULL},
     { 'P', "File to save a pid while running.",           "filename",    "do not save pid to a file"},
     { 'i', "The IP address to listen to.",                "IP",          "all IP addresses IPv4 and IPv6"},
@@ -271,16 +274,14 @@ int help(int exitcode) {
             " All rights reserved.\n"
             "\n"
             " Home Page  : https://my-netdata.io\n"
-            " Source Code: https://github.com/firehol/netdata\n"
-            " Wiki / Docs: https://github.com/firehol/netdata/wiki\n"
-            " Support    : https://github.com/firehol/netdata/issues\n"
-            " License    : https://github.com/firehol/netdata/blob/master/LICENSE.md\n"
+            " Source Code: https://github.com/netdata/netdata\n"
+            " Wiki / Docs: https://github.com/netdata/netdata/wiki\n"
+            " Support    : https://github.com/netdata/netdata/issues\n"
+            " License    : https://github.com/netdata/netdata/blob/master/LICENSE.md\n"
             "\n"
             " Twitter    : https://twitter.com/linuxnetdata\n"
             " Facebook   : https://www.facebook.com/linuxnetdata/\n"
             "\n"
-            " netdata is a https://firehol.org project.\n"
-            "\n"
             "\n"
     );
 
@@ -322,7 +323,8 @@ int help(int exitcode) {
 
 // TODO: Remove this function with the nix major release.
 void remove_option(int opt_index, int *argc, char **argv) {
-    int i = opt_index;
+    int i;
+
     // remove the options.
     do {
         *argc = *argc - 1;
@@ -356,9 +358,9 @@ void log_init(void) {
     snprintfz(filename, FILENAME_MAX, "%s/access.log", netdata_configured_log_dir);
     stdaccess_filename = config_get(CONFIG_SECTION_GLOBAL, "access log", filename);
 
-    error_log_throttle_period_backup =
     error_log_throttle_period = config_get_number(CONFIG_SECTION_GLOBAL, "errors flood protection period", error_log_throttle_period);
     error_log_errors_per_period = (unsigned long)config_get_number(CONFIG_SECTION_GLOBAL, "errors to trigger flood protection", (long long int)error_log_errors_per_period);
+    error_log_errors_per_period_backup = error_log_errors_per_period;
 
     setenv("NETDATA_ERRORS_THROTTLE_PERIOD", config_get(CONFIG_SECTION_GLOBAL, "errors flood protection period"    , ""), 1);
     setenv("NETDATA_ERRORS_PER_PERIOD",      config_get(CONFIG_SECTION_GLOBAL, "errors to trigger flood protection", ""), 1);
@@ -457,12 +459,13 @@ static void get_netdata_configured_variables() {
     // ------------------------------------------------------------------------
     // get system paths
 
-    netdata_configured_config_dir  = config_get(CONFIG_SECTION_GLOBAL, "config directory",    CONFIG_DIR);
-    netdata_configured_log_dir     = config_get(CONFIG_SECTION_GLOBAL, "log directory",       LOG_DIR);
-    netdata_configured_web_dir     = config_get(CONFIG_SECTION_GLOBAL, "web files directory", WEB_DIR);
-    netdata_configured_cache_dir   = config_get(CONFIG_SECTION_GLOBAL, "cache directory",     CACHE_DIR);
-    netdata_configured_varlib_dir  = config_get(CONFIG_SECTION_GLOBAL, "lib directory",       VARLIB_DIR);
-    netdata_configured_home_dir    = config_get(CONFIG_SECTION_GLOBAL, "home directory",      CACHE_DIR);
+    netdata_configured_user_config_dir  = config_get(CONFIG_SECTION_GLOBAL, "config directory",       netdata_configured_user_config_dir);
+    netdata_configured_stock_config_dir = config_get(CONFIG_SECTION_GLOBAL, "stock config directory", netdata_configured_stock_config_dir);
+    netdata_configured_log_dir          = config_get(CONFIG_SECTION_GLOBAL, "log directory",          netdata_configured_log_dir);
+    netdata_configured_web_dir          = config_get(CONFIG_SECTION_GLOBAL, "web files directory",    netdata_configured_web_dir);
+    netdata_configured_cache_dir        = config_get(CONFIG_SECTION_GLOBAL, "cache directory",        netdata_configured_cache_dir);
+    netdata_configured_varlib_dir       = config_get(CONFIG_SECTION_GLOBAL, "lib directory",          netdata_configured_varlib_dir);
+    netdata_configured_home_dir         = config_get(CONFIG_SECTION_GLOBAL, "home directory",         netdata_configured_home_dir);
 
     {
         char plugins_dirs[(FILENAME_MAX * 2) + 1];
@@ -480,6 +483,7 @@ static void get_netdata_configured_variables() {
     // ------------------------------------------------------------------------
 
     netdata_configured_host_prefix = config_get(CONFIG_SECTION_GLOBAL, "host access prefix", "");
+    verify_netdata_host_prefix();
 
     // --------------------------------------------------------------------
     // get KSM settings
@@ -592,15 +596,17 @@ void set_global_environment() {
         setenv("NETDATA_UPDATE_EVERY", b, 1);
     }
 
-    setenv("NETDATA_HOSTNAME"   , netdata_configured_hostname, 1);
-    setenv("NETDATA_CONFIG_DIR" , verify_required_directory(netdata_configured_config_dir),  1);
-    setenv("NETDATA_PLUGINS_DIR", verify_required_directory(netdata_configured_plugins_dir), 1);
-    setenv("NETDATA_WEB_DIR"    , verify_required_directory(netdata_configured_web_dir),     1);
-    setenv("NETDATA_CACHE_DIR"  , verify_required_directory(netdata_configured_cache_dir),   1);
-    setenv("NETDATA_LIB_DIR"    , verify_required_directory(netdata_configured_varlib_dir),  1);
-    setenv("NETDATA_LOG_DIR"    , verify_required_directory(netdata_configured_log_dir),     1);
-    setenv("HOME"               , verify_required_directory(netdata_configured_home_dir),    1);
-    setenv("NETDATA_HOST_PREFIX", netdata_configured_host_prefix, 1);
+    setenv("NETDATA_HOSTNAME"         , netdata_configured_hostname, 1);
+    setenv("NETDATA_CONFIG_DIR"       , verify_required_directory(netdata_configured_user_config_dir),  1);
+    setenv("NETDATA_USER_CONFIG_DIR"  , verify_required_directory(netdata_configured_user_config_dir),  1);
+    setenv("NETDATA_STOCK_CONFIG_DIR" , verify_required_directory(netdata_configured_stock_config_dir), 1);
+    setenv("NETDATA_PLUGINS_DIR"      , verify_required_directory(netdata_configured_plugins_dir),      1);
+    setenv("NETDATA_WEB_DIR"          , verify_required_directory(netdata_configured_web_dir),          1);
+    setenv("NETDATA_CACHE_DIR"        , verify_required_directory(netdata_configured_cache_dir),        1);
+    setenv("NETDATA_LIB_DIR"          , verify_required_directory(netdata_configured_varlib_dir),       1);
+    setenv("NETDATA_LOG_DIR"          , verify_required_directory(netdata_configured_log_dir),          1);
+    setenv("HOME"                     , verify_required_directory(netdata_configured_home_dir),         1);
+    setenv("NETDATA_HOST_PREFIX"      , netdata_configured_host_prefix, 1);
 
     get_system_timezone();
 
@@ -622,6 +628,36 @@ void set_global_environment() {
     setenv("LC_ALL", "C", 1);
 }
 
+static int load_netdata_conf(char *filename, char overwrite_used) {
+    errno = 0;
+
+    int ret = 0;
+
+    if(filename && *filename) {
+        ret = config_load(filename, overwrite_used);
+        if(!ret)
+            error("CONFIG: cannot load config file '%s'.", filename);
+    }
+    else {
+        filename = strdupz_path_subpath(netdata_configured_user_config_dir, "netdata.conf");
+
+        ret = config_load(filename, overwrite_used);
+        if(!ret) {
+            info("CONFIG: cannot load user config '%s'. Will try the stock version.", filename);
+            freez(filename);
+
+            filename = strdupz_path_subpath(netdata_configured_stock_config_dir, "netdata.conf");
+            ret = config_load(filename, overwrite_used);
+            if(!ret)
+                info("CONFIG: cannot load stock config '%s'. Running with internal defaults.", filename);
+        }
+
+        freez(filename);
+    }
+
+    return ret;
+}
+
 int main(int argc, char **argv) {
     int i;
     int config_loaded = 0;
@@ -682,7 +718,7 @@ int main(int argc, char **argv) {
         while( (opt = getopt(argc, argv, optstring)) != -1 ) {
             switch(opt) {
                 case 'c':
-                    if(config_load(optarg, 1) != 1) {
+                    if(load_netdata_conf(optarg, 1) != 1) {
                         error("Cannot load configuration file %s.", optarg);
                         return 1;
                     }
@@ -694,6 +730,9 @@ int main(int argc, char **argv) {
                 case 'D':
                     dont_fork = 1;
                     break;
+                case 'd':
+                    dont_fork = 0;
+                    break;
                 case 'h':
                     return help(0);
                 case 'i':
@@ -727,9 +766,6 @@ int main(int argc, char **argv) {
                         if(strcmp(optarg, "unittest") == 0) {
                             if(unit_test_buffer()) return 1;
                             if(unit_test_str2ld()) return 1;
-                            //default_rrd_update_every = 1;
-                            //default_rrd_memory_mode = RRD_MEMORY_MODE_RAM;
-                            //if(!config_loaded) config_load(NULL, 0);
                             get_netdata_configured_variables();
                             default_rrd_update_every = 1;
                             default_rrd_memory_mode = RRD_MEMORY_MODE_RAM;
@@ -837,7 +873,7 @@ int main(int argc, char **argv) {
 
                             if(!config_loaded) {
                                 fprintf(stderr, "warning: no configuration file has been loaded. Use -c CONFIG_FILE, before -W get. Using default config.\n");
-                                config_load(NULL, 0);
+                                load_netdata_conf(NULL, 0);
                             }
 
                             backwards_compatible_config();
@@ -875,7 +911,7 @@ int main(int argc, char **argv) {
 #endif
 
     if(!config_loaded)
-        config_load(NULL, 0);
+        load_netdata_conf(NULL, 0);
 
     // ------------------------------------------------------------------------
     // initialize netdata
@@ -898,8 +934,8 @@ int main(int argc, char **argv) {
         // work while we are cd into config_dir
         // to allow the plugins refer to their config
         // files using relative filenames
-        if(chdir(netdata_configured_config_dir) == -1)
-            fatal("Cannot cd to '%s'", netdata_configured_config_dir);
+        if(chdir(netdata_configured_user_config_dir) == -1)
+            fatal("Cannot cd to '%s'", netdata_configured_user_config_dir);
     }
 
     char *user = NULL;
@@ -933,15 +969,6 @@ int main(int argc, char **argv) {
 
 
         // --------------------------------------------------------------------
-        // load stream.conf
-        {
-            char filename[FILENAME_MAX + 1];
-            snprintfz(filename, FILENAME_MAX, "%s/stream.conf", netdata_configured_config_dir);
-            appconfig_load(&stream_config, filename, 0);
-        }
-
-
-        // --------------------------------------------------------------------
         // setup process signals
 
         // block signals while initializing threads.
@@ -1009,7 +1036,7 @@ int main(int argc, char **argv) {
     if(getrlimit(RLIMIT_NOFILE, &rlimit_nofile) != 0)
         error("getrlimit(RLIMIT_NOFILE) failed");
     else
-        info("resources control: allowed file descriptors: soft = %zu, max = %zu", rlimit_nofile.rlim_cur, rlimit_nofile.rlim_max);
+        info("resources control: allowed file descriptors: soft = %zu, max = %zu", (size_t)rlimit_nofile.rlim_cur, (size_t)rlimit_nofile.rlim_max);
 
     // fork, switch user, create pid file, set process priority
     if(become_daemon(dont_fork, user) == -1)
diff --git a/src/main.h b/daemon/main.h
index d29bf74e7..cb0bde6a9 100644
--- a/src/main.h
+++ b/daemon/main.h
@@ -1,6 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef NETDATA_MAIN_H
 #define NETDATA_MAIN_H 1
 
+#include "common.h"
+
+extern struct config netdata_config;
+
 #define NETDATA_MAIN_THREAD_RUNNING   CONFIG_BOOLEAN_YES
 #define NETDATA_MAIN_THREAD_EXITING  (CONFIG_BOOLEAN_YES + 1)
 #define NETDATA_MAIN_THREAD_EXITED    CONFIG_BOOLEAN_NO
@@ -21,17 +27,17 @@ struct option_def {
 };
 
 struct netdata_static_thread {
-    char *name;
+    char *name;                         // the name of the thread as it should appear in the logs
 
-    char *config_section;
-    char *config_name;
+    char *config_section;               // the section of netdata.conf to check if this is enabled or not
+    char *config_name;                  // the name of the config option to check if it is true or false
 
-    volatile sig_atomic_t enabled;
+    volatile sig_atomic_t enabled;      // the current status of the thread
 
-    netdata_thread_t *thread;
+    netdata_thread_t *thread;           // internal use, to maintain a pointer to the created thread
 
-    void (*init_routine) (void);
-    void *(*start_routine) (void *);
+    void (*init_routine) (void);        // an initialization function to run before spawning the thread
+    void *(*start_routine) (void *);    // the threaded worker
 };
 
 extern void cancel_main_threads(void);
diff --git a/src/signals.c b/daemon/signals.c
index 331e80358..71f271887 100644
--- a/src/signals.c
+++ b/daemon/signals.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common.h"
 
 typedef enum signal_action {
@@ -147,6 +149,7 @@ void signals_handle(void) {
                                 break;
 
                             case NETDATA_SIGNAL_EXIT_CLEANLY:
+                                error_log_limit_unlimited();
                                 info("SIGNAL: Received %s. Cleaning up to exit...", name);
                                 netdata_cleanup_and_exit(0);
                                 exit(0);
diff --git a/src/signals.h b/daemon/signals.h
index 2fdd36552..e7e64365d 100644
--- a/src/signals.h
+++ b/daemon/signals.h
@@ -1,5 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef NETDATA_SIGNALS_H
-#define NETDATA_SIGNALS_H
+#define NETDATA_SIGNALS_H 1
 
 extern void signals_init(void);
 extern void signals_block(void);
diff --git a/src/unit_test.c b/daemon/unit_test.c
index e3eb146ad..9978647b4 100644
--- a/src/unit_test.c
+++ b/daemon/unit_test.c
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #include "common.h"
 
 static int check_number_printing(void) {
@@ -1197,8 +1199,50 @@ static int test_variable_renames(void) {
     return 1;
 }
 
+int check_strdupz_path_subpath() {
+
+    struct strdupz_path_subpath_checks {
+        const char *path;
+        const char *subpath;
+        const char *result;
+    } checks[] = {
+            { "",                "",            "."                     },
+            { "/",               "",            "/"                     },
+            { "/etc/netdata",    "",            "/etc/netdata"          },
+            { "/etc/netdata///", "",            "/etc/netdata"          },
+            { "/etc/netdata///", "health.d",    "/etc/netdata/health.d" },
+            { "/etc/netdata///", "///health.d", "/etc/netdata/health.d" },
+            { "/etc/netdata",    "///health.d", "/etc/netdata/health.d" },
+            { "",                "///health.d", "./health.d"            },
+            { "/",               "///health.d", "/health.d"             },
+
+            // terminator
+            { NULL, NULL, NULL }
+    };
+
+    size_t i;
+    for(i = 0; checks[i].result ; i++) {
+        char *s = strdupz_path_subpath(checks[i].path, checks[i].subpath);
+        fprintf(stderr, "strdupz_path_subpath(\"%s\", \"%s\") = \"%s\": ", checks[i].path, checks[i].subpath, s);
+        if(!s || strcmp(s, checks[i].result) != 0) {
+            freez(s);
+            fprintf(stderr, "FAILED\n");
+            return 1;
+        }
+        else {
+            freez(s);
+            fprintf(stderr, "OK\n");
+        }
+    }
+
+    return 0;
+}
+
 int run_all_mockup_tests(void)
 {
+    if(check_strdupz_path_subpath())
+        return 1;
+
     if(check_number_printing())
         return 1;
 
diff --git a/src/unit_test.h b/daemon/unit_test.h
index 68ed61fcb..0023c8de9 100644
--- a/src/unit_test.h
+++ b/daemon/unit_test.h
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 #ifndef NETDATA_UNIT_TEST_H
 #define NETDATA_UNIT_TEST_H 1