134 files changed, 774 insertions, 507 deletions

diff --git a/conf.d/apps_groups.conf b/collectors/apps.plugin/apps_groups.conf
index 4356e4910..c0d22fac9 100644
--- a/conf.d/apps_groups.conf
+++ b/collectors/apps.plugin/apps_groups.conf
@@ -107,15 +107,16 @@ timedb: prometheus *carbon-cache.py* *carbon-aggregator.py* *graphite/manage.py*
 # -----------------------------------------------------------------------------
 # email servers
 
-email: dovecot imapd pop3d amavis* master zmstat* zmmailboxdmgr qmgr oqmgr saslauthd opendkim clamd freshclam unbound tlsmgr postfwd2 postscreen postfix smtp* lmtp*
+email: dovecot imapd pop3d amavis* master zmstat* zmmailboxdmgr qmgr oqmgr saslauthd opendkim clamd freshclam unbound tlsmgr postfwd2 postscreen postfix smtp* lmtp* sendmail
 
 # -----------------------------------------------------------------------------
 # network, routing, VPN
 
 ppp: ppp*
 vpn: openvpn pptp* cjdroute gvpe tincd
-wifi: hostapd wpa_supplicant
+wifi: hostapd wpa_supplicant NetworkManager
 routing: ospfd* ospf6d* bgpd isisd ripd ripngd pimd ldpd zebra vtysh bird*
+modem: ModemManager
 
 # -----------------------------------------------------------------------------
 # high availability and balancers
@@ -162,7 +163,7 @@ VMs: vbox* VBox* qemu*
 # -----------------------------------------------------------------------------
 # ssh servers and clients
 
-ssh: ssh* scp
+ssh: ssh* scp dropbear
 
 # -----------------------------------------------------------------------------
 # print servers and clients
@@ -172,7 +173,7 @@ print: cups* lpd lpq
 # -----------------------------------------------------------------------------
 # time servers and clients
 
-time: ntp* systemd-timesyncd
+time: ntp* systemd-timesyncd chronyd
 
 # -----------------------------------------------------------------------------
 # dhcp servers and clients
@@ -257,13 +258,14 @@ airflow: *airflow*
 X: X Xorg xinit lightdm xdm pulseaudio gkrellm xfwm4 xfdesktop xfce* Thunar
 X: xfsettingsd xfconfd gnome-* gdm gconf* dconf* xfconf* *gvfs gvfs* kdm slim
 X: evolution-* firefox chromium opera vivaldi-bin epiphany WebKit*
+X: '*systemd --user*' chrome *chrome-sandbox* *google-chrome* *chromium* *firefox*
 
 # -----------------------------------------------------------------------------
 # Kernel / System
 
 ksmd: ksmd
 
-system: systemd* udisks* udevd* *udevd connmand ipv6_addrconf dbus-* rtkit*
+system: systemd-* udisks* udevd* *udevd connmand ipv6_addrconf dbus-* rtkit*
 system: inetd xinetd mdadm polkitd acpid uuidd packagekitd upowerd colord
 system: accounts-daemon rngd haveged
 
@@ -280,3 +282,5 @@ rabbitmq: *rabbitmq*
 sidekiq: *sidekiq*
 java: java
 ipfs: ipfs
+
+node: node
diff --git a/conf.d/charts.d/ap.conf b/collectors/charts.d.plugin/ap/ap.conf
index 38fc157ce..38fc157ce 100644
--- a/conf.d/charts.d/ap.conf
+++ b/collectors/charts.d.plugin/ap/ap.conf
diff --git a/conf.d/charts.d/apache.conf b/collectors/charts.d.plugin/apache/apache.conf
index 50914cf32..50914cf32 100644
--- a/conf.d/charts.d/apache.conf
+++ b/collectors/charts.d.plugin/apache/apache.conf
diff --git a/conf.d/charts.d/apcupsd.conf b/collectors/charts.d.plugin/apcupsd/apcupsd.conf
index 679c0d61b..679c0d61b 100644
--- a/conf.d/charts.d/apcupsd.conf
+++ b/collectors/charts.d.plugin/apcupsd/apcupsd.conf
diff --git a/conf.d/charts.d.conf b/collectors/charts.d.plugin/charts.d.conf
index acb2a6fae..acb2a6fae 100644
--- a/conf.d/charts.d.conf
+++ b/collectors/charts.d.plugin/charts.d.conf
diff --git a/conf.d/charts.d/cpu_apps.conf b/collectors/charts.d.plugin/cpu_apps/cpu_apps.conf
index 850cd0c6f..850cd0c6f 100644
--- a/conf.d/charts.d/cpu_apps.conf
+++ b/collectors/charts.d.plugin/cpu_apps/cpu_apps.conf
diff --git a/conf.d/charts.d/cpufreq.conf b/collectors/charts.d.plugin/cpufreq/cpufreq.conf
index 7130555af..7130555af 100644
--- a/conf.d/charts.d/cpufreq.conf
+++ b/collectors/charts.d.plugin/cpufreq/cpufreq.conf
diff --git a/conf.d/charts.d/example.conf b/collectors/charts.d.plugin/example/example.conf
index 6232ca584..6232ca584 100644
--- a/conf.d/charts.d/example.conf
+++ b/collectors/charts.d.plugin/example/example.conf
diff --git a/conf.d/charts.d/exim.conf b/collectors/charts.d.plugin/exim/exim.conf
index f96ac4dbb..f96ac4dbb 100644
--- a/conf.d/charts.d/exim.conf
+++ b/collectors/charts.d.plugin/exim/exim.conf
diff --git a/conf.d/charts.d/hddtemp.conf b/collectors/charts.d.plugin/hddtemp/hddtemp.conf
index b6037b40e..b6037b40e 100644
--- a/conf.d/charts.d/hddtemp.conf
+++ b/collectors/charts.d.plugin/hddtemp/hddtemp.conf
diff --git a/conf.d/charts.d/libreswan.conf b/collectors/charts.d.plugin/libreswan/libreswan.conf
index 9b3ee77b7..9b3ee77b7 100644
--- a/conf.d/charts.d/libreswan.conf
+++ b/collectors/charts.d.plugin/libreswan/libreswan.conf
diff --git a/conf.d/charts.d/load_average.conf b/collectors/charts.d.plugin/load_average/load_average.conf
index 68979275f..68979275f 100644
--- a/conf.d/charts.d/load_average.conf
+++ b/collectors/charts.d.plugin/load_average/load_average.conf
diff --git a/conf.d/charts.d/mem_apps.conf b/collectors/charts.d.plugin/mem_apps/mem_apps.conf
index 75d24dc3e..75d24dc3e 100644
--- a/conf.d/charts.d/mem_apps.conf
+++ b/collectors/charts.d.plugin/mem_apps/mem_apps.conf
diff --git a/conf.d/charts.d/mysql.conf b/collectors/charts.d.plugin/mysql/mysql.conf
index 683e4af35..683e4af35 100644
--- a/conf.d/charts.d/mysql.conf
+++ b/collectors/charts.d.plugin/mysql/mysql.conf
diff --git a/conf.d/charts.d/nginx.conf b/collectors/charts.d.plugin/nginx/nginx.conf
index c46100a58..c46100a58 100644
--- a/conf.d/charts.d/nginx.conf
+++ b/collectors/charts.d.plugin/nginx/nginx.conf
diff --git a/conf.d/charts.d/nut.conf b/collectors/charts.d.plugin/nut/nut.conf
index d477ddd34..b95ad9048 100644
--- a/conf.d/charts.d/nut.conf
+++ b/collectors/charts.d.plugin/nut/nut.conf
@@ -9,6 +9,11 @@
 # if empty, the list returned by 'upsc -l' will be used
 #nut_ups=
 
+# each line represents an alias for one UPS
+# if empty, the FQDN will be used
+#nut_names["FQDN1"]="alias"
+#nut_names["FQDN2"]="alias"
+
 # how much time in seconds, to wait for nut to respond
 #nut_timeout=2
 
