Update package to be closer to community package

7 files changed, 325 insertions, 147 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 029cf7eacbbb..63686fa880fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,124 +1,160 @@
 # Generated by mksrcinfo v8
-# Mon Apr  3 14:00:07 UTC 2017
+# Mon Mar 26 21:48:16 UTC 2018
 pkgbase = netdata-git
-	pkgdesc = Real-time performance monitoring, in the greatest possible detail, over the web.
-	pkgver = v1.6.0.r111.g4580de5e
+	pkgdesc = Real-time performance monitoring, in the greatest possible detail, over the web
+	pkgver = v1.9.0.r709.g8476fa89
 	pkgrel = 1
 	url = https://github.com/firehol/netdata/wiki
-	install = netdata-git.install
-	arch = i686
+	install = netdata.install
 	arch = x86_64
 	license = GPL
-	depends = libutil-linux
 	depends = libmnl
 	depends = libnetfilter_acct
 	depends = zlib
-	optdepends = nodejs: Webbox plugin
-	optdepends = lm_sensors: sensors module
-	optdepends = libcap: apps plugin
+	optdepends = nodejs: for monitoring named and SNMP devices
+	optdepends = lm_sensors: for monitoring hardware sensors
+	optdepends = iproute2: for monitoring Linux QoS
+	optdepends = python: for most of the external plugins
+	optdepends = python-psycopg2: for monitoring PostgreSQL databases
+	optdepends = python-requests: for monitoring elasticsearch
+	optdepends = hddtemp: for monitoring hhd temperature
+	optdepends = apcupsd: for monitoring APC UPS
+	optdepends = iw: for monitoring Linux as access point
 	provides = netdata
 	conflicts = netdata
-	backup = etc/netdata/health_email_recipients.conf
-	backup = etc/netdata/charts.d/cpu_apps.conf
-	backup = etc/netdata/charts.d/exim.conf
-	backup = etc/netdata/charts.d/nginx.conf
-	backup = etc/netdata/charts.d/cpufreq.conf
-	backup = etc/netdata/charts.d/squid.conf
-	backup = etc/netdata/charts.d/mem_apps.conf
-	backup = etc/netdata/charts.d/opensips.conf
 	backup = etc/netdata/charts.d/apache.conf
+	backup = etc/netdata/charts.d/apcupsd.conf
+	backup = etc/netdata/charts.d/cpufreq.conf
+	backup = etc/netdata/charts.d/exim.conf
+	backup = etc/netdata/charts.d/libreswan.conf
+	backup = etc/netdata/charts.d/load_average.conf
 	backup = etc/netdata/charts.d/mysql.conf
-	backup = etc/netdata/charts.d/example.conf
 	backup = etc/netdata/charts.d/nut.conf
-	backup = etc/netdata/charts.d/apcupsd.conf
-	backup = etc/netdata/charts.d/sensors.conf
-	backup = etc/netdata/charts.d/postfix.conf
-	backup = etc/netdata/charts.d/ap.conf
 	backup = etc/netdata/charts.d/phpfpm.conf
+	backup = etc/netdata/charts.d/sensors.conf
 	backup = etc/netdata/charts.d/tomcat.conf
-	backup = etc/netdata/charts.d/load_average.conf
+	backup = etc/netdata/charts.d/ap.conf
+	backup = etc/netdata/charts.d/cpu_apps.conf
+	backup = etc/netdata/charts.d/example.conf
 	backup = etc/netdata/charts.d/hddtemp.conf
-	backup = etc/netdata/health.d/web_log.conf
-	backup = etc/netdata/health.d/redis.conf
-	backup = etc/netdata/health.d/entropy.conf
+	backup = etc/netdata/charts.d/mem_apps.conf
+	backup = etc/netdata/charts.d/nginx.conf
+	backup = etc/netdata/charts.d/opensips.conf
+	backup = etc/netdata/charts.d/postfix.conf
+	backup = etc/netdata/charts.d/squid.conf
+	backup = etc/netdata/health.d/apache.conf
+	backup = etc/netdata/health.d/backend.conf
+	backup = etc/netdata/health.d/beanstalkd.conf
 	backup = etc/netdata/health.d/bind_rndc.conf
