Merge tag 'upstream/1.4.0+dfsg'

Upstream version 1.4.0+dfsg

17 files changed, 10 insertions, 347 deletions

diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 7b14a18d..242ed8eb 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -83,8 +83,13 @@ subdir = contrib
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(dist_noinst_SCRIPTS) $(dist_noinst_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_c___atomic.m4 \
+	$(top_srcdir)/m4/ax_c__generic.m4 \
+	$(top_srcdir)/m4/ax_c_mallinfo.m4 \
+	$(top_srcdir)/m4/ax_c_mallopt.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/jemalloc.m4 \
+	$(top_srcdir)/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -180,6 +185,7 @@ 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@
@@ -212,6 +218,8 @@ 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@
diff --git a/contrib/debian/changelog b/contrib/debian/changelog
deleted file mode 100644
index f1dddc4c..00000000
--- a/contrib/debian/changelog
+++ /dev/null
@@ -1,3 +0,0 @@
-netdata (1.3.0) UNRELEASED; urgency=medium
-  * Latest release
- -- Netdata Team <>  Sat, 27 Aug 2016 23:38:15 +0200
diff --git a/contrib/debian/compat b/contrib/debian/compat
deleted file mode 100644
index ec635144..00000000
--- a/contrib/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/contrib/debian/control b/contrib/debian/control
deleted file mode 100644
index 24c5f4c4..00000000
--- a/contrib/debian/control
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: netdata
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
-               dh-systemd (>= 1.5),
-               dpkg-dev (>= 1.13.19),
-               zlib1g-dev,
-               uuid-dev
-Section: net
-Priority: optional
-Maintainer: Costa Tsaousis <costa@tsaousis.gr>
-Standards-Version: 3.9.6
-Homepage: https://github.com/firehol/netdata/wiki
-
-Package: netdata
-Architecture: any
-Depends: adduser,
-         libcap2-bin (>= 1:2.0),
-         lsb-base (>= 3.1-23.2),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: real-time charts for system monitoring
- Netdata is a daemon that collects data in realtime (per second)
- and presents a web site to view and analyze them. The presentation
- is also real-time and full of interactive charts that precisely
- render all collected values.
diff --git a/contrib/debian/control.wheezy b/contrib/debian/control.wheezy
deleted file mode 100644
index 4103908a..00000000
--- a/contrib/debian/control.wheezy
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: netdata
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
-               pkg-config,
-               dpkg-dev (>= 1.13.19),
-               zlib1g-dev,
-               uuid-dev
-Section: net
-Priority: optional
-Maintainer: Costa Tsaousis <costa@tsaousis.gr>
-Standards-Version: 3.9.6
-Homepage: https://github.com/firehol/netdata/wiki
-
-Package: netdata
-Architecture: any
-Depends: adduser,
-         libcap2-bin (>= 1:2.0),
-         lsb-base (>= 3.1-23.2),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: real-time charts for system monitoring
- Netdata is a daemon that collects data in realtime (per second)
- and presents a web site to view and analyze them. The presentation
- is also real-time and full of interactive charts that precisely
- render all collected values.
diff --git a/contrib/debian/copyright b/contrib/debian/copyright
deleted file mode 100644
index 11a3d639..00000000
--- a/contrib/debian/copyright
+++ /dev/null
@@ -1,10 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Netdata
-Upstream-Contact: Costa Tsaousis <costa@tsaousis.gr>
-Source: https://github.com/firehol/netdata
-
-Files: *
-Copyright: 2014-2016, Costa Tsaousis
-License: GPL-3+
- On Debian systems, the complete text of the GNU General Public
- License version 3 can be found in /usr/share/common-licenses/GPL-3.
diff --git a/contrib/debian/netdata.conf b/contrib/debian/netdata.conf
deleted file mode 100644
index a963d80b..00000000
--- a/contrib/debian/netdata.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# NetData Configuration
-
-# The current full configuration can be retrieved from the running
-# server at the URL
-#
-#   http://localhost:19999/netdata.conf
-#
-# for example:
-#
-#   wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
-#
-
-[global]
-	run as user = netdata
-	web files owner = root
-	web files group = netdata
diff --git a/contrib/debian/netdata.default b/contrib/debian/netdata.default
deleted file mode 100644
index 9e7f8ae6..00000000
--- a/contrib/debian/netdata.default
+++ /dev/null
@@ -1,5 +0,0 @@
-# Extra arguments to pass to netdata
-#
-#EXTRA_OPTS=""
-#uncomment following line if you are building a wheezy-package
-#EXTRA_OPTS="-P /var/run/netdata.pid"
diff --git a/contrib/debian/netdata.docs b/contrib/debian/netdata.docs
deleted file mode 100644
index 56631abf..00000000
--- a/contrib/debian/netdata.docs
+++ /dev/null
@@ -1 +0,0 @@
-ChangeLog
diff --git a/contrib/debian/netdata.init b/contrib/debian/netdata.init
deleted file mode 100755
index c1b2b74d..00000000
--- a/contrib/debian/netdata.init
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-# Start/stop the netdata daemon.
-#
-### BEGIN INIT INFO
-# Provides:          netdata
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
-# Should-Start:      $network
-# Should-Stop:       $network
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Real-time charts for system monitoring
-# Description:       Netdata is a daemon that collects data in realtime (per second)
-#                    and presents a web site to view and analyze them. The presentation
-#                    is also real-time and full of interactive charts that precisely
-#                    render all collected values.
-### END INIT INFO
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-DESC="netdata daemon"
-NAME=netdata
-DAEMON=/usr/sbin/netdata
-PIDFILE=/var/run/netdata/netdata.pid
-SCRIPTNAME=/etc/init.d/"$NAME"
-
-test -f $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-
-[ -r /etc/default/netdata ] && . /etc/default/netdata
-
-case "$1" in
-start)	log_daemon_msg "Starting real-time system monitoring" "netdata"
-        start_daemon -p $PIDFILE $DAEMON $EXTRA_OPTS
-        log_end_msg $?
-	;;
-stop)	log_daemon_msg "Stopping real-time system monitoring" "netdata"
-        killproc -p $PIDFILE $DAEMON
-        RETVAL=$?
-        [ $RETVAL -eq 0 ] && [ -e "$PIDFILE" ] && rm -f $PIDFILE
-        log_end_msg $RETVAL
-	# wait for plugins to exit
-	sleep 1
-        ;;
-restart|force-reload) log_daemon_msg "Restarting real-time system monitoring" "netdata"
-        $0 stop
-        $0 start
-        ;;
-status)
-        status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
-        ;;
-*)	log_action_msg "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}"
-        exit 2
-        ;;
-esac
-exit 0
diff --git a/contrib/debian/netdata.install b/contrib/debian/netdata.install
deleted file mode 100644
index 45d42b63..00000000
--- a/contrib/debian/netdata.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/netdata.conf /etc/netdata/
diff --git a/contrib/debian/netdata.lintian-overrides b/contrib/debian/netdata.lintian-overrides
deleted file mode 100644
index 45b2d868..00000000
--- a/contrib/debian/netdata.lintian-overrides
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# See Debian policy 10.9. apps.plugin has extra capabilities, so don't let
-# normal users run it.
-netdata: non-standard-executable-perm usr/lib/*/netdata/plugins.d/apps.plugin 0754 != 0755
-
-
-# FontAwesome is at least in the fonts-font-awesome package, but this is
-# not available in wheezy. glyphicons-halflings-regular isn't currently in
-# a Debian package. Therefore don't complain about shipping them with netdata
-# for the time being.
-netdata: duplicate-font-file usr/share/netdata/fonts/*
-netdata: font-in-non-font-package usr/share/netdata/fonts/*
-
-# Files here are marked as conffiles so that local updates to the html files
-# isn't clobbered on upgrade.
-netdata: non-etc-file-marked-as-conffile var/lib/netdata/www/*
diff --git a/contrib/debian/netdata.postinst.in b/contrib/debian/netdata.postinst.in
deleted file mode 100644
index 5a4e41af..00000000
--- a/contrib/debian/netdata.postinst.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-  configure)
-        if [ -z "$2" ]; then
-          if ! getent group netdata >/dev/null; then
-              addgroup --quiet --system netdata
-          fi
-
-          if ! getent passwd netdata >/dev/null; then
-              adduser --quiet --system --ingroup netdata --home /var/lib/netdata --no-create-home netdata
-          fi
-
-          if ! dpkg-statoverride --list /var/lib/netdata >/dev/null 2>&1; then
-              dpkg-statoverride --update --add root netdata 0755 /var/lib/netdata
-          fi
-
-          if ! dpkg-statoverride --list /var/lib/netdata/www >/dev/null 2>&1; then
-              dpkg-statoverride --update --add root netdata 0755 /var/lib/netdata/www
-          fi
-
-          if ! dpkg-statoverride --list /var/cache/netdata >/dev/null 2>&1; then
-              dpkg-statoverride --update --add netdata netdata 0755 /var/cache/netdata
-          fi
-
-        fi
-
-        chown -R root:netdata /usr/share/netdata/*
-        chown -R root:netdata /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d
-        setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/@DEB_HOST_MULTIARCH@/netdata/plugins.d/apps.plugin
-
-#PERMS#
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/contrib/debian/netdata.postrm b/contrib/debian/netdata.postrm
deleted file mode 100644
index 4ab4eead..00000000
--- a/contrib/debian/netdata.postrm
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-set -e
-
-case "$1" in
-	remove)
-		;;
-
-	purge)
-		if dpkg-statoverride --list | grep -qw /var/cache/netdata; then
-			dpkg-statoverride --remove /var/cache/netdata
-		fi
-
-		if dpkg-statoverride --list | grep -qw /var/lib/netdata/www; then
-			dpkg-statoverride --remove /var/lib/netdata/www
-		fi
-
-		if dpkg-statoverride --list | grep -qw /var/lib/netdata; then
-			dpkg-statoverride --remove /var/lib/netdata
-		fi
-
-		if getent passwd netdata >/dev/null; then
-			if [ -x /usr/sbin/deluser ]; then
-				deluser --quiet --system netdata || echo "Unable to remove netdata user"
-			fi
-		fi
-
-		if getent group netdata >/dev/null; then
-			if [ -x /usr/sbin/delgroup ]; then
-				delgroup --quiet --system netdata || echo "Unable to remove netdata group"
-			fi
-		fi
-
-		;;
-
-	*)
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
diff --git a/contrib/debian/netdata.service b/contrib/debian/netdata.service
deleted file mode 100644
index e62ce4ed..00000000
--- a/contrib/debian/netdata.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=netdata real-time system monitoring
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/default/netdata
-ExecStart=/usr/sbin/netdata -nd $EXTRA_OPTS
-TimeoutStopSec=30
-Restart=always
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
diff --git a/contrib/debian/rules b/contrib/debian/rules
deleted file mode 100755
index ec4ec418..00000000
--- a/contrib/debian/rules
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/make -f
-
-# Find the arch we are building for, as this determines
-# the location of plugins in /usr/lib
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-TOP = $(CURDIR)/debian/netdata
-
-%:
-	# For jessie and beyond
-	#
-	dh $@ --with autoreconf,systemd
-
-	# For wheezy or other non-systemd distributions use the following. You
-	# should also see contrib/README.md which gives details of updates to
-	# make to debian/control.
-	#
-	#dh $@ --with autoreconf
-
-override_dh_auto_configure:
-	dh_auto_configure -- --with-math --with-webdir=/var/lib/netdata/www
-
-debian/%.postinst: debian/%.postinst.in
-	sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
-
-override_dh_install: debian/netdata.postinst
-	dh_install
-
-	# Remove unneeded .keep files
-	#
-	find "$(TOP)" -name .keep -exec rm '{}' ';'
-
-	# Move files that local user shouldn't be editing to /usr/share/netdata
-	#
-	mkdir -p "$(TOP)/usr/share/netdata"
-	for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type d -printf '%f '); do \
-		echo Relocating $$D; \
-		mv "$(TOP)/var/lib/netdata/www/$$D" "$(TOP)/usr/share/netdata/$$D"; \
-		ln -s "/usr/share/netdata/$$D" "$(TOP)/var/lib/netdata/www/$$D"; \
-	done
-
-	# Update postinst to set correct group for www files on installation.
-	# Should probably be dpkg-statoverride really, but that gets *really*
-	# messy. We also set all web files in /var as conffiles so an upgrade
-	# doesn't splat them.
-	#
-	for D in $$(find "$(TOP)/var/lib/netdata/www/" -maxdepth 1 -type f -printf '%f '); do \
-		echo Updating postinst for $$D; \
-		sed -i "s/^#PERMS#/chgrp netdata \/var\/lib\/netdata\/www\/$$D\n#PERMS#/g" \
-			$(CURDIR)/debian/netdata.postinst; \
-		echo "/var/lib/netdata/www/$$D" >> $(CURDIR)/debian/netdata.conffiles; \
-	done
-	sed -i "/^#PERMS#/d" $(CURDIR)/debian/netdata.postinst
-
-override_dh_installdocs:
-	dh_installdocs
-
-	# Docs should not be under /usr/lib
-	#
-	mv $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/README.md \
-		$(TOP)/usr/share/doc/netdata/README.plugins.md
-	mv $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/charts.d/README.md \
-		$(TOP)/usr/share/doc/netdata/README.charts.md
-
-	# This doc is currently empty, so no point installing it.
-	#
-	rm $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/node.d/README.md
-
-override_dh_fixperms:
-	dh_fixperms
-
-	# apps.plugin should only be runnable by the netdata user. It will be
-	# given extra capabilities in the postinst script.
-	#
-	chmod 0754 $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/plugins.d/apps.plugin
-
-override_dh_installlogrotate:
-	cp system/netdata.logrotate debian/netdata.logrotate
-	dh_installlogrotate
-
-override_dh_clean:
-	dh_clean
-
-	# Tidy up copied/generated files
-	#
-	-[ -r $(CURDIR)/debian/netdata.logrotate ] && rm $(CURDIR)/debian/netdata.logrotate
-	-[ -r $(CURDIR)/debian/netdata.postinst ] && rm $(CURDIR)/debian/netdata.postinst
-	-[ -r $(CURDIR)/debian/netdata.conffiles ] && rm $(CURDIR)/debian/netdata.conffiles
diff --git a/contrib/debian/source/format b/contrib/debian/source/format
deleted file mode 100644
index 89ae9db8..00000000
--- a/contrib/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)