diff --git a/conf.d/charts.d/opensips.conf b/collectors/charts.d.plugin/opensips/opensips.conf
index e25111dce..e25111dce 100644
--- a/conf.d/charts.d/opensips.conf
+++ b/collectors/charts.d.plugin/opensips/opensips.conf
diff --git a/conf.d/charts.d/phpfpm.conf b/collectors/charts.d.plugin/phpfpm/phpfpm.conf
index e4dd0231b..e4dd0231b 100644
--- a/conf.d/charts.d/phpfpm.conf
+++ b/collectors/charts.d.plugin/phpfpm/phpfpm.conf
diff --git a/conf.d/charts.d/postfix.conf b/collectors/charts.d.plugin/postfix/postfix.conf
index b77817bd6..b77817bd6 100644
--- a/conf.d/charts.d/postfix.conf
+++ b/collectors/charts.d.plugin/postfix/postfix.conf
diff --git a/conf.d/charts.d/sensors.conf b/collectors/charts.d.plugin/sensors/sensors.conf
index bcb28807d..bcb28807d 100644
--- a/conf.d/charts.d/sensors.conf
+++ b/collectors/charts.d.plugin/sensors/sensors.conf
diff --git a/conf.d/charts.d/squid.conf b/collectors/charts.d.plugin/squid/squid.conf
index 19e928f25..19e928f25 100644
--- a/conf.d/charts.d/squid.conf
+++ b/collectors/charts.d.plugin/squid/squid.conf
diff --git a/conf.d/charts.d/tomcat.conf b/collectors/charts.d.plugin/tomcat/tomcat.conf
index e9f3eefa9..e9f3eefa9 100644
--- a/conf.d/charts.d/tomcat.conf
+++ b/collectors/charts.d.plugin/tomcat/tomcat.conf
diff --git a/conf.d/fping.conf b/collectors/fping.plugin/fping.conf
index 63a7f7acd..63a7f7acd 100644
--- a/conf.d/fping.conf
+++ b/collectors/fping.plugin/fping.conf
diff --git a/conf.d/node.d/fronius.conf.md b/collectors/node.d.plugin/fronius/README.md
index 622086b27..dd2846990 100644
--- a/conf.d/node.d/fronius.conf.md
+++ b/collectors/node.d.plugin/fronius/README.md
@@ -1,3 +1,56 @@
+# fronius
+
+This module collects metrics from the configured solar power installation from Fronius Symo.
+
+**Requirements**
+ * Configuration file `fronius.conf` in the node.d netdata config dir (default: `/etc/netdata/node.d/fronius.conf`)
+ * Fronius Symo with network access (http)
+
+It produces per server:
+
+1. **Power**
+ * Current power input from the grid (positive values), output to the grid (negative values), in W
+ * Current power input from the solar panels, in W
+ * Current power stored in the accumulator (if present), in W (in theory, untested)
+
+2. **Consumption**
+ * Local consumption in W
+
+3. **Autonomy**
+ * Relative autonomy in %. 100 % autonomy means that the solar panels are delivering more power than it is needed by local consumption.
+ * Relative self consumption in %. The lower the better
+
+4. **Energy**
+ * The energy produced during the current day, in kWh
+ * The energy produced during the current year, in kWh
+
+5. **Inverter**
+ * The current power output from the connected inverters, in W, one dimension per inverter. At least one is always present.
+ 
+ 
+### configuration
+
+Sample:
+
+```json
+{
+    "enable_autodetect": false,
+    "update_every": 5,
+    "servers": [
+        {
+            "name": "Symo",
+            "hostname": "symo.ip.or.dns",
+            "update_every": 5,
+            "api_path": "/solar_api/v1/GetPowerFlowRealtimeData.fcgi"
+        }
+    ]
+}
+```
+
+If no configuration is given, the module will be disabled. Each `update_every` is optional, the default is `5`.
+
+---
+
 [Fronius Symo 8.2](https://www.fronius.com/en/photovoltaics/products/all-products/inverters/fronius-symo/fronius-symo-8-2-3-m)
 
 The plugin has been tested with a single inverter, namely Fronius Symo 8.2-3-M:
diff --git a/conf.d/node.d/named.conf.md b/collectors/node.d.plugin/named/README.md
index fa843dd58..977a5015f 100644
--- a/conf.d/node.d/named.conf.md
+++ b/collectors/node.d.plugin/named/README.md
@@ -2,8 +2,6 @@
 

 Using this netdata collector, you can monitor one or more ISC Bind servers.

 

-The source code for this plugin in [here](https://github.com/firehol/netdata/blob/master/node.d/named.node.js).

-

 ## Example netdata charts

 

 Depending on the number of views your bind has, you may get a large number of charts.

diff --git a/conf.d/node.d.conf b/collectors/node.d.plugin/node.d.conf
index 95aec99ce..95aec99ce 100644
--- a/conf.d/node.d.conf
+++ b/collectors/node.d.plugin/node.d.conf
diff --git a/conf.d/node.d/sma_webbox.conf.md b/collectors/node.d.plugin/sma_webbox/README.md
index 19fdc9dd3..1512c7008 100644
--- a/conf.d/node.d/sma_webbox.conf.md
+++ b/collectors/node.d.plugin/sma_webbox/README.md
@@ -1,5 +1,5 @@
 

-[SMA Sunny Webbox](http://www.solar-is-future.com/sma-technology-for-our-future/products/sunny-webbox/index.html)

+[SMA Sunny Webbox](http://files.sma.de/dl/4253/WEBBOX-DUS131916W.pdf)

 

 Example netdata configuration for node.d/sma_webbox.conf

 

diff --git a/conf.d/node.d/snmp.conf.md b/collectors/node.d.plugin/snmp/README.md
index 6b496f7a8..a307a3642 100644
--- a/conf.d/node.d/snmp.conf.md
+++ b/collectors/node.d.plugin/snmp/README.md
@@ -10,8 +10,6 @@ This collector supports:
 - each SNMP device may have a different update frequency
 - each SNMP device will accept one or more batches to report values (you can set `max_request_size` per SNMP server, to control the size of batches).
 
-The source code of the plugin is [here](https://github.com/firehol/netdata/blob/master/node.d/snmp.node.js).
-
 ## Configuration
 
 You will need to create the file `/etc/netdata/node.d/snmp.conf` with data like the following.
@@ -23,7 +21,7 @@ In this example:
  - we will update the values every 10 seconds (`update_every: 10` under the server `10.11.12.8`).
  - we define 2 charts `snmp_switch.bandwidth_port1` and `snmp_switch.bandwidth_port2`, each having 2 dimensions: `in` and `out`.
 
-```js
+```json
 {
     "enable_autodetect": false,
     "update_every": 5,
@@ -105,7 +103,7 @@ Each of the 24 new charts will have its id (1-24) appended at:
 3. its `oid` (for all dimensions), i.e. dimension `in` will be `1.3.6.1.2.1.2.2.1.10.1` to `1.3.6.1.2.1.2.2.1.10.24`
 3. its priority (which will be incremented for each chart so that the charts will appear on the dashboard in this order)
 
-```js
+```json
 {
     "enable_autodetect": false,
     "update_every": 10,
@@ -154,7 +152,7 @@ The `options` given for each server, are:
  - `port`, the port of the SNMP device to connect to. The default is `161`.
  - `retries`, the number of attempts to make to fetch the data. The default is `1`.
 
-## Retreiving names from snmp
+## Retrieving names from snmp
 
 You can append a value retrieved from SNMP to the title, by adding `titleoid` to the chart.
 
@@ -177,7 +175,7 @@ If it works, restart netdata to activate the snmp collector and refresh the dash
 
 ## Data collection speed
 
-Keep in mind that many SNMP switches are routers are very slow. They may not be able to report values per second. If you run `node.d.plugin` in `debug` mode, it will report the time it took for the SNMP device to respond. My switch, for example, needs 7-8 seconds to respond for the traffic on 24 ports (48 OIDs, in/out).
+Keep in mind that many SNMP switches and routers are very slow. They may not be able to report values per second. If you run `node.d.plugin` in `debug` mode, it will report the time it took for the SNMP device to respond. My switch, for example, needs 7-8 seconds to respond for the traffic on 24 ports (48 OIDs, in/out).
 
 Also, if you use many SNMP clients on the same SNMP device at the same time, values may be skipped. This is a problem of the SNMP device, not this collector.
 
@@ -210,7 +208,7 @@ This switch also reports various other metrics, like snmp, packets per port, etc
 
 This switch has a very slow SNMP processors. To respond, it needs about 8 seconds, so I have set the refresh frequency (`update_every`) to 15 seconds.
 
-```js
+```json
 {
     "enable_autodetect": false,
     "update_every": 5,
diff --git a/conf.d/node.d/stiebeleltron.conf.md b/collectors/node.d.plugin/stiebeleltron/README.md
index 6ae5aa1c7..002a31571 100644
--- a/conf.d/node.d/stiebeleltron.conf.md
+++ b/collectors/node.d.plugin/stiebeleltron/README.md
@@ -1,3 +1,55 @@
+# stiebel eltron
+
+This module collects metrics from the configured heat pump and hot water installation from Stiebel Eltron ISG web.
+
+**Requirements**
+ * Configuration file `stiebeleltron.conf` in the node.d netdata config dir (default: `/etc/netdata/node.d/stiebeleltron.conf`)
+ * Stiebel Eltron ISG web with network access (http), without password login
+
+The charts are configurable, however, the provided default configuration collects the following:
+
+1. **General**
+ * Outside temperature in C
+ * Condenser temperature in C
+ * Heating circuit pressure in bar
+ * Flow rate in l/min
+ * Output of water and heat pumps in %
+
+2. **Heating**
+ * Heat circuit 1 temperature in C (set/actual)
+ * Heat circuit 2 temperature in C (set/actual)
+ * Flow temperature in C (set/actual)
+ * Buffer temperature in C (set/actual)
+ * Pre-flow temperature in C
+
+3. **Hot Water**
+ * Hot water temperature in C (set/actual)
+
+4. **Room Temperature**
+ * Heat circuit 1 room temperature in C (set/actual)
+ * Heat circuit 2 room temperature in C (set/actual)
+
+5. **Eletric Reheating**
+ * Dual Mode Reheating temperature in C (hot water/heating)
+
+6. **Process Data**
+ * Remaining compressor rest time in s
+
+7. **Runtime**
+ * Compressor runtime hours (hot water/heating)
+ * Reheating runtime hours (reheating 1/reheating 2)
+
+8. **Energy**
+ * Compressor today in kWh (hot water/heating)
+ * Compressor Total in kWh (hot water/heating)
+ 
+ 
+### configuration
+
+If no configuration is given, the module will be disabled. Each `update_every` is optional, the default is `10`.
+
+---
+
 [Stiebel Eltron Heat pump system with ISG](https://www.stiebel-eltron.com/en/home/products-solutions/renewables/controller_energymanagement/internet_servicegateway/isg_web.html)
 
 Original author: BrainDoctor (github)
@@ -24,7 +76,7 @@ In my case, the ISG is relatively slow with responding (at least 1s, but also up
 * The dimensions support variable digits, the default is `1`. Most of the values printed by ISG are using 1 digit, some use 2.
 * The dimensions also support the `multiplier` and `divisor` attributes, however the divisor gets overridden by `digits`, if specified. Default is `1`.
 * The test string for the regex is always the whole HTML output from the url. For each parameter you need to have a regular expression that extracts the value from the HTML source in the first capture group.
-  Recommended: [regexr.com](regexr.com) for testing and matching, [freeformatter.com](https://www.freeformatter.com/json-escape.html) for escaping the newly created regex for the JSON config.
+  Recommended: [regexr.com](https://regexr.com/) for testing and matching, [freeformatter.com](https://www.freeformatter.com/json-escape.html) for escaping the newly created regex for the JSON config.
 
 The charts are being generated using the configuration below. So if your installation is in another language or has other metrics, just adapt the structure or regexes.
 ### Configuration template
diff --git a/conf.d/python.d/apache.conf b/collectors/python.d.plugin/apache/apache.conf
index 3bbc3f786..8b606f7e0 100644
--- a/conf.d/python.d/apache.conf
+++ b/collectors/python.d.plugin/apache/apache.conf
@@ -84,4 +84,4 @@ localipv4:
 
 localipv6:
   name : 'local'
-  url  : 'http://::1/server-status?auto'
+  url  : 'http://[::1]/server-status?auto'
diff --git a/conf.d/python.d/beanstalk.conf b/collectors/python.d.plugin/beanstalk/beanstalk.conf
index 940801877..940801877 100644
--- a/conf.d/python.d/beanstalk.conf
+++ b/collectors/python.d.plugin/beanstalk/beanstalk.conf
diff --git a/conf.d/python.d/bind_rndc.conf b/collectors/python.d.plugin/bind_rndc/bind_rndc.conf
index 71958ff98..71958ff98 100644
--- a/conf.d/python.d/bind_rndc.conf
+++ b/collectors/python.d.plugin/bind_rndc/bind_rndc.conf
diff --git a/conf.d/python.d/ceph.conf b/collectors/python.d.plugin/ceph/ceph.conf
index 78ac1e251..78ac1e251 100644
--- a/conf.d/python.d/ceph.conf
+++ b/collectors/python.d.plugin/ceph/ceph.conf
diff --git a/conf.d/python.d/chrony.conf b/collectors/python.d.plugin/chrony/chrony.conf
index 9ac906b5f..9ac906b5f 100644
--- a/conf.d/python.d/chrony.conf
+++ b/collectors/python.d.plugin/chrony/chrony.conf
diff --git a/conf.d/python.d/couchdb.conf b/collectors/python.d.plugin/couchdb/couchdb.conf
index 5f6e75cff..5f6e75cff 100644
--- a/conf.d/python.d/couchdb.conf
+++ b/collectors/python.d.plugin/couchdb/couchdb.conf
diff --git a/conf.d/python.d/cpufreq.conf b/collectors/python.d.plugin/cpufreq/cpufreq.conf
index 0890245d9..0890245d9 100644
--- a/conf.d/python.d/cpufreq.conf
+++ b/collectors/python.d.plugin/cpufreq/cpufreq.conf
diff --git a/conf.d/python.d/dns_query_time.conf b/collectors/python.d.plugin/dns_query_time/dns_query_time.conf
index d32c6db83..d32c6db83 100644
--- a/conf.d/python.d/dns_query_time.conf
+++ b/collectors/python.d.plugin/dns_query_time/dns_query_time.conf
diff --git a/conf.d/python.d/dnsdist.conf b/collectors/python.d.plugin/dnsdist/dnsdist.conf
index aec58b8e1..aec58b8e1 100644
--- a/conf.d/python.d/dnsdist.conf
+++ b/collectors/python.d.plugin/dnsdist/dnsdist.conf
diff --git a/conf.d/python.d/dovecot.conf b/collectors/python.d.plugin/dovecot/dovecot.conf
index 56c394991..56c394991 100644
--- a/conf.d/python.d/dovecot.conf
+++ b/collectors/python.d.plugin/dovecot/dovecot.conf
diff --git a/conf.d/python.d/elasticsearch.conf b/collectors/python.d.plugin/elasticsearch/elasticsearch.conf
index 213843bf9..213843bf9 100644
--- a/conf.d/python.d/elasticsearch.conf
+++ b/collectors/python.d.plugin/elasticsearch/elasticsearch.conf
diff --git a/conf.d/python.d/example.conf b/collectors/python.d.plugin/example/example.conf
index e7fed9b50..e7fed9b50 100644
--- a/conf.d/python.d/example.conf
+++ b/collectors/python.d.plugin/example/example.conf
diff --git a/conf.d/python.d/exim.conf b/collectors/python.d.plugin/exim/exim.conf
index 2add7b2cb..2add7b2cb 100644
--- a/conf.d/python.d/exim.conf
+++ b/collectors/python.d.plugin/exim/exim.conf
diff --git a/conf.d/python.d/fail2ban.conf b/collectors/python.d.plugin/fail2ban/fail2ban.conf
index 60ca87231..60ca87231 100644
--- a/conf.d/python.d/fail2ban.conf
+++ b/collectors/python.d.plugin/fail2ban/fail2ban.conf
diff --git a/conf.d/python.d/freeradius.conf b/collectors/python.d.plugin/freeradius/freeradius.conf
index 3336d4c49..3336d4c49 100644
--- a/conf.d/python.d/freeradius.conf
+++ b/collectors/python.d.plugin/freeradius/freeradius.conf
diff --git a/conf.d/python.d/go_expvar.conf b/collectors/python.d.plugin/go_expvar/go_expvar.conf
index c352b1674..ba8922d2e 100644
--- a/conf.d/python.d/go_expvar.conf
+++ b/collectors/python.d.plugin/go_expvar/go_expvar.conf
@@ -76,7 +76,7 @@
 #
 # Please visit the module wiki page for more information on how to use the extra_charts variable:
 #
-# https://github.com/firehol/netdata/wiki/Monitoring-Go-Applications#monitoring-custom-vars-with-go_expvar
+# https://github.com/netdata/netdata/wiki/Monitoring-Go-Applications#monitoring-custom-vars-with-go_expvar
 #
 # Configuration example
 # ---------------------
diff --git a/conf.d/python.d/haproxy.conf b/collectors/python.d.plugin/haproxy/haproxy.conf
index a40dd76a5..a40dd76a5 100644
--- a/conf.d/python.d/haproxy.conf
+++ b/collectors/python.d.plugin/haproxy/haproxy.conf
diff --git a/conf.d/python.d/hddtemp.conf b/collectors/python.d.plugin/hddtemp/hddtemp.conf
index 9165798a2..9165798a2 100644
--- a/conf.d/python.d/hddtemp.conf
+++ b/collectors/python.d.plugin/hddtemp/hddtemp.conf
diff --git a/conf.d/python.d/httpcheck.conf b/collectors/python.d.plugin/httpcheck/httpcheck.conf
index 058e057a6..bd21b5af8 100644
--- a/conf.d/python.d/httpcheck.conf
+++ b/collectors/python.d.plugin/httpcheck/httpcheck.conf
@@ -66,6 +66,7 @@ chart_cleanup: 0
 #     url: 'http[s]://host-ip-or-dns[:port][path]'
 #                             # [required] the remote host url to connect to. If [:port] is missing, it defaults to 80
 #                             #   for HTTP and 443 for HTTPS. [path] is optional too, defaults to /
+#     method: GET             # [optional] the HTTP request method (POST, PUT, DELETE, HEAD etc.)
 #     redirect: yes           # [optional] If the remote host returns 3xx status codes, the redirection url will be
 #                             #   followed (default).
 #     status_accepted:        # [optional] By default, 200 is accepted. Anything else will result in 'bad status' in the
diff --git a/conf.d/python.d/icecast.conf b/collectors/python.d.plugin/icecast/icecast.conf
index a900d06d3..a900d06d3 100644
--- a/conf.d/python.d/icecast.conf
+++ b/collectors/python.d.plugin/icecast/icecast.conf
diff --git a/conf.d/python.d/ipfs.conf b/collectors/python.d.plugin/ipfs/ipfs.conf
index c247c1b7a..e3df0f6bb 100644
--- a/conf.d/python.d/ipfs.conf
+++ b/collectors/python.d.plugin/ipfs/ipfs.conf
@@ -64,11 +64,16 @@
 # Additionally to the above, ipfs also supports the following:
 #
 #     url: 'URL'       # URL to the IPFS API
+#     pinapi: no       # Set status of IPFS pinned object polling
+#                      # Currently defaults to disabled due to IPFS Bug
+#                      # https://github.com/ipfs/go-ipfs/issues/3874
+#                      # resulting in very high CPU Usage
 #
 # ----------------------------------------------------------------------
 # AUTO-DETECTION JOBS
 # only one of them will run (they have the same name)
 
 localhost:
-  name : 'local'
-  url  : 'http://localhost:5001'
+  name   : 'local'
+  url    : 'http://localhost:5001'
+  pinapi : no
diff --git a/conf.d/python.d/isc_dhcpd.conf b/collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.conf
index 4a4c4a5e3..4a4c4a5e3 100644
--- a/conf.d/python.d/isc_dhcpd.conf
+++ b/collectors/python.d.plugin/isc_dhcpd/isc_dhcpd.conf
diff --git a/conf.d/python.d/mdstat.conf b/collectors/python.d.plugin/mdstat/mdstat.conf
index 66a2f153c..66a2f153c 100644
--- a/conf.d/python.d/mdstat.conf
+++ b/collectors/python.d.plugin/mdstat/mdstat.conf
diff --git a/conf.d/python.d/memcached.conf b/collectors/python.d.plugin/memcached/memcached.conf
index 85c3daf65..85c3daf65 100644
--- a/conf.d/python.d/memcached.conf
+++ b/collectors/python.d.plugin/memcached/memcached.conf
diff --git a/conf.d/python.d/mongodb.conf b/collectors/python.d.plugin/mongodb/mongodb.conf
index 62faef68d..62faef68d 100644
--- a/conf.d/python.d/mongodb.conf
+++ b/collectors/python.d.plugin/mongodb/mongodb.conf
diff --git a/conf.d/python.d/mysql.conf b/collectors/python.d.plugin/mysql/mysql.conf
index b5956a2c6..b5956a2c6 100644
--- a/conf.d/python.d/mysql.conf
+++ b/collectors/python.d.plugin/mysql/mysql.conf
diff --git a/conf.d/python.d/nginx.conf b/collectors/python.d.plugin/nginx/nginx.conf
index 71c521066..71c521066 100644
--- a/conf.d/python.d/nginx.conf
+++ b/collectors/python.d.plugin/nginx/nginx.conf
diff --git a/conf.d/python.d/nginx_plus.conf b/collectors/python.d.plugin/nginx_plus/nginx_plus.conf
index 7b5c8f43f..7b5c8f43f 100644
--- a/conf.d/python.d/nginx_plus.conf
+++ b/collectors/python.d.plugin/nginx_plus/nginx_plus.conf
diff --git a/conf.d/python.d/nsd.conf b/collectors/python.d.plugin/nsd/nsd.conf
index 078e97216..078e97216 100644
--- a/conf.d/python.d/nsd.conf
+++ b/collectors/python.d.plugin/nsd/nsd.conf
diff --git a/conf.d/python.d/ntpd.conf b/collectors/python.d.plugin/ntpd/ntpd.conf
index 7adc4074b..7adc4074b 100644
--- a/conf.d/python.d/ntpd.conf
+++ b/collectors/python.d.plugin/ntpd/ntpd.conf
diff --git a/conf.d/python.d/ovpn_status_log.conf b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.conf
index 907f014f5..6fb35a530 100644
--- a/conf.d/python.d/ovpn_status_log.conf
+++ b/collectors/python.d.plugin/ovpn_status_log/ovpn_status_log.conf
@@ -88,8 +88,12 @@
 # # ps -C openvpn -o command=
 #       /usr/sbin/openvpn --daemon ovpn-server --status /run/openvpn/server.status 10 --cd /etc/openvpn --config /etc/openvpn/server.conf
 # 
+# 4. Confirm status is configured in your OpenVPN configuration.
+#     * Open OpenVPN config in an editor (e.g. sudo nano /etc/openvpn/default.conf)
+#     * Confirm status is enabled with below:
+#     status /var/log/openvpn-status.log
 #
 #default:
 # log_path: '/var/log/openvpn-status.log'
 #
-# ----------------------------------------------------------------------
\ No newline at end of file
+# ----------------------------------------------------------------------
diff --git a/conf.d/python.d/phpfpm.conf b/collectors/python.d.plugin/phpfpm/phpfpm.conf
index 08688e2fa..571eb9156 100644
--- a/conf.d/python.d/phpfpm.conf
+++ b/collectors/python.d.plugin/phpfpm/phpfpm.conf
@@ -86,5 +86,5 @@ localipv4:
 
 localipv6:
   name : 'local'
-  url  : "http://::1/status?full&json"
+  url  : "http://[::1]/status?full&json"
 
diff --git a/conf.d/python.d/portcheck.conf b/collectors/python.d.plugin/portcheck/portcheck.conf
index b3dd8bd3f..b3dd8bd3f 100644
--- a/conf.d/python.d/portcheck.conf
+++ b/collectors/python.d.plugin/portcheck/portcheck.conf
diff --git a/conf.d/python.d/postfix.conf b/collectors/python.d.plugin/postfix/postfix.conf
index e0d5a5f83..e0d5a5f83 100644
--- a/conf.d/python.d/postfix.conf
+++ b/collectors/python.d.plugin/postfix/postfix.conf
diff --git a/conf.d/python.d/postgres.conf b/collectors/python.d.plugin/postgres/postgres.conf
index b69ca3717..b69ca3717 100644
--- a/conf.d/python.d/postgres.conf
+++ b/collectors/python.d.plugin/postgres/postgres.conf
diff --git a/conf.d/python.d/powerdns.conf b/collectors/python.d.plugin/powerdns/powerdns.conf
index ca6200df1..ca6200df1 100644
--- a/conf.d/python.d/powerdns.conf
+++ b/collectors/python.d.plugin/powerdns/powerdns.conf
diff --git a/conf.d/python.d.conf b/collectors/python.d.plugin/python.d.conf
index bb57738bb..97f4cb8d5 100644
--- a/conf.d/python.d.conf
+++ b/collectors/python.d.plugin/python.d.conf
@@ -19,11 +19,19 @@ enabled: yes
 # If "default_run" = "no" the default for all modules is disabled (no).
 # Setting any of these to "yes" will enable it.
 
+# Enable / Disable explicit garbage collection (full collection run). Default is enabled.
+gc_run: yes
+
+# Garbage collection interval in seconds. Default is 300.
+gc_interval: 300
+
+# apache: yes
+
 # apache_cache has been replaced by web_log
 apache_cache: no
-# apache: yes
 # beanstalk: yes
 # bind_rndc: yes
+# boinc: yes
 # ceph: yes
 chrony: no
 # couchdb: yes
@@ -40,40 +48,50 @@ example: no
 # exim: yes
 # fail2ban: yes
 # freeradius: yes
+go_expvar: no
 
 # gunicorn_log has been replaced by web_log
 gunicorn_log: no
-go_expvar: no
 # haproxy: yes
 # hddtemp: yes
 # icecast: yes
 # ipfs: yes
 # isc_dhcpd: yes
+# linux_power_supply: yes
+# litespeed: yes
+logind: no
 # mdstat: yes
 # memcached: yes
 # mongodb: yes
+# monit: yes
 # mysql: yes
 # nginx: yes
 # nginx_plus: yes
-# nsd: yes
-# ntpd: yes
 
 # nginx_log has been replaced by web_log
 nginx_log: no
+# nsd: yes
 # ntpd: yes
 # ovpn_status_log: yes
 # phpfpm: yes
 # postfix: yes
 # postgres: yes
 # powerdns: yes
+# proxysql: yes
+# puppet: yes
 # rabbitmq: yes
 # redis: yes
+# rethinkdbs: yes
 # retroshare: yes
-# sensors: yes
 # samba: yes
+# sensors: yes
 # smartd_log: yes
-# squid: yes
+# spigotmc: yes
 # springboot: yes
+# squid: yes
 # tomcat: yes
+unbound: no
+# uwsgi: yes
 # varnish: yes
+# w1sensor: yes
 # web_log: yes
diff --git a/conf.d/python.d/rabbitmq.conf b/collectors/python.d.plugin/rabbitmq/rabbitmq.conf
index 3f90da8a2..3f90da8a2 100644
--- a/conf.d/python.d/rabbitmq.conf
+++ b/collectors/python.d.plugin/rabbitmq/rabbitmq.conf
diff --git a/conf.d/python.d/redis.conf b/collectors/python.d.plugin/redis/redis.conf
index 6363f6da7..6363f6da7 100644
--- a/conf.d/python.d/redis.conf
+++ b/collectors/python.d.plugin/redis/redis.conf
diff --git a/conf.d/python.d/retroshare.conf b/collectors/python.d.plugin/retroshare/retroshare.conf
index 9c92583f7..9c92583f7 100644
--- a/conf.d/python.d/retroshare.conf
+++ b/collectors/python.d.plugin/retroshare/retroshare.conf
diff --git a/conf.d/python.d/samba.conf b/collectors/python.d.plugin/samba/samba.conf
index ee513c60f..ee513c60f 100644
--- a/conf.d/python.d/samba.conf
+++ b/collectors/python.d.plugin/samba/samba.conf
diff --git a/conf.d/python.d/sensors.conf b/collectors/python.d.plugin/sensors/sensors.conf
index 83bbffd7d..83bbffd7d 100644
--- a/conf.d/python.d/sensors.conf
+++ b/collectors/python.d.plugin/sensors/sensors.conf
diff --git a/conf.d/python.d/smartd_log.conf b/collectors/python.d.plugin/smartd_log/smartd_log.conf
index 3fab3f1c0..3fab3f1c0 100644
--- a/conf.d/python.d/smartd_log.conf
+++ b/collectors/python.d.plugin/smartd_log/smartd_log.conf
diff --git a/conf.d/python.d/springboot.conf b/collectors/python.d.plugin/springboot/springboot.conf
index 40b5fb437..40b5fb437 100644
--- a/conf.d/python.d/springboot.conf
+++ b/collectors/python.d.plugin/springboot/springboot.conf
diff --git a/conf.d/python.d/squid.conf b/collectors/python.d.plugin/squid/squid.conf
index 564187f00..564187f00 100644
--- a/conf.d/python.d/squid.conf
+++ b/collectors/python.d.plugin/squid/squid.conf
diff --git a/conf.d/python.d/tomcat.conf b/collectors/python.d.plugin/tomcat/tomcat.conf
index c63f06cfa..c63f06cfa 100644
--- a/conf.d/python.d/tomcat.conf
+++ b/collectors/python.d.plugin/tomcat/tomcat.conf
diff --git a/conf.d/python.d/traefik.conf b/collectors/python.d.plugin/traefik/traefik.conf
index 909b9e549..909b9e549 100644
--- a/conf.d/python.d/traefik.conf
+++ b/collectors/python.d.plugin/traefik/traefik.conf
diff --git a/conf.d/python.d/varnish.conf b/collectors/python.d.plugin/varnish/varnish.conf
index 4b069d514..4b069d514 100644
--- a/conf.d/python.d/varnish.conf
+++ b/collectors/python.d.plugin/varnish/varnish.conf
diff --git a/conf.d/python.d/web_log.conf b/collectors/python.d.plugin/web_log/web_log.conf
index c185f8d85..a67957aef 100644
--- a/conf.d/python.d/web_log.conf
+++ b/collectors/python.d.plugin/web_log/web_log.conf
@@ -84,7 +84,7 @@
 #          stub_status: 'stub_status'     # name(dimension): REGEX to match
 #     custom_log_format:                  # define a custom log format
 #          pattern: '(?P<address>[\da-f.:]+) -.*?"(?P<method>[A-Z]+) (?P<url>.*?)" (?P<code>[1-9]\d{2}) (?P<bytes_sent>\d+) (?P<resp_length>\d+) (?P<resp_time>\d+\.\d+) '
-#          time_multiplier: 1000000       # type <int> - convert time to microseconds
+#          time_multiplier: 1000000       # type <int>/<float> - convert time to microseconds
 #     histogram: [1,3,10,30,100, ...]      # type list of int - Cumulative histogram of response time in milli seconds
 
 # ----------------------------------------------------------------------
@@ -109,6 +109,17 @@
 #   CustomLog "/var/log/apache2/access.log" netdata
 
 # ----------------------------------------------------------------------
+# VHOST AND PORT
+# if your want to graph the request/sec per virtual host and per port (to check the number of requests in http vs https)
+
+# in apache : (%v gives the hostname, %p the port number)
+#  LogFormat "%v %p %h %t \"%r\" %>s %O %I %D \"%{Referer}i\" \"%{User-Agent}i\"" vhost_netdata
+#
+# and in this file in apache_vhosts_log section, add :
+#  custom_log_format:
+#     pattern: '(?P<vhost>[a-zA-Z\d.-_]+) (?P<port>\d+) (?P<address>[\da-f.:]+) \[.*\] "(?P<method>[A-Z]+)[^"]*" (?P<code>[1-9]\d{2}) (?P<bytes_sent>\d+) (?P<resp_length>\d+) (?P<resp_time>\d+)'
+
+# ----------------------------------------------------------------------
 # AUTO-DETECTION JOBS
 # only one of them per web server will run (when they have the same name)
 
diff --git a/conf.d/statsd.d/example.conf b/collectors/statsd.plugin/example.conf
index 0af9dd27d..2c7de6c7b 100644
--- a/conf.d/statsd.d/example.conf
+++ b/collectors/statsd.plugin/example.conf
@@ -1,16 +1,17 @@
 # statsd synthetic charts configuration
 
-# You can add many .conf files, one for each of your apps
+# You can add many .conf files in /etc/netdata/statsd.d/,
+# one for each of your apps.
 
 # start a new app - you can add many apps in the same file
 [app]
     # give a name for this app
     # this controls the main menu on the dashboard
     # and will be the prefix for all charts of the app
-    name = myapp
+    name = myexampleapp
 
     # match all the metrics of the app
-    metrics = myapp.*
+    metrics = myexampleapp.*
 
     # shall private charts of these metrics be created?
     private charts = no
@@ -26,13 +27,11 @@
     # the default is to use the global history
     #history = 3600
 
-
-
 # create a chart
-# this is its id - the chart will be named myapp.mychart
-[mychart]
+# this is its id - the chart will be named myexampleapp.myexamplechart
+[myexamplechart]
     # a name for the chart, similar to the id (2 names for each chart)
-    name = mychart
+    name = myexamplechart
 
     # the chart title
     title = my chart title
@@ -57,9 +56,9 @@
     #        events = the number of events for this metric
     #        last = the last value collected
     #        all the others are only valid for histograms and timers
-    dimension = myapp.metric1 avg   average 1 1
-    dimension = myapp.metric1 lower min     1 1
-    dimension = myapp.metric1 upper max     1 1
-    dimension = myapp.metric2 other last    1 1
+    dimension = myexampleapp.metric1 avg   average 1 1
+    dimension = myexampleapp.metric1 lower min     1 1
+    dimension = myexampleapp.metric1 upper max     1 1
+    dimension = myexampleapp.metric2 other last    1 1
 
 # You can add as many charts as needed
diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
deleted file mode 100644
index d79bb5ab8..000000000
--- a/conf.d/Makefile.am
+++ /dev/null
@@ -1,160 +0,0 @@
-#
-# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-#
-MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
-
-dist_config_DATA = \
-    apps_groups.conf \
-    charts.d.conf \
-    fping.conf \
-    node.d.conf \
-    python.d.conf \
-    health_alarm_notify.conf \
-    health_email_recipients.conf \
-    stream.conf \
-    $(NULL)
-
-nodeconfigdir=$(configdir)/node.d
-dist_nodeconfig_DATA = \
-    node.d/README.md \
-    node.d/fronius.conf.md \
-    node.d/named.conf.md \
-    node.d/sma_webbox.conf.md \
-    node.d/snmp.conf.md \
-    node.d/stiebeleltron.conf.md \
-    $(NULL)
-
-pythonconfigdir=$(configdir)/python.d
-dist_pythonconfig_DATA = \
-    python.d/apache.conf \
-    python.d/beanstalk.conf \
-    python.d/bind_rndc.conf \
-    python.d/ceph.conf \
-    python.d/chrony.conf \
-    python.d/couchdb.conf \
-    python.d/cpufreq.conf \
-    python.d/dns_query_time.conf \
-    python.d/dnsdist.conf \
-    python.d/dovecot.conf \
-    python.d/elasticsearch.conf \
-    python.d/example.conf \
-    python.d/exim.conf \
-    python.d/fail2ban.conf \
-    python.d/freeradius.conf \
-    python.d/go_expvar.conf \
-    python.d/haproxy.conf \
-    python.d/hddtemp.conf \
-    python.d/httpcheck.conf \
-    python.d/icecast.conf \
-    python.d/ipfs.conf \
-    python.d/isc_dhcpd.conf \
-    python.d/mdstat.conf \
-    python.d/memcached.conf \
-    python.d/mongodb.conf \
-    python.d/mysql.conf \
-    python.d/nginx.conf \
-    python.d/nginx_plus.conf \
-    python.d/nsd.conf \
-    python.d/ntpd.conf \
-    python.d/ovpn_status_log.conf \
-    python.d/phpfpm.conf \
-    python.d/portcheck.conf \
-    python.d/postfix.conf \
-    python.d/postgres.conf \
-    python.d/powerdns.conf \
-    python.d/rabbitmq.conf \
-    python.d/redis.conf \
-    python.d/retroshare.conf \
-    python.d/samba.conf \
-    python.d/sensors.conf \
-    python.d/springboot.conf \
-    python.d/squid.conf \
-    python.d/smartd_log.conf \
-    python.d/tomcat.conf \
-    python.d/traefik.conf \
-    python.d/varnish.conf \
-    python.d/web_log.conf \
-    $(NULL)
-
-healthconfigdir=$(configdir)/health.d
-
-dist_healthconfig_DATA = \
-    health.d/apache.conf \
-    health.d/backend.conf \
-    health.d/beanstalkd.conf \
-    health.d/bind_rndc.conf \
-    health.d/btrfs.conf \
-    health.d/ceph.conf \
-    health.d/cpu.conf \
-    health.d/couchdb.conf \
-    health.d/disks.conf \
-    health.d/elasticsearch.conf \
-    health.d/entropy.conf \
-    health.d/fping.conf \
-    health.d/fronius.conf \
-    health.d/haproxy.conf \
-    health.d/httpcheck.conf \
-    health.d/ipc.conf \
-    health.d/ipfs.conf \
-    health.d/ipmi.conf \
-    health.d/isc_dhcpd.conf \
-    health.d/lighttpd.conf \
-    health.d/mdstat.conf \
-    health.d/memcached.conf \
-    health.d/memory.conf \
-    health.d/mongodb.conf \
-    health.d/mysql.conf \
-    health.d/named.conf \
-    health.d/net.conf \
-    health.d/netfilter.conf \
-    health.d/nginx.conf \
-    health.d/nginx_plus.conf \
-    health.d/portcheck.conf \
-    health.d/postgres.conf \
-    health.d/qos.conf \
-    health.d/ram.conf \
-    health.d/redis.conf \
-    health.d/retroshare.conf \
-    health.d/softnet.conf \
-    health.d/squid.conf \
-    health.d/stiebeleltron.conf \
-    health.d/swap.conf \
-    health.d/tcp_conn.conf \
-    health.d/tcp_listen.conf \
-    health.d/tcp_mem.conf \
-    health.d/tcp_orphans.conf \
-    health.d/tcp_resets.conf \
-    health.d/udp_errors.conf \
-    health.d/varnish.conf \
-    health.d/web_log.conf \
-    health.d/zfs.conf \
-    $(NULL)
-
-chartsconfigdir=$(configdir)/charts.d
-dist_chartsconfig_DATA = \
-    charts.d/apache.conf \
-    charts.d/apcupsd.conf \
-    charts.d/cpufreq.conf \
-    charts.d/exim.conf \
-    charts.d/libreswan.conf \
-    charts.d/load_average.conf \
-    charts.d/mysql.conf \
-    charts.d/nut.conf \
-    charts.d/phpfpm.conf \
-    charts.d/sensors.conf \
-    charts.d/tomcat.conf \
-    charts.d/ap.conf \
-    charts.d/cpu_apps.conf \
-    charts.d/example.conf \
-    charts.d/hddtemp.conf \
-    charts.d/mem_apps.conf \
-    charts.d/nginx.conf \
-    charts.d/opensips.conf \
-    charts.d/postfix.conf \
-    charts.d/squid.conf \
-    $(NULL)
-
-statsdconfigdir=$(configdir)/statsd.d
-dist_statsdconfig_DATA = \
-    statsd.d/example.conf \
-    $(NULL)
diff --git a/conf.d/health.d/tcp_listen.conf b/conf.d/health.d/tcp_listen.conf
deleted file mode 100644
index 957964ae4..000000000
--- a/conf.d/health.d/tcp_listen.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# -----------------------------------------------------------------------------
-# tcp listen sockets issues
-
-   alarm: 1m_ipv4_tcp_listen_overflows
-      on: ipv4.tcplistenissues
-      os: linux freebsd
-   hosts: *
-  lookup: sum -60s unaligned absolute of ListenOverflows
-   units: overflows
-   every: 10s
-    crit: $this > 0
-   delay: up 0 down 5m multiplier 1.5 max 1h
-    info: the number of TCP listen socket overflows during the last minute
-      to: sysadmin
-
-   alarm: 1m_ipv4_tcp_listen_drops
-      on: ipv4.tcplistenissues
-      os: linux
-   hosts: *
-  lookup: sum -60s unaligned absolute of ListenDrops
-   units: drops
-   every: 10s
-    crit: $this > 0
-   delay: up 0 down 5m multiplier 1.5 max 1h
-    info: the number of TCP listen socket drops during the last minute
-      to: sysadmin
-
diff --git a/conf.d/node.d/README.md b/conf.d/node.d/README.md
deleted file mode 100644
index 45e3d02a6..000000000
--- a/conf.d/node.d/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-`node.d.plugin` modules accept configuration in JSON format.
-
-Unfortunately, JSON files do not accept comments. So, the best way to describe them is to have markdown text files with instructions.
-
-JSON has a very strict formatting. If you get errors from netdata at `/var/log/netdata/error.log` that a certain configuration file cannot be loaded, we suggest to verify it at [http://jsonlint.com/](http://jsonlint.com/).
-
-The files in this directory, provide usable examples for configuring each `node.d.plugin` module.
diff --git a/conf.d/health.d/apache.conf b/health/health.d/apache.conf
index 0c98b8778..0c98b8778 100644
--- a/conf.d/health.d/apache.conf
+++ b/health/health.d/apache.conf
diff --git a/conf.d/health.d/backend.conf b/health/health.d/backend.conf
index 7af100d8f..7af100d8f 100644
--- a/conf.d/health.d/backend.conf
+++ b/health/health.d/backend.conf
diff --git a/conf.d/health.d/beanstalkd.conf b/health/health.d/beanstalkd.conf
index 30dc27328..30dc27328 100644
--- a/conf.d/health.d/beanstalkd.conf
+++ b/health/health.d/beanstalkd.conf
diff --git a/conf.d/health.d/bind_rndc.conf b/health/health.d/bind_rndc.conf
index 4145e77cd..4145e77cd 100644
--- a/conf.d/health.d/bind_rndc.conf
+++ b/health/health.d/bind_rndc.conf
diff --git a/conf.d/health.d/btrfs.conf b/health/health.d/btrfs.conf
index b27aa544f..b27aa544f 100644
--- a/conf.d/health.d/btrfs.conf
+++ b/health/health.d/btrfs.conf
diff --git a/conf.d/health.d/ceph.conf b/health/health.d/ceph.conf
index de16f7b6f..de16f7b6f 100644
--- a/conf.d/health.d/ceph.conf
+++ b/health/health.d/ceph.conf
diff --git a/conf.d/health.d/couchdb.conf b/health/health.d/couchdb.conf
index 4a2895280..4a2895280 100644
--- a/conf.d/health.d/couchdb.conf
+++ b/health/health.d/couchdb.conf
diff --git a/conf.d/health.d/cpu.conf b/health/health.d/cpu.conf
index fa8189856..fa8189856 100644
--- a/conf.d/health.d/cpu.conf
+++ b/health/health.d/cpu.conf
diff --git a/conf.d/health.d/disks.conf b/health/health.d/disks.conf
index 26f85848a..26f85848a 100644
--- a/conf.d/health.d/disks.conf
+++ b/health/health.d/disks.conf
diff --git a/conf.d/health.d/elasticsearch.conf b/health/health.d/elasticsearch.conf
index dffd40965..dffd40965 100644
--- a/conf.d/health.d/elasticsearch.conf
+++ b/health/health.d/elasticsearch.conf
diff --git a/conf.d/health.d/entropy.conf b/health/health.d/entropy.conf
index 66d44ec13..66d44ec13 100644
--- a/conf.d/health.d/entropy.conf
+++ b/health/health.d/entropy.conf
diff --git a/conf.d/health.d/fping.conf b/health/health.d/fping.conf
index 43658fef6..43658fef6 100644
--- a/conf.d/health.d/fping.conf
+++ b/health/health.d/fping.conf
diff --git a/conf.d/health.d/fronius.conf b/health/health.d/fronius.conf
index cdf6c8fcb..cdf6c8fcb 100644
--- a/conf.d/health.d/fronius.conf
+++ b/health/health.d/fronius.conf
diff --git a/conf.d/health.d/haproxy.conf b/health/health.d/haproxy.conf
index e49c70d48..e49c70d48 100644
--- a/conf.d/health.d/haproxy.conf
+++ b/health/health.d/haproxy.conf
diff --git a/conf.d/health.d/httpcheck.conf b/health/health.d/httpcheck.conf
index 0ddf35eab..0ddf35eab 100644
--- a/conf.d/health.d/httpcheck.conf
+++ b/health/health.d/httpcheck.conf
diff --git a/conf.d/health.d/ipc.conf b/health/health.d/ipc.conf
index 03cf264d8..989d6e912 100644
--- a/conf.d/health.d/ipc.conf
+++ b/health/health.d/ipc.conf
@@ -5,7 +5,7 @@
       on: system.ipc_semaphores
       os: linux
    hosts: *
-    calc: $semaphores * 100 / $ipc.semaphores.max
+    calc: $semaphores * 100 / $ipc_semaphores_max
    units: %
    every: 10s
     warn: $this > (($status >= $WARNING)  ? (70) : (80))
@@ -18,7 +18,7 @@
       on: system.ipc_semaphore_arrays
       os: linux
    hosts: *
-    calc: $arrays * 100 / $ipc.semaphores.arrays.max
+    calc: $arrays * 100 / $ipc_semaphores_arrays_max
    units: %
    every: 10s
     warn: $this > (($status >= $WARNING)  ? (70) : (80))
diff --git a/conf.d/health.d/ipfs.conf b/health/health.d/ipfs.conf
index 3f77572d6..3f77572d6 100644
--- a/conf.d/health.d/ipfs.conf
+++ b/health/health.d/ipfs.conf
diff --git a/conf.d/health.d/ipmi.conf b/health/health.d/ipmi.conf
index c25581964..c25581964 100644
--- a/conf.d/health.d/ipmi.conf
+++ b/health/health.d/ipmi.conf
diff --git a/conf.d/health.d/isc_dhcpd.conf b/health/health.d/isc_dhcpd.conf
index 8054656ff..8054656ff 100644
--- a/conf.d/health.d/isc_dhcpd.conf
+++ b/health/health.d/isc_dhcpd.conf
diff --git a/conf.d/health.d/lighttpd.conf b/health/health.d/lighttpd.conf
index 915907a4a..915907a4a 100644
--- a/conf.d/health.d/lighttpd.conf
+++ b/health/health.d/lighttpd.conf
diff --git a/conf.d/health.d/mdstat.conf b/health/health.d/mdstat.conf
index c9e7d20db..0f5f2837e 100644
--- a/conf.d/health.d/mdstat.conf
+++ b/health/health.d/mdstat.conf
@@ -1,3 +1,13 @@
+template: mdstat_last_collected
+      on: md.disks
+    calc: $now - $last_collected_t
+   units: seconds ago
+   every: 10s
+    warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
+    crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
+    info: number of seconds since the last successful data collection
+      to: sysadmin
+
 template: mdstat_disks
       on: md.disks
    units: failed devices
@@ -7,12 +17,11 @@ template: mdstat_disks
     info: Array is degraded!
       to: sysadmin
 
-template: mdstat_last_collected
-      on: md.disks
-    calc: $now - $last_collected_t
-   units: seconds ago
+template: mdstat_mismatch_cnt
+      on: md.mismatch_cnt
+   units: unsynchronized blocks
+    calc: $count
    every: 10s
-    warn: $this > (($status >= $WARNING)  ? ($update_every) : ( 5 * $update_every))
-    crit: $this > (($status == $CRITICAL) ? ($update_every) : (60 * $update_every))
-    info: number of seconds since the last successful data collection
+    crit: $this > 0
+    info: Mismatch count!
       to: sysadmin
diff --git a/conf.d/health.d/memcached.conf b/health/health.d/memcached.conf
index d248ef57a..d248ef57a 100644
--- a/conf.d/health.d/memcached.conf
+++ b/health/health.d/memcached.conf
diff --git a/conf.d/health.d/memory.conf b/health/health.d/memory.conf
index 4a0e6e522..4a0e6e522 100644
--- a/conf.d/health.d/memory.conf
+++ b/health/health.d/memory.conf
diff --git a/conf.d/health.d/mongodb.conf b/health/health.d/mongodb.conf
index a80cb3112..a80cb3112 100644
--- a/conf.d/health.d/mongodb.conf
+++ b/health/health.d/mongodb.conf
diff --git a/conf.d/health.d/mysql.conf b/health/health.d/mysql.conf
index 1eeb993f0..39c401915 100644
--- a/conf.d/health.d/mysql.conf
+++ b/health/health.d/mysql.conf
@@ -60,6 +60,21 @@ template: mysql_10s_waited_locks_ratio
 
 
 # -----------------------------------------------------------------------------
+# connections
+
+template: mysql_connections
+      on: mysql.connections_active
+    calc: $active * 100 / $limit
+   units: %
+   every: 10s
+    warn: $this > (($status >= $WARNING)  ? (60) : (70))
+    crit: $this > (($status == $CRITICAL) ? (80) : (90))
+   delay: down 15m multiplier 1.5 max 1h
+    info: the ratio of current active connections vs the maximum possible number of connections
+      to: dba
+
+
+# -----------------------------------------------------------------------------
 # replication
 
 template: mysql_replication
diff --git a/conf.d/health.d/named.conf b/health/health.d/named.conf
index 4fc65c8ee..4fc65c8ee 100644
--- a/conf.d/health.d/named.conf
+++ b/health/health.d/named.conf
diff --git a/conf.d/health.d/net.conf b/health/health.d/net.conf
index 22a88927d..489016dd5 100644
--- a/conf.d/health.d/net.conf
+++ b/health/health.d/net.conf
@@ -2,6 +2,39 @@
 # you can disable an alarm notification by setting the 'to' line to: silent
 
 # -----------------------------------------------------------------------------
+# net traffic overflow
+
+ template: 1m_received_traffic_overflow
+       on: net.net
+       os: linux
+    hosts: *
+ families: *
+   lookup: average -1m unaligned absolute of received
+     calc: ($nic_speed_max > 0) ? ($this * 100 / ($nic_speed_max * 1000)) : ( nan )
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (85))
+     crit: $this > (($status == $CRITICAL) ? (85) : (90))
+    delay: down 1m multiplier 1.5 max 1h
+     info: interface received bandwidth usage over net device speed max
+       to: sysadmin
+
+ template: 1m_sent_traffic_overflow
+       on: net.net
+       os: linux
+    hosts: *
+ families: *
+   lookup: average -1m unaligned absolute of sent
+     calc: ($nic_speed_max > 0) ? ($this * 100 / ($nic_speed_max * 1000)) : ( nan )
+    units: %
+    every: 10s
+     warn: $this > (($status >= $WARNING)  ? (80) : (85))
+     crit: $this > (($status == $CRITICAL) ? (85) : (90))
+    delay: down 1m multiplier 1.5 max 1h
+     info: interface sent bandwidth usage over net device speed max
+       to: sysadmin
+
+# -----------------------------------------------------------------------------
 # dropped packets
 
 # check if an interface is dropping packets
@@ -101,7 +134,7 @@ template: 1m_received_packets_rate
       os: linux freebsd
    hosts: *
 families: *
-  lookup: average -1m of received
+  lookup: average -1m unaligned of received
    units: packets
    every: 10s
     info: the average number of packets received during the last minute
@@ -111,7 +144,7 @@ template: 10s_received_packets_storm
       os: linux freebsd
    hosts: *
 families: *
-  lookup: average -10s of received
+  lookup: average -10s unaligned of received
     calc: $this * 100 / (($1m_received_packets_rate < 1000)?(1000):($1m_received_packets_rate))
    every: 10s
    units: %
diff --git a/conf.d/health.d/netfilter.conf b/health/health.d/netfilter.conf
index fa1732b33..1d07752cc 100644
--- a/conf.d/health.d/netfilter.conf
+++ b/health/health.d/netfilter.conf
@@ -19,7 +19,7 @@
       os: linux
    hosts: *
   lookup: max -10s unaligned of connections
-    calc: $this * 100 / $netfilter.conntrack.max
+    calc: $this * 100 / $netfilter_conntrack_max
    units: %
    every: 10s
     warn: $this > (($status >= $WARNING)  ? (70) : (80))
diff --git a/conf.d/health.d/nginx.conf b/health/health.d/nginx.conf
index a686c3d99..a686c3d99 100644
--- a/conf.d/health.d/nginx.conf
+++ b/health/health.d/nginx.conf
diff --git a/conf.d/health.d/nginx_plus.conf b/health/health.d/nginx_plus.conf
index 5a171a76d..5a171a76d 100644
--- a/conf.d/health.d/nginx_plus.conf
+++ b/health/health.d/nginx_plus.conf
diff --git a/conf.d/health.d/portcheck.conf b/health/health.d/portcheck.conf
index f42b63d30..f42b63d30 100644
--- a/conf.d/health.d/portcheck.conf
+++ b/health/health.d/portcheck.conf
diff --git a/conf.d/health.d/postgres.conf b/health/health.d/postgres.conf
index 4e0583b85..4e0583b85 100644
--- a/conf.d/health.d/postgres.conf
+++ b/health/health.d/postgres.conf
diff --git a/conf.d/health.d/qos.conf b/health/health.d/qos.conf
index 7290d15ff..7290d15ff 100644
--- a/conf.d/health.d/qos.conf
+++ b/health/health.d/qos.conf
diff --git a/conf.d/health.d/ram.conf b/health/health.d/ram.conf
index b6dc5f945..4e437322c 100644
--- a/conf.d/health.d/ram.conf
+++ b/health/health.d/ram.conf
@@ -3,7 +3,7 @@
 
    alarm: used_ram_to_ignore
       on: system.ram
-      os: linux
+      os: linux freebsd
    hosts: *
     calc: ($zfs.arc_size.arcsz = nan)?(0):($zfs.arc_size.arcsz)
    every: 10s
@@ -41,7 +41,7 @@ alarm: ram_in_use
    on: system.ram
    os: freebsd
 hosts: *
- calc: (($active + $wired) - $used_ram_to_ignore) * 100 / (($active + $wired) - $used_ram_to_ignore + $cached + $free)
+ calc: ($active + $wired + $laundry + $buffers - $used_ram_to_ignore) * 100 / ($active + $wired + $laundry + $buffers - $used_ram_to_ignore + $cache + $free + $inactive)
 units: %
 every: 10s
  warn: $this > (($status >= $WARNING)  ? (80) : (90))
@@ -54,7 +54,7 @@ delay: down 15m multiplier 1.5 max 1h
     on: system.ram
     os: freebsd
  hosts: *
-  calc: ($free + $inactive + $used_ram_to_ignore) * 100 / ($free + $active + $inactive + $wired + $cache + $buffers)
+  calc: ($free + $inactive + $used_ram_to_ignore) * 100 / ($free + $active + $inactive + $wired + $cache + $laundry + $buffers)
  units: %
  every: 10s
   warn: $this < (($status >= $WARNING)  ? ( 5) : (10))
diff --git a/conf.d/health.d/redis.conf b/health/health.d/redis.conf
index c08a884a6..c08a884a6 100644
--- a/conf.d/health.d/redis.conf
+++ b/health/health.d/redis.conf
diff --git a/conf.d/health.d/retroshare.conf b/health/health.d/retroshare.conf
index 2344b60ec..2344b60ec 100644
--- a/conf.d/health.d/retroshare.conf
+++ b/health/health.d/retroshare.conf
diff --git a/conf.d/health.d/softnet.conf b/health/health.d/softnet.conf
index 77c804bfd..77c804bfd 100644
--- a/conf.d/health.d/softnet.conf
+++ b/health/health.d/softnet.conf
diff --git a/conf.d/health.d/squid.conf b/health/health.d/squid.conf
index 06cc9678f..06cc9678f 100644
--- a/conf.d/health.d/squid.conf
+++ b/health/health.d/squid.conf
diff --git a/conf.d/health.d/stiebeleltron.conf b/health/health.d/stiebeleltron.conf
index e0361eb20..e0361eb20 100644
--- a/conf.d/health.d/stiebeleltron.conf
+++ b/health/health.d/stiebeleltron.conf
diff --git a/conf.d/health.d/swap.conf b/health/health.d/swap.conf
index f920b0807..f920b0807 100644
--- a/conf.d/health.d/swap.conf
+++ b/health/health.d/swap.conf
diff --git a/conf.d/health.d/tcp_conn.conf b/health/health.d/tcp_conn.conf
index 7aa9a9800..7aa9a9800 100644
--- a/conf.d/health.d/tcp_conn.conf
+++ b/health/health.d/tcp_conn.conf
diff --git a/conf.d/health.d/tcp_mem.conf b/health/health.d/tcp_mem.conf
index 6927d5765..6927d5765 100644
--- a/conf.d/health.d/tcp_mem.conf
+++ b/health/health.d/tcp_mem.conf
diff --git a/conf.d/health.d/tcp_orphans.conf b/health/health.d/tcp_orphans.conf
index 280d6590f..280d6590f 100644
--- a/conf.d/health.d/tcp_orphans.conf
+++ b/health/health.d/tcp_orphans.conf
diff --git a/conf.d/health.d/tcp_resets.conf b/health/health.d/tcp_resets.conf
index 91dad3c6a..91dad3c6a 100644
--- a/conf.d/health.d/tcp_resets.conf
+++ b/health/health.d/tcp_resets.conf
diff --git a/conf.d/health.d/udp_errors.conf b/health/health.d/udp_errors.conf
index 382b39658..5140228f5 100644
--- a/conf.d/health.d/udp_errors.conf
+++ b/health/health.d/udp_errors.conf
@@ -27,7 +27,7 @@
    units: errors
    every: 10s
     warn: $this > 0
-    crit: $this > 100
+    crit: $this > (($status == $CRITICAL) ? (0) : (100))
     info: number of UDP receive buffer errors during the last minute
    delay: up 0 down 60m multiplier 1.2 max 2h
       to: sysadmin
@@ -43,7 +43,7 @@
    units: errors
    every: 10s
     warn: $this > 0
-    crit: $this > 100
+    crit: $this > (($status == $CRITICAL) ? (0) : (100))
     info: number of UDP send buffer errors during the last minute
    delay: up 0 down 60m multiplier 1.2 max 2h
       to: sysadmin
diff --git a/conf.d/health.d/varnish.conf b/health/health.d/varnish.conf
index cca7446b4..cca7446b4 100644
--- a/conf.d/health.d/varnish.conf
+++ b/health/health.d/varnish.conf
diff --git a/conf.d/health.d/web_log.conf b/health/health.d/web_log.conf
index d8be88b47..d8be88b47 100644
--- a/conf.d/health.d/web_log.conf
+++ b/health/health.d/web_log.conf
diff --git a/conf.d/health.d/zfs.conf b/health/health.d/zfs.conf
index af73824e6..af73824e6 100644
--- a/conf.d/health.d/zfs.conf
+++ b/health/health.d/zfs.conf
diff --git a/conf.d/health_alarm_notify.conf b/health/notifications/health_alarm_notify.conf
index 0a95931ec..9e72aac4d 100755
--- a/conf.d/health_alarm_notify.conf
+++ b/health/notifications/health_alarm_notify.conf
@@ -14,7 +14,10 @@
 # - sms messages to your cell phone or any sms enabled device (twilio.com)
 # - sms messages to your cell phone or any sms enabled device (messagebird.com)
 # - notifications to users on pagerduty.com
+# - notifications to Amazon SNS topics (aws.amazon.com)
 # - messages to your irc channel on your selected network
+# - messages to a local or remote syslog daemon
+# - message to Microsoft Team (thru webhook)
 #
 # The 'to' line given at netdata alarms defines a *role*, so that many
 # people can be notified for each role.
@@ -44,6 +47,23 @@
 
 
 #------------------------------------------------------------------------------
+# date handling
+#
+# You can configure netdata alerts to send dates in any format you want.
+# This uses standard `date` command format strings.  See `man date` for
+# more info on what you can put in here.  Note that this has to start with a '+', otherwise it won't work.
+#
+# For ISO 8601 dates, use '+%FT%T%z'
+# For RFC 5322 dates, use '+%a, %d %b %Y %H:%M:%S %z'
+# For RFC 3339 dates, use '+%F %T%:z'
+# For RFC 1123 dates, use '+%a, %d %b %Y %H:%M:%S %Z'
+# For RFC 1036 dates, use '+%A, %d-%b-%y %H:%M:%S %Z'
+# For a reasonably local date and time (in that order), use '+%x %X'
+# For the old default behavior (compatible with ANSI C's asctime() function), leave this empty.
+date_format=''
+
+
+#------------------------------------------------------------------------------
 # external commands
 
 # The full path to the sendmail command.
@@ -61,6 +81,16 @@ curl=""
 # If not found, irc notifications will be silently disabled.
 nc=""
 
+# The full path of the logger command.
+# If empty, the system $PATH will be searched for it.
+# If not found, syslog notifications will be silently disabled.
+logger=""
+
+# The full path of the aws command.
+# If empty, the system $PATH will be searched for it.
+# If not found, Amazon SNS notifications will be silently disabled.
+aws=""
+
 #------------------------------------------------------------------------------
 # extra options for external commands
 #
@@ -74,6 +104,10 @@ nc=""
 # of potentially sensitive information.
 #curl_options="--insecure"
 
+# Extra options to pass to logger.  You shouldn't have to specify anything
+# here in most cases.
+#logger_options=""
+
 #------------------------------------------------------------------------------
 # NOTE ABOUT RECIPIENTS
 #
@@ -144,6 +178,14 @@ DEFAULT_RECIPIENT_EMAIL="root"
 # autodetected from the environment.
 #EMAIL_CHARSET="UTF-8"
 
+# You can also have netdata add headers to the message that will
+# cause most e-mail clients to treat all notifications for a given
+# chart+alarm+host combination as a single thread.  This can help
+# simplify tracking of alarms, as it provides an easy wway for scripts
+# to corelate messages and also will cause most clients to group all the
+# messages together.  THis is off by default.
+#EMAIL_THREADING="YES"
+
 
 #------------------------------------------------------------------------------
 # pushover (pushover.net) global notification options
@@ -297,6 +339,60 @@ SLACK_WEBHOOK_URL=""
 # roles):
 DEFAULT_RECIPIENT_SLACK=""
 
+#------------------------------------------------------------------------------
+# Microsoft Team (office.com) global notification options
+# More details are available here regarding the payload syntax options : https://docs.microsoft.com/en-us/outlook/actionable-messages/message-card-reference
+# Online designer : https://acdesignerbeta.azurewebsites.net/
+# multiple recipients can be given like this:
+#                  "CHANNEL1 CHANNEL2 ..."
+
+# enable/disable sending team notifications
+SEND_MSTEAM="YES"
+
+# if a role's recipients are not configured, a notification will be send to
+# this slack channel (empty = do not send a notification for unconfigured
+# roles):
+# For team the channel name is encoded in the URI after ....IncomingWebhook/___/.....
+# This value will be replaced in the webhook value to publish to several channels in a same Team.
+# In order to get it working properly, you have to replace the value between [] ....IncomingWebhook/[___]/..... by "CHANNEL" string.
+DEFAULT_RECIPIENT_MSTEAM=""
+# Based on the way MS Teams is working, put the differents channels here like : "CHANNEL1 CHANNEL2 ..."
+# AT LEAST ONE CHANNEL IS MANDATORY
+MSTEAM_WEBHOOK_URL=""
+
+# Define the default color scheme for alert to MS Team - icon and color
+# Icons - go to https://emojipedia.org/bomb/
+MSTEAM_ICON_DEFAULT="♡"
+MSTEAM_ICON_CLEAR="💚"
+MSTEAM_ICON_WARNING="⚠️"
+MSTEAM_ICON_CRITICAL="🔥"
+
+# Colors
+MSTEAM_COLOR_DEFAULT="0076D7"
+MSTEAM_COLOR_CLEAR="65A677"
+MSTEAM_COLOR_WARNING="FFA500"
+MSTEAM_COLOR_CRITICAL="D93F3C"
+
+
+#------------------------------------------------------------------------------
+# rocketchat (rocket.chat) global notification options
+
+# multiple recipients can be given like this:
+#                  "CHANNEL1 CHANNEL2 ..."
+
+# enable/disable sending rocketchat notifications
+SEND_ROCKETCHAT="YES"
+
+# Login to rocket.chat and create an incoming webhook. You need only one for all
+# your netdata servers (or you can have one for each of your netdata).
+# Without it, netdata cannot send rocketchat notifications.
+ROCKETCHAT_WEBHOOK_URL=""
+
+# if a role's recipients are not configured, a notification will be send to
+# this rocketchat channel (empty = do not send a notification for unconfigured
+# roles):
+DEFAULT_RECIPIENT_ROCKETCHAT=""
+
 
 #------------------------------------------------------------------------------
 # alerta (alerta.io) global notification options
@@ -413,6 +509,28 @@ DEFAULT_RECIPIENT_PD=""
 
 
 #------------------------------------------------------------------------------
+# fleep notification options
+#
+# To send fleep.io notifications, you will need a webhook for the
+# conversation you want to send to.
+
+# Fleep recipients are specified as the last part of the webhook URL.
+# So, for a webhook URL of: https://fleep.io/hook/IJONmBuuSlWlkb_ttqyXJg, the
+# recipient name would be: 'IJONmBuuSlWlkb_ttqyXJg'.
+
+# enable/disable sending fleep notifications
+SEND_FLEEP="YES"
+
+# if a role's recipients are not configured, a notification will not be sent.
+# (empty = do not send a notification for unconfigured roles):
+DEFAULT_RECIPIENT_FLEEP=""
+
+# The user name to label the messages with.  If this is unset,
+# the hostname of the system the notification is for will be used.
+FLEEP_SENDER=""
+
+
+#------------------------------------------------------------------------------
 # irc notification options
 #
 # irc notifications require only the nc utility to be installed. 
@@ -441,6 +559,94 @@ IRC_REALNAME=""
 
 
 #------------------------------------------------------------------------------
+# syslog notifications
+#
+# syslog notifications only need you to have a working logger command, which
+# should be the case on pretty much any Linux system.
+
+# enable/disable sending syslog notifications
+# NOTE: make sure you have everything else configured the way you want
+# it _before_ turning this on.
+SEND_SYSLOG="NO"
+
+# A note on log levels and facilities:
+#
+# The traditional UNIX syslog mechanism has the concept of both log
+# levels and facilities.  A log level indicates the relaitve severity of
+# the message, while a facility specifies a generic source for the message
+# (for example, the `mail` facility is where sendmail and postfix log
+# their messages).  All major syslog daemons have the ability to filter
+# messages based on both log level and facility, and can often also make
+# routing decisions for messages based on both factors.
+#
+# On Linux, the eight log levels in decreasing order of severity are:
+# emerg, alert, crit, err, warning, notice, info, debug
+#
+# By default, warnings will be logged at the warning level, critical
+# alerts at the crit level, and clear notifications at the invo level.
+#
+# And the 19 facilities you can log to are:
+# auth, authpriv, cron, daemon, ftp, lpr, mail, news, syslog, user,
+# uucp, local0, local1, local2, local3, local4, local5, local6, and local7
+#
+# By default, netdata alerts will be logged to the local6 facility.
+#
+# Depending on your distribution, this means that either all your
+# netdata alerts will by default end up in the main system log (usually
+# /var/log/messages), or they won't be logged to a file at all.
+# Neither of these are likely to be what you actually want, but any
+# configuration to change that needs to happen in the syslog daemon
+# configuration, not here.
+
+# This controls which facility is used by defalt for logging.  Defaults
+# to local6.
+SYSLOG_FACILITY=''
+
+# If a role's recipients are not configured, use the following.
+# (empty = do not send a notification for unconfigured roles)
+#
+# The recipient format for syslog uses the following format:
+# [[facility.level][@host[:port]]/]prefix
+#
+# `prefix` gets appended to the front of all log messages generated for
+# that recipient.  The prefix is mandatory.
+# 'host' and 'port' can be used to specify a remote syslog server to
+# send messages to.  Leave these out if you want messages to be delivered
+# locally.  'host' can be either a hostname or an IP address.
+# IPv6 addresses must have square around them.
+# 'facility' and 'level' are used to override the default logging facility
+# set above and the log level.  If one is specified, both must be present.
+#
+# For example, to send messages with a 'netdata' prefix to a syslog
+# daemon listening on port 514 on 'loghost' using the daemon facility and
+# notice log level:
+# DEFAULT_RECIPIENT_SYSLOG='daemon.notice@loghost:514/netdata'
+#
+DEFAULT_RECIPIENT_SYSLOG="netdata"
+
+#------------------------------------------------------------------------------
+# Amazon SNS notifications
+#
+# This method requires potentially complex manual configuration.  See the
+# netdata wiki for information on what is needed.
+
+# enable/disable sending Amazon SNS notifications
+SEND_AWSSNS="YES"
+
+# Specify a template for the Amazon SNS notifications.  This supports
+# the same set of variables that are usable in the `custom_sender()`
+# function in the custom notification configuration below.
+#
+AWSSNS_MESSAGE_FORMAT="${status} on ${host} at ${date}: ${chart} ${value_string}"
+
+# If a role's recipients are not configured, use the following.
+# (empty = do not send a notification for unconfigured roles)
+#
+# Recipients for AWS SNS notifications are specified as topic ARN's.
+#
+DEFAULT_RECIPIENT_AWSSNS=""
+
+#------------------------------------------------------------------------------
 # custom notifications
 #
 
@@ -535,10 +741,18 @@ role_recipients_kavenegar[sysadmin]="${DEFAULT_RECIPIENT_KAVENEGAR}"
 
 role_recipients_pd[sysadmin]="${DEFAULT_RECIPIENT_PD}"
 
+role_recipients_fleep[sysadmin]="${DEFAULT_RECIPIENT_FLEEP}"
+
 role_recipients_irc[sysadmin]="${DEFAULT_RECIPIENT_IRC}"
 
+role_recipients_syslog[sysadmin]="${DEFAULT_RECIPIENT_SYSLOG}"
+
+role_recipients_awssns[sysadmin]="${DEFAULT_RECIPIENT_AWSSNS}"
+
 role_recipients_custom[sysadmin]="${DEFAULT_RECIPIENT_CUSTOM}"
 
+role_recipients_msteam[sysadmin]="${DEFAULT_RECIPIENT_MSTEAM}"
+
 # -----------------------------------------------------------------------------
 # DNS related alarms
 
@@ -568,10 +782,18 @@ role_recipients_kavenegar[domainadmin]="${DEFAULT_RECIPIENT_KAVENEGAR}"
 
 role_recipients_pd[domainadmin]="${DEFAULT_RECIPIENT_PD}"
 
+role_recipients_fleep[domainadmin]="${DEFAULT_RECIPIENT_FLEEP}"
+
 role_recipients_irc[domainadmin]="${DEFAULT_RECIPIENT_IRC}"
 
+role_recipients_syslog[domainadmin]="${DEFAULT_RECIPIENT_SYSLOG}"
+
+role_recipients_awssns[domainadmin]="${DEFAULT_RECIPIENT_AWSSNS}"
+
 role_recipients_custom[domainadmin]="${DEFAULT_RECIPIENT_CUSTOM}"
 
+role_recipients_msteam[domainadmin]="${DEFAULT_RECIPIENT_MSTEAM}"
+
 # -----------------------------------------------------------------------------
 # database servers alarms
 # mysql, redis, memcached, postgres, etc
@@ -602,10 +824,18 @@ role_recipients_kavenegar[dba]="${DEFAULT_RECIPIENT_KAVENEGAR}"
 
 role_recipients_pd[dba]="${DEFAULT_RECIPIENT_PD}"
 
+role_recipients_fleep[dba]="${DEFAULT_RECIPIENT_FLEEP}"
+
 role_recipients_irc[dba]="${DEFAULT_RECIPIENT_IRC}"
 
+role_recipients_syslog[dba]="${DEFAULT_RECIPIENT_SYSLOG}"
+
+role_recipients_awssns[dba]="${DEFAULT_RECIPIENT_AWSSNS}"
+
 role_recipients_custom[dba]="${DEFAULT_RECIPIENT_CUSTOM}"
 
+role_recipients_msteam[dba]="${DEFAULT_RECIPIENT_MSTEAM}"
+
 # -----------------------------------------------------------------------------
 # web servers alarms
 # apache, nginx, lighttpd, etc
@@ -636,10 +866,18 @@ role_recipients_kavenegar[webmaster]="${DEFAULT_RECIPIENT_KAVENEGAR}"
 
 role_recipients_pd[webmaster]="${DEFAULT_RECIPIENT_PD}"
 
+role_recipients_fleep[webmaster]="${DEFAULT_RECIPIENT_FLEEP}"
+
 role_recipients_irc[webmaster]="${DEFAULT_RECIPIENT_IRC}"
 
+role_recipients_syslog[webmaster]="${DEFAULT_RECIPIENT_SYSLOG}"
+
+role_recipients_awssns[webmaster]="${DEFAULT_RECIPIENT_AWSSNS}"
+
 role_recipients_custom[webmaster]="${DEFAULT_RECIPIENT_CUSTOM}"
 
+role_recipients_msteam[webmaster]="${DEFAULT_RECIPIENT_MSTEAM}"
+
 # -----------------------------------------------------------------------------
 # proxy servers alarms
 # squid, etc
@@ -670,10 +908,18 @@ role_recipients_kavenegar[proxyadmin]="${DEFAULT_RECIPIENT_KAVENEGAR}"
 
 role_recipients_pd[proxyadmin]="${DEFAULT_RECIPIENT_PD}"
 
+role_recipients_fleep[proxyadmin]="${DEFAULT_RECIPIENT_FLEEP}"
+
 role_recipients_irc[proxyadmin]="${DEFAULT_RECIPIENT_IRC}"
 
+role_recipients_syslog[proxyadmin]="${DEFAULT_RECIPIENT_SYSLOG}"
+
+role_recipients_awssns[porxyadmin]="${DEFAULT_RECIPIENT_AWSSNS}"
+
 role_recipients_custom[proxyadmin]="${DEFAULT_RECIPIENT_CUSTOM}"
 
+role_recipients_msteam[proxyadmin]="${DEFAULT_RECIPIENT_MSTEAM}"
+
 # -----------------------------------------------------------------------------
 # peripheral devices
 # UPS, photovoltaics, etc
@@ -704,5 +950,12 @@ role_recipients_kavenegar[sitemgr]="${DEFAULT_RECIPIENT_KAVENEGAR}"
 
 role_recipients_pd[sitemgr]="${DEFAULT_RECIPIENT_PD}"
 
+role_recipients_fleep[sitemgr]="${DEFAULT_RECIPIENT_FLEEP}"
+
+role_recipients_syslog[sitemgr]="${DEFAULT_RECIPIENT_SYSLOG}"
+
+role_recipients_awssns[sitemgr]="${DEFAULT_RECIPIENT_AWSSNS}"
+
 role_recipients_custom[sitemgr]="${DEFAULT_RECIPIENT_CUSTOM}"
 
+role_recipients_msteam[sitemgr]="${DEFAULT_RECIPIENT_MSTEAM}"
diff --git a/conf.d/health_email_recipients.conf b/health/notifications/health_email_recipients.conf
index f56c6c64a..f56c6c64a 100644
--- a/conf.d/health_email_recipients.conf
+++ b/health/notifications/health_email_recipients.conf
diff --git a/conf.d/stream.conf b/streaming/stream.conf
index d0c9a8b18..493eba37c 100644
--- a/conf.d/stream.conf
+++ b/streaming/stream.conf
@@ -39,17 +39,25 @@
     # If the destination line above does not specify a port, use this
     default port = 19999
 
+    # filter the charts to be streamed
+    # netdata SIMPLE PATTERN:
+    # - space separated list of patterns (use \ to include spaces in patterns)
+    # - use * as wildcard, any number of times within each pattern
+    # - prefix a pattern with ! for a negative match (ie not stream the charts it matches)
+    # - the order of patterns is important (left to right)
+    # To send all except a few, use: !this !that *   (ie append a wildcard pattern)
+    send charts matching = *
+
     # The buffer to use for sending metrics.
-    # 1MB is good for 10-20 seconds of data, so increase this
-    # if you expect latencies.
+    # 1MB is good for 10-20 seconds of data, so increase this if you expect latencies.
+    # The buffer is flushed on reconnects (this will not prevent gaps at the charts).
     buffer size bytes = 1048576
 
     # If the connection fails, or it disconnects,
     # retry after that many seconds.
     reconnect delay seconds = 5
 
-    # Attempt to sync the clock the of the master with the clock of the
-    # slave for that many iterations, when starting.
+    # Sync the clock of the charts for that many iterations, when starting.
     initial clock resync iterations = 60
 
 
@@ -62,8 +70,9 @@
 #    netdata searches for options in this order:
 #
 #    a) master netdata settings (netdata.conf)
-#    b) [API_KEY] section       (below, settings for the API key)
-#    c) [MACHINE_GUID] section  (below, settings for each machine)
+#    b) [stream] section        (above)
+#    c) [API_KEY] section       (below, settings for the API key)
+#    d) [MACHINE_GUID] section  (below, settings for each machine)
 #
 #    You can combine the above (the more specific setting will be used).
 
@@ -95,7 +104,7 @@
     # If you don't set it here, the memory mode of netdata.conf will be used.
     # Valid modes:
     #    save    save on exit, load on start
-    #    map     like swap (continuously syncing to disks)
+    #    map     like swap (continuously syncing to disks - you need SSD)
     #    ram     keep it in RAM, don't touch the disk
     #    none    no database at all (use this on headless proxies)
     default memory mode = ram
@@ -106,7 +115,7 @@
     #    no      do not enable alarms
     #    auto    enable alarms, only when the sending netdata is connected
     # You can also set it per host, below.
-    # The default is the same as to netdata.conf
+    # The default is taken from [health].enabled of netdata.conf
     health enabled by default = auto
 
     # postpone alarms for a short period after the sender is connected
@@ -120,15 +129,16 @@
     multiple connections = allow
 
     # need to route metrics differently? set these.
-    # the defaults are the ones at the [stream] section
+    # the defaults are the ones at the [stream] section (above)
     #default proxy enabled = yes | no
     #default proxy destination = IP:PORT IP:PORT ...
     #default proxy api key = API_KEY
+    #default proxy send charts matching = *
 
 
 # -----------------------------------------------------------------------------
 # 3. PER SENDING HOST SETTINGS, ON MASTER NETDATA
-#    THIS IS OPTIONAL - YOU DON'T NEED IT
+#    THIS IS OPTIONAL - YOU DON'T HAVE TO CONFIGURE IT
 
 # This section exists to give you finer control of the master settings for each
 # slave host, when the same API key is used by many netdata slaves / proxies.
@@ -174,6 +184,8 @@
     multiple connections = allow
 
     # need to route metrics differently?
+    # the defaults are the ones at the [API KEY] section
     #proxy enabled = yes | no
     #proxy destination = IP:PORT IP:PORT ...
     #proxy api key = API_KEY
+    #proxy send charts matching = *
diff --git a/conf.d/Makefile.in b/web/gui/Makefile.in
index 48ce51191..2f79809ef 100644
--- a/conf.d/Makefile.in
+++ b/web/gui/Makefile.in
@@ -78,20 +78,23 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = conf.d
+subdir = web/gui
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(dist_chartsconfig_DATA) $(dist_config_DATA) \
-	$(dist_healthconfig_DATA) $(dist_nodeconfig_DATA) \
-	$(dist_pythonconfig_DATA) $(dist_statsdconfig_DATA)
+	$(dist_noinst_DATA) $(dist_web_DATA) $(dist_webcss_DATA) \
+	$(dist_webdnt_DATA) $(dist_webfonts_DATA) \
+	$(dist_webimages_DATA) $(dist_weblib_DATA) \
+	$(dist_webwellknown_DATA)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_c___atomic.m4 \
-	$(top_srcdir)/m4/ax_c__generic.m4 $(top_srcdir)/m4/ax_c_lto.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_gcc_func_attribute.m4 \
-	$(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/jemalloc.m4 \
-	$(top_srcdir)/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
+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
@@ -144,13 +147,14 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(chartsconfigdir)" \
-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" \
-	"$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)" \
-	"$(DESTDIR)$(statsdconfigdir)"
-DATA = $(dist_chartsconfig_DATA) $(dist_config_DATA) \
-	$(dist_healthconfig_DATA) $(dist_nodeconfig_DATA) \
-	$(dist_pythonconfig_DATA) $(dist_statsdconfig_DATA)
+am__installdirs = "$(DESTDIR)$(webdir)" "$(DESTDIR)$(webcssdir)" \
+	"$(DESTDIR)$(webdntdir)" "$(DESTDIR)$(webfontsdir)" \
+	"$(DESTDIR)$(webimagesdir)" "$(DESTDIR)$(weblibdir)" \
+	"$(DESTDIR)$(webwellknowndir)"
+DATA = $(dist_noinst_DATA) $(dist_web_DATA) $(dist_webcss_DATA) \
+	$(dist_webdnt_DATA) $(dist_webfonts_DATA) \
+	$(dist_webimages_DATA) $(dist_weblib_DATA) \
+	$(dist_webwellknown_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -250,6 +254,7 @@ 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@
@@ -271,6 +276,7 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+libconfigdir = @libconfigdir@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -300,162 +306,116 @@ webdir = @webdir@
 
 #
 # Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
+# SPDX-License-Identifier: GPL-3.0-or-later
 #
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-dist_config_DATA = \
-    apps_groups.conf \
-    charts.d.conf \
-    fping.conf \
-    node.d.conf \
-    python.d.conf \
-    health_alarm_notify.conf \
-    health_email_recipients.conf \
-    stream.conf \
-    $(NULL)
-
-nodeconfigdir = $(configdir)/node.d
-dist_nodeconfig_DATA = \
-    node.d/README.md \
-    node.d/fronius.conf.md \
-    node.d/named.conf.md \
-    node.d/sma_webbox.conf.md \
-    node.d/snmp.conf.md \
-    node.d/stiebeleltron.conf.md \
-    $(NULL)
-
-pythonconfigdir = $(configdir)/python.d
-dist_pythonconfig_DATA = \
-    python.d/apache.conf \
-    python.d/beanstalk.conf \
-    python.d/bind_rndc.conf \
-    python.d/ceph.conf \
-    python.d/chrony.conf \
-    python.d/couchdb.conf \
-    python.d/cpufreq.conf \
-    python.d/dns_query_time.conf \
-    python.d/dnsdist.conf \
-    python.d/dovecot.conf \
-    python.d/elasticsearch.conf \
-    python.d/example.conf \
-    python.d/exim.conf \
-    python.d/fail2ban.conf \
-    python.d/freeradius.conf \
-    python.d/go_expvar.conf \
-    python.d/haproxy.conf \
-    python.d/hddtemp.conf \
-    python.d/httpcheck.conf \
-    python.d/icecast.conf \
-    python.d/ipfs.conf \
-    python.d/isc_dhcpd.conf \
-    python.d/mdstat.conf \
-    python.d/memcached.conf \
-    python.d/mongodb.conf \
-    python.d/mysql.conf \
-    python.d/nginx.conf \
-    python.d/nginx_plus.conf \
-    python.d/nsd.conf \
-    python.d/ntpd.conf \
-    python.d/ovpn_status_log.conf \
-    python.d/phpfpm.conf \
-    python.d/portcheck.conf \
-    python.d/postfix.conf \
-    python.d/postgres.conf \
-    python.d/powerdns.conf \
-    python.d/rabbitmq.conf \
-    python.d/redis.conf \
-    python.d/retroshare.conf \
-    python.d/samba.conf \
-    python.d/sensors.conf \
-    python.d/springboot.conf \
-    python.d/squid.conf \
-    python.d/smartd_log.conf \
-    python.d/tomcat.conf \
-    python.d/traefik.conf \
-    python.d/varnish.conf \
-    python.d/web_log.conf \
-    $(NULL)
-
-healthconfigdir = $(configdir)/health.d
-dist_healthconfig_DATA = \
-    health.d/apache.conf \
-    health.d/backend.conf \
-    health.d/beanstalkd.conf \
-    health.d/bind_rndc.conf \
-    health.d/btrfs.conf \
-    health.d/ceph.conf \
-    health.d/cpu.conf \
-    health.d/couchdb.conf \
-    health.d/disks.conf \
-    health.d/elasticsearch.conf \
-    health.d/entropy.conf \
-    health.d/fping.conf \
-    health.d/fronius.conf \
-    health.d/haproxy.conf \
-    health.d/httpcheck.conf \
-    health.d/ipc.conf \
-    health.d/ipfs.conf \
-    health.d/ipmi.conf \
-    health.d/isc_dhcpd.conf \
-    health.d/lighttpd.conf \
-    health.d/mdstat.conf \
-    health.d/memcached.conf \
-    health.d/memory.conf \
-    health.d/mongodb.conf \
-    health.d/mysql.conf \
-    health.d/named.conf \
-    health.d/net.conf \
-    health.d/netfilter.conf \
-    health.d/nginx.conf \
-    health.d/nginx_plus.conf \
-    health.d/portcheck.conf \
-    health.d/postgres.conf \
-    health.d/qos.conf \
-    health.d/ram.conf \
-    health.d/redis.conf \
-    health.d/retroshare.conf \
-    health.d/softnet.conf \
-    health.d/squid.conf \
-    health.d/stiebeleltron.conf \
-    health.d/swap.conf \
-    health.d/tcp_conn.conf \
-    health.d/tcp_listen.conf \
-    health.d/tcp_mem.conf \
-    health.d/tcp_orphans.conf \
-    health.d/tcp_resets.conf \
-    health.d/udp_errors.conf \
-    health.d/varnish.conf \
-    health.d/web_log.conf \
-    health.d/zfs.conf \
-    $(NULL)
-
-chartsconfigdir = $(configdir)/charts.d
-dist_chartsconfig_DATA = \
-    charts.d/apache.conf \
-    charts.d/apcupsd.conf \
-    charts.d/cpufreq.conf \
-    charts.d/exim.conf \
-    charts.d/libreswan.conf \
-    charts.d/load_average.conf \
-    charts.d/mysql.conf \
-    charts.d/nut.conf \
-    charts.d/phpfpm.conf \
-    charts.d/sensors.conf \
-    charts.d/tomcat.conf \
-    charts.d/ap.conf \
-    charts.d/cpu_apps.conf \
-    charts.d/example.conf \
-    charts.d/hddtemp.conf \
-    charts.d/mem_apps.conf \
-    charts.d/nginx.conf \
-    charts.d/opensips.conf \
-    charts.d/postfix.conf \
-    charts.d/squid.conf \
-    $(NULL)
-
-statsdconfigdir = $(configdir)/statsd.d
-dist_statsdconfig_DATA = \
-    statsd.d/example.conf \
-    $(NULL)
+dist_noinst_DATA = \
+	README.md \
+	$(NULL)
+
+dist_web_DATA = \
+	demo.html \
+	demo2.html \
+	demosites.html \
+	demosites2.html \
+	dashboard.html \
+	dashboard.js \
+	dashboard_info.js \
+	dashboard_info_custom_example.js \
+	dashboard.css \
+	dashboard.slate.css \
+	favicon.ico \
+	goto-host-from-alarm.html \
+	index.html \
+	infographic.html \
+	robots.txt \
+	refresh-badges.js \
+	registry.html \
+	sitemap.xml \
+	tv.html \
+	version.txt \
+	$(NULL)
+
+weblibdir = $(webdir)/lib
+dist_weblib_DATA = \
+	lib/bootstrap-3.3.7.min.js \
+	lib/bootstrap-slider-10.0.0.min.js \
+	lib/bootstrap-table-1.11.0.min.js \
+	lib/bootstrap-table-export-1.11.0.min.js \
+	lib/bootstrap-toggle-2.2.2.min.js \
+	lib/clipboard-polyfill-be05dad.js \
+	lib/c3-0.4.18.min.js \
+	lib/d3-4.12.2.min.js \
+	lib/d3pie-0.2.1-netdata-3.js \
+	lib/dygraph-c91c859.min.js \
+	lib/dygraph-smooth-plotter-c91c859.js \
+	lib/fontawesome-all-5.0.1.min.js \
+	lib/gauge-1.3.2.min.js \
+	lib/jquery-2.2.4.min.js \
+	lib/jquery.easypiechart-97b5824.min.js \
+	lib/jquery.peity-3.2.0.min.js \
+	lib/jquery.sparkline-2.1.2.min.js \
+	lib/lz-string-1.4.4.min.js \
+	lib/morris-0.5.1.min.js \
+	lib/pako-1.0.6.min.js \
+	lib/perfect-scrollbar-0.6.15.min.js \
+	lib/raphael-2.2.4-min.js \
+	lib/tableExport-1.6.0.min.js \
+	$(NULL)
+
+webcssdir = $(webdir)/css
+dist_webcss_DATA = \
+	css/morris-0.5.1.css \
+	css/bootstrap-3.3.7.css \
+	css/bootstrap-theme-3.3.7.min.css \
+	css/bootstrap-slate-flat-3.3.7.css \
+	css/bootstrap-slider-10.0.0.min.css \
+	css/bootstrap-toggle-2.2.2.min.css \
+	css/c3-0.4.18.min.css \
+	$(NULL)
+
+webfontsdir = $(webdir)/fonts
+dist_webfonts_DATA = \
+	fonts/glyphicons-halflings-regular.eot \
+	fonts/glyphicons-halflings-regular.svg \
+	fonts/glyphicons-halflings-regular.ttf \
+	fonts/glyphicons-halflings-regular.woff \
+	fonts/glyphicons-halflings-regular.woff2 \
+	$(NULL)
+
+webimagesdir = $(webdir)/images
+dist_webimages_DATA = \
+	images/alert-128-orange.png \
+	images/alert-128-red.png \
+	images/alert-multi-size-orange.ico \
+	images/alert-multi-size-red.ico \
+	images/animated.gif \
+	images/check-mark-2-128-green.png \
+	images/check-mark-2-multi-size-green.ico \
+	images/netdata.svg \
+	images/post.png \
+	images/seo-performance-16.png \
+	images/seo-performance-24.png \
+	images/seo-performance-32.png \
+	images/seo-performance-48.png \
+	images/seo-performance-64.png \
+	images/seo-performance-72.png \
+	images/seo-performance-114.png \
+	images/seo-performance-128.png \
+	images/seo-performance-256.png \
+	images/seo-performance-512.png \
+	images/seo-performance-multi-size.ico \
+	images/seo-performance-multi-size.icns \
+	$(NULL)
+
+webwellknowndir = $(webdir)/.well-known
+dist_webwellknown_DATA = \
+	$(NULL)
+
+webdntdir = $(webdir)/.well-known/dnt
+dist_webdnt_DATA = \
+	.well-known/dnt/cookies \
+	$(NULL)
 
 all: all-am
 
@@ -469,9 +429,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu conf.d/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu web/gui/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu conf.d/Makefile
+	  $(AUTOMAKE) --gnu web/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -490,132 +450,153 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-install-dist_chartsconfigDATA: $(dist_chartsconfig_DATA)
+install-dist_webDATA: $(dist_web_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_chartsconfig_DATA)'; test -n "$(chartsconfigdir)" || list=; \
+	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(chartsconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(chartsconfigdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(webdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(webdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(chartsconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(chartsconfigdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webdir)" || exit $$?; \
 	done
 
-uninstall-dist_chartsconfigDATA:
+uninstall-dist_webDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_chartsconfig_DATA)'; test -n "$(chartsconfigdir)" || list=; \
+	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(chartsconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_configDATA: $(dist_config_DATA)
+	dir='$(DESTDIR)$(webdir)'; $(am__uninstall_files_from_dir)
+install-dist_webcssDATA: $(dist_webcss_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \
+	@list='$(dist_webcss_DATA)'; test -n "$(webcssdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(configdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(configdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(webcssdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(webcssdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(configdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(configdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webcssdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webcssdir)" || exit $$?; \
 	done
 
-uninstall-dist_configDATA:
+uninstall-dist_webcssDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_config_DATA)'; test -n "$(configdir)" || list=; \
+	@list='$(dist_webcss_DATA)'; test -n "$(webcssdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(configdir)'; $(am__uninstall_files_from_dir)
-install-dist_healthconfigDATA: $(dist_healthconfig_DATA)
+	dir='$(DESTDIR)$(webcssdir)'; $(am__uninstall_files_from_dir)
+install-dist_webdntDATA: $(dist_webdnt_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_healthconfig_DATA)'; test -n "$(healthconfigdir)" || list=; \
+	@list='$(dist_webdnt_DATA)'; test -n "$(webdntdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(healthconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(healthconfigdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(webdntdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(webdntdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(healthconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(healthconfigdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webdntdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webdntdir)" || exit $$?; \
 	done
 
-uninstall-dist_healthconfigDATA:
+uninstall-dist_webdntDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_healthconfig_DATA)'; test -n "$(healthconfigdir)" || list=; \
+	@list='$(dist_webdnt_DATA)'; test -n "$(webdntdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(healthconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_nodeconfigDATA: $(dist_nodeconfig_DATA)
+	dir='$(DESTDIR)$(webdntdir)'; $(am__uninstall_files_from_dir)
+install-dist_webfontsDATA: $(dist_webfonts_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_nodeconfig_DATA)'; test -n "$(nodeconfigdir)" || list=; \
+	@list='$(dist_webfonts_DATA)'; test -n "$(webfontsdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(nodeconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(nodeconfigdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(webfontsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(webfontsdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nodeconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(nodeconfigdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webfontsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webfontsdir)" || exit $$?; \
 	done
 
-uninstall-dist_nodeconfigDATA:
+uninstall-dist_webfontsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_nodeconfig_DATA)'; test -n "$(nodeconfigdir)" || list=; \
+	@list='$(dist_webfonts_DATA)'; test -n "$(webfontsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(nodeconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_pythonconfigDATA: $(dist_pythonconfig_DATA)
+	dir='$(DESTDIR)$(webfontsdir)'; $(am__uninstall_files_from_dir)
+install-dist_webimagesDATA: $(dist_webimages_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_pythonconfig_DATA)'; test -n "$(pythonconfigdir)" || list=; \
+	@list='$(dist_webimages_DATA)'; test -n "$(webimagesdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pythonconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pythonconfigdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(webimagesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(webimagesdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pythonconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pythonconfigdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webimagesdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webimagesdir)" || exit $$?; \
 	done
 
-uninstall-dist_pythonconfigDATA:
+uninstall-dist_webimagesDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_pythonconfig_DATA)'; test -n "$(pythonconfigdir)" || list=; \
+	@list='$(dist_webimages_DATA)'; test -n "$(webimagesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pythonconfigdir)'; $(am__uninstall_files_from_dir)
-install-dist_statsdconfigDATA: $(dist_statsdconfig_DATA)
+	dir='$(DESTDIR)$(webimagesdir)'; $(am__uninstall_files_from_dir)
+install-dist_weblibDATA: $(dist_weblib_DATA)
 	@$(NORMAL_INSTALL)
-	@list='$(dist_statsdconfig_DATA)'; test -n "$(statsdconfigdir)" || list=; \
+	@list='$(dist_weblib_DATA)'; test -n "$(weblibdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(statsdconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(statsdconfigdir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(weblibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(weblibdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(statsdconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(statsdconfigdir)" || exit $$?; \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(weblibdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(weblibdir)" || exit $$?; \
 	done
 
-uninstall-dist_statsdconfigDATA:
+uninstall-dist_weblibDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_statsdconfig_DATA)'; test -n "$(statsdconfigdir)" || list=; \
+	@list='$(dist_weblib_DATA)'; test -n "$(weblibdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(statsdconfigdir)'; $(am__uninstall_files_from_dir)
+	dir='$(DESTDIR)$(weblibdir)'; $(am__uninstall_files_from_dir)
+install-dist_webwellknownDATA: $(dist_webwellknown_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_webwellknown_DATA)'; test -n "$(webwellknowndir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(webwellknowndir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(webwellknowndir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webwellknowndir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webwellknowndir)" || exit $$?; \
+	done
+
+uninstall-dist_webwellknownDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_webwellknown_DATA)'; test -n "$(webwellknowndir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(webwellknowndir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -657,7 +638,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(chartsconfigdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(healthconfigdir)" "$(DESTDIR)$(nodeconfigdir)" "$(DESTDIR)$(pythonconfigdir)" "$(DESTDIR)$(statsdconfigdir)"; do \
+	for dir in "$(DESTDIR)$(webdir)" "$(DESTDIR)$(webcssdir)" "$(DESTDIR)$(webdntdir)" "$(DESTDIR)$(webfontsdir)" "$(DESTDIR)$(webimagesdir)" "$(DESTDIR)$(weblibdir)" "$(DESTDIR)$(webwellknowndir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -711,9 +692,10 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_chartsconfigDATA install-dist_configDATA \
-	install-dist_healthconfigDATA install-dist_nodeconfigDATA \
-	install-dist_pythonconfigDATA install-dist_statsdconfigDATA
+install-data-am: install-dist_webDATA install-dist_webcssDATA \
+	install-dist_webdntDATA install-dist_webfontsDATA \
+	install-dist_webimagesDATA install-dist_weblibDATA \
+	install-dist_webwellknownDATA
 
 install-dvi: install-dvi-am
 
@@ -757,31 +739,40 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_chartsconfigDATA \
-	uninstall-dist_configDATA uninstall-dist_healthconfigDATA \
-	uninstall-dist_nodeconfigDATA uninstall-dist_pythonconfigDATA \
-	uninstall-dist_statsdconfigDATA
+uninstall-am: uninstall-dist_webDATA uninstall-dist_webcssDATA \
+	uninstall-dist_webdntDATA uninstall-dist_webfontsDATA \
+	uninstall-dist_webimagesDATA uninstall-dist_weblibDATA \
+	uninstall-dist_webwellknownDATA
 
 .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-dist_chartsconfigDATA \
-	install-dist_configDATA install-dist_healthconfigDATA \
-	install-dist_nodeconfigDATA install-dist_pythonconfigDATA \
-	install-dist_statsdconfigDATA install-dvi install-dvi-am \
+	install-data-am install-dist_webDATA install-dist_webcssDATA \
+	install-dist_webdntDATA install-dist_webfontsDATA \
+	install-dist_webimagesDATA install-dist_weblibDATA \
+	install-dist_webwellknownDATA 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 \
-	uninstall-dist_chartsconfigDATA uninstall-dist_configDATA \
-	uninstall-dist_healthconfigDATA uninstall-dist_nodeconfigDATA \
-	uninstall-dist_pythonconfigDATA \
-	uninstall-dist_statsdconfigDATA
+	uninstall-dist_webDATA uninstall-dist_webcssDATA \
+	uninstall-dist_webdntDATA uninstall-dist_webfontsDATA \
+	uninstall-dist_webimagesDATA uninstall-dist_weblibDATA \
+	uninstall-dist_webwellknownDATA
+
+
+version.txt:
+	if test -d "$(top_srcdir)/.git"; then \
+		git --git-dir="$(top_srcdir)/.git" log -n 1 --format=%H; \
+	fi > $@.tmp
+	test -s $@.tmp || echo 0 > $@.tmp
+	mv $@.tmp $@
 
+.PHONY: version.txt
 
 # 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.