-	backup = etc/netdata/health.d/swap.conf
+	backup = etc/netdata/health.d/btrfs.conf
+	backup = etc/netdata/health.d/ceph.conf
+	backup = etc/netdata/health.d/cpu.conf
+	backup = etc/netdata/health.d/couchdb.conf
+	backup = etc/netdata/health.d/disks.conf
+	backup = etc/netdata/health.d/elasticsearch.conf
+	backup = etc/netdata/health.d/entropy.conf
 	backup = etc/netdata/health.d/fping.conf
-	backup = etc/netdata/health.d/zfs.conf
-	backup = etc/netdata/health.d/tcp_resets.conf
-	backup = etc/netdata/health.d/udp_errors.conf
-	backup = etc/netdata/health.d/varnish.conf
-	backup = etc/netdata/health.d/named.conf
-	backup = etc/netdata/health.d/backend.conf
-	backup = etc/netdata/health.d/nginx.conf
+	backup = etc/netdata/health.d/fronius.conf
 	backup = etc/netdata/health.d/haproxy.conf
-	backup = etc/netdata/health.d/cpu.conf
-	backup = etc/netdata/health.d/net.conf
-	backup = etc/netdata/health.d/retroshare.conf
-	backup = etc/netdata/health.d/isc_dhcpd.conf
-	backup = etc/netdata/health.d/qos.conf
-	backup = etc/netdata/health.d/squid.conf
-	backup = etc/netdata/health.d/ipfs.conf
+	backup = etc/netdata/health.d/httpcheck.conf
 	backup = etc/netdata/health.d/ipc.conf
-	backup = etc/netdata/health.d/memory.conf
-	backup = etc/netdata/health.d/postgres.conf
-	backup = etc/netdata/health.d/memcached.conf
+	backup = etc/netdata/health.d/ipfs.conf
 	backup = etc/netdata/health.d/ipmi.conf
-	backup = etc/netdata/health.d/apache.conf
-	backup = etc/netdata/health.d/mysql.conf
+	backup = etc/netdata/health.d/isc_dhcpd.conf
+	backup = etc/netdata/health.d/lighttpd.conf
 	backup = etc/netdata/health.d/mdstat.conf
-	backup = etc/netdata/health.d/elasticsearch.conf
+	backup = etc/netdata/health.d/memcached.conf
+	backup = etc/netdata/health.d/memory.conf
+	backup = etc/netdata/health.d/mongodb.conf
+	backup = etc/netdata/health.d/mysql.conf
+	backup = etc/netdata/health.d/named.conf
+	backup = etc/netdata/health.d/net.conf
 	backup = etc/netdata/health.d/netfilter.conf
-	backup = etc/netdata/health.d/disks.conf
+	backup = etc/netdata/health.d/nginx.conf
+	backup = etc/netdata/health.d/nginx_plus.conf
+	backup = etc/netdata/health.d/portcheck.conf
+	backup = etc/netdata/health.d/postgres.conf
+	backup = etc/netdata/health.d/qos.conf
 	backup = etc/netdata/health.d/ram.conf
+	backup = etc/netdata/health.d/redis.conf
+	backup = etc/netdata/health.d/retroshare.conf
 	backup = etc/netdata/health.d/softnet.conf
+	backup = etc/netdata/health.d/squid.conf
+	backup = etc/netdata/health.d/stiebeleltron.conf
+	backup = etc/netdata/health.d/swap.conf
+	backup = etc/netdata/health.d/tcp_conn.conf
+	backup = etc/netdata/health.d/tcp_listen.conf
+	backup = etc/netdata/health.d/tcp_mem.conf
+	backup = etc/netdata/health.d/tcp_orphans.conf
+	backup = etc/netdata/health.d/tcp_resets.conf
+	backup = etc/netdata/health.d/udp_errors.conf
+	backup = etc/netdata/health.d/varnish.conf
+	backup = etc/netdata/health.d/web_log.conf
+	backup = etc/netdata/health.d/zfs.conf
 	backup = etc/netdata/apps_groups.conf
-	backup = etc/netdata/fping.conf
-	backup = etc/netdata/node.d.conf
-	backup = etc/netdata/netdata.conf
-	backup = etc/netdata/python.d.conf
-	backup = etc/netdata/stream.conf
 	backup = etc/netdata/charts.d.conf
-	backup = etc/netdata/health_alarm_notify.conf
-	backup = etc/netdata/node.d/README.md
-	backup = etc/netdata/node.d/named.conf.md
-	backup = etc/netdata/node.d/snmp.conf.md
-	backup = etc/netdata/node.d/sma_webbox.conf.md
-	backup = etc/netdata/python.d/web_log.conf
-	backup = etc/netdata/python.d/nsd.conf
-	backup = etc/netdata/python.d/redis.conf
+	backup = etc/netdata/python.d/apache.conf
+	backup = etc/netdata/python.d/beanstalk.conf
 	backup = etc/netdata/python.d/bind_rndc.conf
-	backup = etc/netdata/python.d/ovpn_status_log.conf
-	backup = etc/netdata/python.d/varnish.conf
-	backup = etc/netdata/python.d/exim.conf
-	backup = etc/netdata/python.d/nginx.conf
-	backup = etc/netdata/python.d/haproxy.conf
-	backup = etc/netdata/python.d/dovecot.conf
+	backup = etc/netdata/python.d/ceph.conf
+	backup = etc/netdata/python.d/chrony.conf
+	backup = etc/netdata/python.d/couchdb.conf
 	backup = etc/netdata/python.d/cpufreq.conf
-	backup = etc/netdata/python.d/mongodb.conf
-	backup = etc/netdata/python.d/retroshare.conf
-	backup = etc/netdata/python.d/isc_dhcpd.conf
-	backup = etc/netdata/python.d/squid.conf
-	backup = etc/netdata/python.d/ipfs.conf
 	backup = etc/netdata/python.d/dns_query_time.conf
+	backup = etc/netdata/python.d/dnsdist.conf
+	backup = etc/netdata/python.d/dovecot.conf
+	backup = etc/netdata/python.d/elasticsearch.conf
+	backup = etc/netdata/python.d/example.conf
+	backup = etc/netdata/python.d/exim.conf
+	backup = etc/netdata/python.d/fail2ban.conf
 	backup = etc/netdata/python.d/freeradius.conf
-	backup = etc/netdata/python.d/postgres.conf
+	backup = etc/netdata/python.d/go_expvar.conf
+	backup = etc/netdata/python.d/haproxy.conf
+	backup = etc/netdata/python.d/hddtemp.conf
+	backup = etc/netdata/python.d/httpcheck.conf
+	backup = etc/netdata/python.d/icecast.conf
+	backup = etc/netdata/python.d/ipfs.conf
+	backup = etc/netdata/python.d/isc_dhcpd.conf
+	backup = etc/netdata/python.d/mdstat.conf
 	backup = etc/netdata/python.d/memcached.conf
-	backup = etc/netdata/python.d/apache.conf
+	backup = etc/netdata/python.d/mongodb.conf
 	backup = etc/netdata/python.d/mysql.conf
-	backup = etc/netdata/python.d/example.conf
-	backup = etc/netdata/python.d/mdstat.conf
-	backup = etc/netdata/python.d/elasticsearch.conf
-	backup = etc/netdata/python.d/smartd_log.conf
-	backup = etc/netdata/python.d/fail2ban.conf
-	backup = etc/netdata/python.d/sensors.conf
-	backup = etc/netdata/python.d/postfix.conf
+	backup = etc/netdata/python.d/nginx.conf
+	backup = etc/netdata/python.d/nginx_plus.conf
+	backup = etc/netdata/python.d/nsd.conf
+	backup = etc/netdata/python.d/ntpd.conf
+	backup = etc/netdata/python.d/ovpn_status_log.conf
 	backup = etc/netdata/python.d/phpfpm.conf
+	backup = etc/netdata/python.d/portcheck.conf
+	backup = etc/netdata/python.d/postfix.conf
+	backup = etc/netdata/python.d/postgres.conf
+	backup = etc/netdata/python.d/powerdns.conf
+	backup = etc/netdata/python.d/rabbitmq.conf
+	backup = etc/netdata/python.d/redis.conf
+	backup = etc/netdata/python.d/retroshare.conf
+	backup = etc/netdata/python.d/samba.conf
+	backup = etc/netdata/python.d/sensors.conf
+	backup = etc/netdata/python.d/springboot.conf
+	backup = etc/netdata/python.d/squid.conf
+	backup = etc/netdata/python.d/smartd_log.conf
 	backup = etc/netdata/python.d/tomcat.conf
-	backup = etc/netdata/python.d/apache_cache.conf
-	backup = etc/netdata/python.d/hddtemp.conf
+	backup = etc/netdata/python.d/traefik.conf
+	backup = etc/netdata/python.d/varnish.conf
+	backup = etc/netdata/python.d/web_log.conf
+	backup = etc/netdata/fping.conf
+	backup = etc/netdata/node.d.conf
+	backup = etc/netdata/python.d.conf
+	backup = etc/netdata/health_alarm_notify.conf
+	backup = etc/netdata/health_email_recipients.conf
+	backup = etc/netdata/stream.conf
+	backup = etc/netdata/statsd.d/example.conf
+	backup = etc/netdata/netdata.conf
 	source = netdata::git+https://github.com/firehol/netdata
-	md5sums = SKIP
+	source = netdata.tmpfiles
+	source = netdata.sysusers
+	sha512sums = SKIP
+	sha512sums = 3f934ddd1f5248f9e11c29050c023d60b76e4098ec9c8d413bb362d43e9242f767fd58310d966076e8400779af8bda2459afcc314b267fcb9f1c84173e14e313
+	sha512sums = a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66
 
 pkgname = netdata-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..77e5c6d7eb9e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/pkg/
+/src/
+/netdata/
+/netdata-git-*.pkg.*
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 190c9025aa5d..59a6732361b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,197 @@
-# Maintainer: SanskritFritz (gmail)
+# Maintainer: Chris Hobbs (RX14) <chris@rx14.co.uk>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: SanskritFritz (gmail)
 
 pkgname=netdata-git
 _gitname=netdata
-pkgver=v1.6.0.r111.g4580de5e
+pkgver=v1.9.0.r709.g8476fa89
 pkgrel=1
-pkgdesc="Real-time performance monitoring, in the greatest possible detail, over the web."
+pkgdesc="Real-time performance monitoring, in the greatest possible detail, over the web"
 url="https://github.com/firehol/netdata/wiki"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL')
-depends=('libutil-linux' 'libmnl' 'libnetfilter_acct' 'zlib')
-optdepends=('nodejs: Webbox plugin'
-            'lm_sensors: sensors module'
-            'libcap: apps plugin')
-source=("$_gitname::git+https://github.com/firehol/netdata")
+depends=('libmnl' 'libnetfilter_acct' 'zlib')
+optdepends=('nodejs: for monitoring named and SNMP devices'
+            'lm_sensors: for monitoring hardware sensors'
+            'iproute2: for monitoring Linux QoS'
+            'python: for most of the external plugins'
+            'python-psycopg2: for monitoring PostgreSQL databases'
+            'python-requests: for monitoring elasticsearch'
+            'hddtemp: for monitoring hhd temperature'
+            'apcupsd: for monitoring APC UPS'
+            'iw: for monitoring Linux as access point')
+source=("$_gitname::git+https://github.com/firehol/netdata"
+        "${_gitname}.tmpfiles"
+        "${_gitname}.sysusers")
 provides=('netdata')
 conflicts=('netdata')
-install="$pkgname.install"
+install="$_gitname.install"
+sha512sums=('SKIP'
+            '3f934ddd1f5248f9e11c29050c023d60b76e4098ec9c8d413bb362d43e9242f767fd58310d966076e8400779af8bda2459afcc314b267fcb9f1c84173e14e313'
+            'a910809a823ba58ca7bdaa72e8d68427b48f452c1fbb2343fa182ecb0a091a7640e73af24b8ba2fdd90e00aed8ef53b7fccd25cb8f04ca9b9fa6c8e52223ca66')
 
 pkgver() {
-	cd "$_gitname"
-	git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "$_gitname"
+  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-	cd "$_gitname"
-
-	./autogen.sh
-	./configure \
-		--prefix="/usr" \
-		--sbindir="/usr/bin" \
-		--sysconfdir="/etc" \
-		--libexecdir="/usr/lib" \
-		--localstatedir="/var" \
-		--with-zlib --with-math --with-user=netdata \
-		CFLAGS="-O3"
-	make
+  cd "$_gitname"
+
+  ./autogen.sh
+  ./configure \
+    --prefix="/usr" \
+    --sbindir="/usr/bin" \
+    --sysconfdir="/etc" \
+    --libexecdir="/usr/lib" \
+    --localstatedir="/var" \
+    --with-zlib --with-math --with-user=netdata
+  make
 }
 
 package() {
-	cd "$_gitname"
+  cd "$_gitname"
 
-	make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
-	touch "$pkgdir/etc/netdata/netdata.conf"
- 	install -Dm0644 "system/netdata.service" "$pkgdir/usr/lib/systemd/system/netdata.service"
-}
+  # Remove /var/*, pacman creates it via tmpfiles hook
+  rm -vrf "${pkgdir}/var"
+  touch "$pkgdir/etc/netdata/netdata.conf"
+  chown -R 134:134 "$pkgdir"/etc/netdata
+  chown -R 134:134 "$pkgdir"/usr/share/netdata/web
 
-md5sums=('SKIP')
+  install -Dm0644 "system/netdata.service" "$pkgdir/usr/lib/systemd/system/netdata.service"
+  install -Dm0644 "system/netdata.logrotate" "$pkgdir/etc/logrotate.d/netdata"
+  install -Dm0644 "${srcdir}/${_gitname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${_gitname}.conf"
+  install -Dm0644 "${srcdir}/${_gitname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${_gitname}.conf"
+}
 
-# find pkg/netdata-git/etc/netdata -type f | cut -c '17-' | awk '{line=line $0 " "} END{print "backup=(" line ")"}' >> PKGBUILD
-backup=(etc/netdata/health_email_recipients.conf etc/netdata/charts.d/cpu_apps.conf etc/netdata/charts.d/exim.conf etc/netdata/charts.d/nginx.conf etc/netdata/charts.d/cpufreq.conf etc/netdata/charts.d/squid.conf etc/netdata/charts.d/mem_apps.conf etc/netdata/charts.d/opensips.conf etc/netdata/charts.d/apache.conf etc/netdata/charts.d/mysql.conf etc/netdata/charts.d/example.conf etc/netdata/charts.d/nut.conf etc/netdata/charts.d/apcupsd.conf etc/netdata/charts.d/sensors.conf etc/netdata/charts.d/postfix.conf etc/netdata/charts.d/ap.conf etc/netdata/charts.d/phpfpm.conf etc/netdata/charts.d/tomcat.conf etc/netdata/charts.d/load_average.conf etc/netdata/charts.d/hddtemp.conf etc/netdata/health.d/web_log.conf etc/netdata/health.d/redis.conf etc/netdata/health.d/entropy.conf etc/netdata/health.d/bind_rndc.conf etc/netdata/health.d/swap.conf etc/netdata/health.d/fping.conf etc/netdata/health.d/zfs.conf etc/netdata/health.d/tcp_resets.conf etc/netdata/health.d/udp_errors.conf etc/netdata/health.d/varnish.conf etc/netdata/health.d/named.conf etc/netdata/health.d/backend.conf etc/netdata/health.d/nginx.conf etc/netdata/health.d/haproxy.conf etc/netdata/health.d/cpu.conf etc/netdata/health.d/net.conf etc/netdata/health.d/retroshare.conf etc/netdata/health.d/isc_dhcpd.conf etc/netdata/health.d/qos.conf etc/netdata/health.d/squid.conf etc/netdata/health.d/ipfs.conf etc/netdata/health.d/ipc.conf etc/netdata/health.d/memory.conf etc/netdata/health.d/postgres.conf etc/netdata/health.d/memcached.conf etc/netdata/health.d/ipmi.conf etc/netdata/health.d/apache.conf etc/netdata/health.d/mysql.conf etc/netdata/health.d/mdstat.conf etc/netdata/health.d/elasticsearch.conf etc/netdata/health.d/netfilter.conf etc/netdata/health.d/disks.conf etc/netdata/health.d/ram.conf etc/netdata/health.d/softnet.conf etc/netdata/apps_groups.conf etc/netdata/fping.conf etc/netdata/node.d.conf etc/netdata/netdata.conf etc/netdata/python.d.conf etc/netdata/stream.conf etc/netdata/charts.d.conf etc/netdata/health_alarm_notify.conf etc/netdata/node.d/README.md etc/netdata/node.d/named.conf.md etc/netdata/node.d/snmp.conf.md etc/netdata/node.d/sma_webbox.conf.md etc/netdata/python.d/web_log.conf etc/netdata/python.d/nsd.conf etc/netdata/python.d/redis.conf etc/netdata/python.d/bind_rndc.conf etc/netdata/python.d/ovpn_status_log.conf etc/netdata/python.d/varnish.conf etc/netdata/python.d/exim.conf etc/netdata/python.d/nginx.conf etc/netdata/python.d/haproxy.conf etc/netdata/python.d/dovecot.conf etc/netdata/python.d/cpufreq.conf etc/netdata/python.d/mongodb.conf etc/netdata/python.d/retroshare.conf etc/netdata/python.d/isc_dhcpd.conf etc/netdata/python.d/squid.conf etc/netdata/python.d/ipfs.conf etc/netdata/python.d/dns_query_time.conf etc/netdata/python.d/freeradius.conf etc/netdata/python.d/postgres.conf etc/netdata/python.d/memcached.conf etc/netdata/python.d/apache.conf etc/netdata/python.d/mysql.conf etc/netdata/python.d/example.conf etc/netdata/python.d/mdstat.conf etc/netdata/python.d/elasticsearch.conf etc/netdata/python.d/smartd_log.conf etc/netdata/python.d/fail2ban.conf etc/netdata/python.d/sensors.conf etc/netdata/python.d/postfix.conf etc/netdata/python.d/phpfpm.conf etc/netdata/python.d/tomcat.conf etc/netdata/python.d/apache_cache.conf etc/netdata/python.d/hddtemp.conf )
+backup=(
+  etc/netdata/charts.d/apache.conf
+  etc/netdata/charts.d/apcupsd.conf
+  etc/netdata/charts.d/cpufreq.conf
+  etc/netdata/charts.d/exim.conf
+  etc/netdata/charts.d/libreswan.conf
+  etc/netdata/charts.d/load_average.conf
+  etc/netdata/charts.d/mysql.conf
+  etc/netdata/charts.d/nut.conf
+  etc/netdata/charts.d/phpfpm.conf
+  etc/netdata/charts.d/sensors.conf
+  etc/netdata/charts.d/tomcat.conf
+  etc/netdata/charts.d/ap.conf
+  etc/netdata/charts.d/cpu_apps.conf
+  etc/netdata/charts.d/example.conf
+  etc/netdata/charts.d/hddtemp.conf
+  etc/netdata/charts.d/mem_apps.conf
+  etc/netdata/charts.d/nginx.conf
+  etc/netdata/charts.d/opensips.conf
+  etc/netdata/charts.d/postfix.conf
+  etc/netdata/charts.d/squid.conf
+  etc/netdata/health.d/apache.conf
+  etc/netdata/health.d/backend.conf
+  etc/netdata/health.d/beanstalkd.conf
+  etc/netdata/health.d/bind_rndc.conf
+  etc/netdata/health.d/btrfs.conf
+  etc/netdata/health.d/ceph.conf
+  etc/netdata/health.d/cpu.conf
+  etc/netdata/health.d/couchdb.conf
+  etc/netdata/health.d/disks.conf
+  etc/netdata/health.d/elasticsearch.conf
+  etc/netdata/health.d/entropy.conf
+  etc/netdata/health.d/fping.conf
+  etc/netdata/health.d/fronius.conf
+  etc/netdata/health.d/haproxy.conf
+  etc/netdata/health.d/httpcheck.conf
+  etc/netdata/health.d/ipc.conf
+  etc/netdata/health.d/ipfs.conf
+  etc/netdata/health.d/ipmi.conf
+  etc/netdata/health.d/isc_dhcpd.conf
+  etc/netdata/health.d/lighttpd.conf
+  etc/netdata/health.d/mdstat.conf
+  etc/netdata/health.d/memcached.conf
+  etc/netdata/health.d/memory.conf
+  etc/netdata/health.d/mongodb.conf
+  etc/netdata/health.d/mysql.conf
+  etc/netdata/health.d/named.conf
+  etc/netdata/health.d/net.conf
+  etc/netdata/health.d/netfilter.conf
+  etc/netdata/health.d/nginx.conf
+  etc/netdata/health.d/nginx_plus.conf
+  etc/netdata/health.d/portcheck.conf
+  etc/netdata/health.d/postgres.conf
+  etc/netdata/health.d/qos.conf
+  etc/netdata/health.d/ram.conf
+  etc/netdata/health.d/redis.conf
+  etc/netdata/health.d/retroshare.conf
+  etc/netdata/health.d/softnet.conf
+  etc/netdata/health.d/squid.conf
+  etc/netdata/health.d/stiebeleltron.conf
+  etc/netdata/health.d/swap.conf
+  etc/netdata/health.d/tcp_conn.conf
+  etc/netdata/health.d/tcp_listen.conf
+  etc/netdata/health.d/tcp_mem.conf
+  etc/netdata/health.d/tcp_orphans.conf
+  etc/netdata/health.d/tcp_resets.conf
+  etc/netdata/health.d/udp_errors.conf
+  etc/netdata/health.d/varnish.conf
+  etc/netdata/health.d/web_log.conf
+  etc/netdata/health.d/zfs.conf
+  etc/netdata/apps_groups.conf
+  etc/netdata/charts.d.conf
+  etc/netdata/python.d/apache.conf
+  etc/netdata/python.d/beanstalk.conf
+  etc/netdata/python.d/bind_rndc.conf
+  etc/netdata/python.d/ceph.conf
+  etc/netdata/python.d/chrony.conf
+  etc/netdata/python.d/couchdb.conf
+  etc/netdata/python.d/cpufreq.conf
+  etc/netdata/python.d/dns_query_time.conf
+  etc/netdata/python.d/dnsdist.conf
+  etc/netdata/python.d/dovecot.conf
+  etc/netdata/python.d/elasticsearch.conf
+  etc/netdata/python.d/example.conf
+  etc/netdata/python.d/exim.conf
+  etc/netdata/python.d/fail2ban.conf
+  etc/netdata/python.d/freeradius.conf
+  etc/netdata/python.d/go_expvar.conf
+  etc/netdata/python.d/haproxy.conf
+  etc/netdata/python.d/hddtemp.conf
+  etc/netdata/python.d/httpcheck.conf
+  etc/netdata/python.d/icecast.conf
+  etc/netdata/python.d/ipfs.conf
+  etc/netdata/python.d/isc_dhcpd.conf
+  etc/netdata/python.d/mdstat.conf
+  etc/netdata/python.d/memcached.conf
+  etc/netdata/python.d/mongodb.conf
+  etc/netdata/python.d/mysql.conf
+  etc/netdata/python.d/nginx.conf
+  etc/netdata/python.d/nginx_plus.conf
+  etc/netdata/python.d/nsd.conf
+  etc/netdata/python.d/ntpd.conf
+  etc/netdata/python.d/ovpn_status_log.conf
+  etc/netdata/python.d/phpfpm.conf
+  etc/netdata/python.d/portcheck.conf
+  etc/netdata/python.d/postfix.conf
+  etc/netdata/python.d/postgres.conf
+  etc/netdata/python.d/powerdns.conf
+  etc/netdata/python.d/rabbitmq.conf
+  etc/netdata/python.d/redis.conf
+  etc/netdata/python.d/retroshare.conf
+  etc/netdata/python.d/samba.conf
+  etc/netdata/python.d/sensors.conf
+  etc/netdata/python.d/springboot.conf
+  etc/netdata/python.d/squid.conf
+  etc/netdata/python.d/smartd_log.conf
+  etc/netdata/python.d/tomcat.conf
+  etc/netdata/python.d/traefik.conf
+  etc/netdata/python.d/varnish.conf
+  etc/netdata/python.d/web_log.conf
+  etc/netdata/fping.conf
+  etc/netdata/node.d.conf
+  etc/netdata/python.d.conf
+  etc/netdata/health_alarm_notify.conf
+  etc/netdata/health_email_recipients.conf
+  etc/netdata/stream.conf
+  etc/netdata/statsd.d/example.conf
+  etc/netdata/netdata.conf
+)
diff --git a/netdata-git.install b/netdata-git.install
deleted file mode 100644
index 7d76235c84b4..000000000000
--- a/netdata-git.install
+++ /dev/null
@@ -1,31 +0,0 @@
-chown_netdata() {
-	chown --recursive netdata:netdata /var/log/netdata
-	chown --recursive netdata:netdata /var/cache/netdata
-	chown --recursive netdata:netdata /usr/share/netdata/web
-	chown --recursive netdata:netdata /etc/netdata
-	chown --recursive netdata:netdata /var/lib/netdata
-}
-
-post_install() {
-	getent group netdata > /dev/null || groupadd -r netdata
-	getent passwd netdata > /dev/null || useradd -r -g netdata -c netdata -s /usr/bin/nologin -d / netdata
-
-	chown_netdata
-
-	echo
-	echo "After the daemon has been started for the first time,"
-	echo "download the default config file from"
-	echo "http://127.0.0.1:19999/netdata.conf"
-	echo
-	echo "Copy it to /etc/netdata/ and modify it."
-	echo
-}
-
-post_upgrade() {
-	chown_netdata
-}
-
-#pre_remove() {
-#	# This removes the group 'netdata' as well:
-#	userdel netdata
-#}
diff --git a/netdata.install b/netdata.install
new file mode 100644
index 000000000000..ada66ae3be52
--- /dev/null
+++ b/netdata.install
@@ -0,0 +1,20 @@
+setcap_netdata() {
+  #https://github.com/firehol/netdata/wiki/Apps-Plugin#apps-plugin-is-missing-information
+  setcap cap_dac_read_search,cap_sys_ptrace+ep /usr/lib/netdata/plugins.d/apps.plugin || chmod 1755 /usr/lib/netdata/plugins.d/apps.plugin
+}
+
+post_install() {
+	setcap_netdata
+
+	echo
+	echo "After the daemon has been started for the first time,"
+	echo "download the default config file from"
+	echo "http://127.0.0.1:19999/netdata.conf"
+	echo
+	echo "Copy it to /etc/netdata/ and modify it."
+	echo
+}
+
+post_upgrade() {
+	setcap_netdata
+}
diff --git a/netdata.sysusers b/netdata.sysusers
new file mode 100644
index 000000000000..5cb3b678873a
--- /dev/null
+++ b/netdata.sysusers
@@ -0,0 +1 @@
+u netdata 134 - /var/cache/netdata
diff --git a/netdata.tmpfiles b/netdata.tmpfiles
new file mode 100644
index 000000000000..85d4252264cf
--- /dev/null
+++ b/netdata.tmpfiles
@@ -0,0 +1,3 @@
+d /var/lib/netdata 0750 netdata netdata
+d /var/log/netdata 0750 netdata netdata
+d /var/cache/netdata 0750 netdata netdata