diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
index 163ec8920..e3abe7f0e 100644
--- a/net-mgmt/netdata/Makefile
+++ b/net-mgmt/netdata/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.29.2
+DISTVERSION=	1.31.0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
@@ -58,7 +58,7 @@ FREEIPMI_DESC=			Enable support for freeipmi
 GOPLUGIN_DESC=		Enable the go collector plugin
 
 CLOUD_CONFIGURE_OFF=	--disable-cloud
-CLOUD_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-web_gui_index.html \
+CLOUD_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-web_gui_old_index.html \
 			${FILESDIR}/extra-patch-web_gui_main.js
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=	plugin-cups
@@ -105,7 +105,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${NETDATA_PERST}
 	(for fi in 	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \
 			${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf \
-			${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.txt ; do \
+			${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.txt ; do \
 		${MV} $$fi $$fi".sample"; \
 	done)
 
diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo
index c01848f7d..5f98f4867 100644
--- a/net-mgmt/netdata/distinfo
+++ b/net-mgmt/netdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613694033
-SHA256 (netdata-v1.29.2.tar.gz) = 3419a2b54cd29946900e88fa96f8235b6db50bafa615a35c0035887e8a3f5074
-SIZE (netdata-v1.29.2.tar.gz) = 6736119
+TIMESTAMP = 1621439942
+SHA256 (netdata-v1.31.0.tar.gz) = ca68f725224e8bbec041b493891376fbf41aedb47c4ac06161c2eda990089c9f
+SIZE (netdata-v1.31.0.tar.gz) = 12528280
diff --git a/net-mgmt/netdata/files/extra-patch-web_gui_index.html b/net-mgmt/netdata/files/extra-patch-web_gui_index.html
deleted file mode 100644
index 18aa0dbb6..000000000
--- a/net-mgmt/netdata/files/extra-patch-web_gui_index.html
+++ /dev/null
@@ -1,28 +0,0 @@
---- web/gui/index.html.orig	2020-04-13 16:02:25 UTC
-+++ web/gui/index.html
-@@ -90,7 +90,9 @@
-             </div>
-             <nav class="collapse navbar-collapse navbar-right" role="navigation">
-                 <ul class="nav navbar-nav">
-+                    <!--
-                     <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i>&nbsp;<span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
-+                    -->
-                     <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
-                     <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
-                     <!--
-@@ -114,6 +116,7 @@
-         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
-     </div>
- 
-+<!--
-     <div id="sign-in-banner" style="display: none">
-         <div class="container">
-             Like what you see? 
-@@ -124,6 +127,7 @@
-             </div>
-         </div>
-     </div>
-+-->
-     
-     <div id="masthead" style="display: none;">
-         <div class="container">
diff --git a/net-mgmt/netdata/files/extra-patch-web_gui_old_index.html b/net-mgmt/netdata/files/extra-patch-web_gui_old_index.html
new file mode 100644
index 000000000..aee14ee05
--- /dev/null
+++ b/net-mgmt/netdata/files/extra-patch-web_gui_old_index.html
@@ -0,0 +1,18 @@
+--- web/gui/old/index.html.orig 2021-05-19 11:20:05.281237503 -0500
++++ web/gui/old/index.html      2021-05-19 11:22:54.921175521 -0500
+@@ -109,6 +109,7 @@
+         <div id="navbar-highlight-content" class="navbar-highlight-content"></div>
+     </div>
+
++<!--
+     <div id="sign-in-banner" style="display: none">
+         <div class="container">
+             Like what you see?
+@@ -119,6 +120,7 @@
+             </div>
+         </div>
+     </div>
++-->
+
+     <div id="masthead" style="display: none;">
+         <div class="container">
diff --git a/net-mgmt/netdata/files/patch-web_gui_index.html b/net-mgmt/netdata/files/patch-web_gui_old_index.html
similarity index 88%
rename from net-mgmt/netdata/files/patch-web_gui_index.html
rename to net-mgmt/netdata/files/patch-web_gui_old_index.html
index b5d585329..1c85d25c7 100644
--- a/net-mgmt/netdata/files/patch-web_gui_index.html
+++ b/net-mgmt/netdata/files/patch-web_gui_old_index.html
@@ -1,7 +1,7 @@
---- web/gui/index.html.orig	2020-04-06 01:28:55 UTC
-+++ web/gui/index.html
-@@ -93,10 +93,14 @@
-                     <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i>&nbsp;<span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li>
+--- web/gui/old/index.html.orig 2021-05-19 11:20:05.281237503 -0500
++++ web/gui/old/index.html      2021-05-19 11:29:15.944932394 -0500
+@@ -92,10 +92,14 @@
+                 <ul class="nav navbar-nav">
                      <li id="alarmsButton"  title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</span><span id="alarms_count_badge" class="badge"></span></a></li>
                      <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i>&nbsp;<span class="hidden-sm hidden-md">Settings</span></a></li>
 +                    <!--
diff --git a/net-mgmt/netdata/pkg-plist b/net-mgmt/netdata/pkg-plist
index db77d8537..227385c4f 100644
--- a/net-mgmt/netdata/pkg-plist
+++ b/net-mgmt/netdata/pkg-plist
@@ -11,8 +11,13 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/nut.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf_kernel_reject_list.txt.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/cachestat.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/dcstat.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/ebpf_kernel_reject_list.txt.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/network.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/process.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/sync.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/exporting.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/fping.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample
@@ -20,7 +25,6 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/anomalies.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apache.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apps_plugin.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/backend.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/bcache.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/beanstalkd.conf.sample
@@ -82,6 +86,8 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/squid.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/stiebeleltron.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/swap.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/synchronization.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/systemdunits.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_conn.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_listen.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/tcp_mem.conf.sample
@@ -113,6 +119,7 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/bind_rndc.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/boinc.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ceph.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/changefinder.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/chrony.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/couchdb.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dns_query_time.conf.sample
@@ -174,7 +181,9 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/varnish.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/w1sensor.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/zscores.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/k6.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample
 libexec/netdata/charts.d/ap.chart.sh
 libexec/netdata/charts.d/apcupsd.chart.sh
@@ -232,6 +241,7 @@ libexec/netdata/python.d/beanstalk.chart.py
 libexec/netdata/python.d/bind_rndc.chart.py
 libexec/netdata/python.d/boinc.chart.py
 libexec/netdata/python.d/ceph.chart.py
+libexec/netdata/python.d/changefinder.chart.py
 libexec/netdata/python.d/chrony.chart.py
 libexec/netdata/python.d/couchdb.chart.py
 libexec/netdata/python.d/dns_query_time.chart.py
@@ -313,6 +323,7 @@ libexec/netdata/python.d/uwsgi.chart.py
 libexec/netdata/python.d/varnish.chart.py
 libexec/netdata/python.d/w1sensor.chart.py
 libexec/netdata/python.d/web_log.chart.py
+libexec/netdata/python.d/zscores.chart.py
 sbin/netdata
 sbin/netdata-claim.sh
 sbin/netdatacli
@@ -320,6 +331,7 @@ sbin/netdatacli
 @owner netdata
 @group netdata
 %%DATADIR%%/web/.well-known/dnt/cookies
+%%DATADIR%%/web/asset-manifest.json
 %%DATADIR%%/web/console.html
 %%DATADIR%%/web/css/bootstrap-3.3.7.css
 %%DATADIR%%/web/css/bootstrap-slate-flat-3.3.7.css
@@ -327,8 +339,11 @@ sbin/netdatacli
 %%DATADIR%%/web/css/bootstrap-theme-3.3.7.min.css
 %%DATADIR%%/web/css/bootstrap-toggle-2.2.2.min.css
 %%DATADIR%%/web/css/c3-0.4.18.min.css
+%%DATADIR%%/web/css/dashboard.css
+%%DATADIR%%/web/css/dashboard.slate.css
 %%DATADIR%%/web/css/morris-0.5.1.css
 %%DATADIR%%/web/dash-example.html
+%%DATADIR%%/web/dashboard-react.js
 %%DATADIR%%/web/dashboard.css
 %%DATADIR%%/web/dashboard.html
 %%DATADIR%%/web/dashboard.js
@@ -371,17 +386,24 @@ sbin/netdatacli
 %%DATADIR%%/web/images/banner-icon-144x144.png
 %%DATADIR%%/web/images/check-mark-2-128-green.png
 %%DATADIR%%/web/images/check-mark-2-multi-size-green.ico
+%%DATADIR%%/web/images/favicon-128.png
 %%DATADIR%%/web/images/favicon-16x16.png
+%%DATADIR%%/web/images/favicon-196x196.png
 %%DATADIR%%/web/images/favicon-32x32.png
 %%DATADIR%%/web/images/favicon-96x96.png
 %%DATADIR%%/web/images/favicon.ico
 %%DATADIR%%/web/images/ms-icon-144x144.png
 %%DATADIR%%/web/images/ms-icon-150x150.png
+%%DATADIR%%/web/images/ms-icon-310x150.png
 %%DATADIR%%/web/images/ms-icon-310x310.png
+%%DATADIR%%/web/images/ms-icon-36x36.png
 %%DATADIR%%/web/images/ms-icon-70x70.png
 %%DATADIR%%/web/images/netdata-logomark.svg
 %%DATADIR%%/web/images/netdata.svg
+%%DATADIR%%/web/images/packaging-beta-tag.svg
 %%DATADIR%%/web/images/post.png
+%%DATADIR%%/web/images/seo-performance-128.png
+%%DATADIR%%/web/index-node-view.html
 %%DATADIR%%/web/index.html
 %%DATADIR%%/web/infographic.html
 %%DATADIR%%/web/lib/bootstrap-3.3.7.min.js
@@ -406,13 +428,77 @@ sbin/netdatacli
 %%DATADIR%%/web/lib/tableExport-1.6.0.min.js
 %%DATADIR%%/web/main.css
 %%DATADIR%%/web/main.js
+%%DATADIR%%/web/manifest.json
 %%DATADIR%%/web/netdata-swagger.json
 %%DATADIR%%/web/netdata-swagger.yaml
 %%DATADIR%%/web/old/index.html
+%%DATADIR%%/web/precache-manifest.1a96c027aec7f2d07341fa69aa6b82fa.js
 %%DATADIR%%/web/refresh-badges.js
 %%DATADIR%%/web/robots.txt
+%%DATADIR%%/web/service-worker.js
 %%DATADIR%%/web/sitemap.xml
+%%DATADIR%%/web/static/css/2.6b842ba1.chunk.css
+%%DATADIR%%/web/static/css/2.6b842ba1.chunk.css.map
+%%DATADIR%%/web/static/css/4.a36e3b73.chunk.css
+%%DATADIR%%/web/static/css/4.a36e3b73.chunk.css.map
+%%DATADIR%%/web/static/css/main.d931154a.chunk.css
+%%DATADIR%%/web/static/css/main.d931154a.chunk.css.map
 %%DATADIR%%/web/static/img/netdata-logomark.svg
+%%DATADIR%%/web/static/js/10.db7e8e19.chunk.js
+%%DATADIR%%/web/static/js/10.db7e8e19.chunk.js.map
+%%DATADIR%%/web/static/js/2.252b3a57.chunk.js
+%%DATADIR%%/web/static/js/2.252b3a57.chunk.js.LICENSE
+%%DATADIR%%/web/static/js/2.252b3a57.chunk.js.map
+%%DATADIR%%/web/static/js/3.99238dcb.chunk.js
+%%DATADIR%%/web/static/js/3.99238dcb.chunk.js.map
+%%DATADIR%%/web/static/js/4.6ef9bdcb.chunk.js
+%%DATADIR%%/web/static/js/4.6ef9bdcb.chunk.js.map
+%%DATADIR%%/web/static/js/5.96a698ab.chunk.js
+%%DATADIR%%/web/static/js/5.96a698ab.chunk.js.LICENSE
+%%DATADIR%%/web/static/js/5.96a698ab.chunk.js.map
+%%DATADIR%%/web/static/js/6.d9713eb9.chunk.js
+%%DATADIR%%/web/static/js/6.d9713eb9.chunk.js.map
+%%DATADIR%%/web/static/js/7.12e939e5.chunk.js
+%%DATADIR%%/web/static/js/7.12e939e5.chunk.js.map
+%%DATADIR%%/web/static/js/8.91852cf4.chunk.js
+%%DATADIR%%/web/static/js/8.91852cf4.chunk.js.map
+%%DATADIR%%/web/static/js/9.e3a9ce26.chunk.js
+%%DATADIR%%/web/static/js/9.e3a9ce26.chunk.js.map
+%%DATADIR%%/web/static/js/main.8aa70c75.chunk.js
+%%DATADIR%%/web/static/js/main.8aa70c75.chunk.js.LICENSE
+%%DATADIR%%/web/static/js/main.8aa70c75.chunk.js.map
+%%DATADIR%%/web/static/js/runtime-main.6c7b39cd.js
+%%DATADIR%%/web/static/js/runtime-main.6c7b39cd.js.map
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.245539db.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.9a582f3a.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100italic.1ea7c5d2.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-100italic.3c34cf08.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200.67524c36.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200.bf72c841.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200italic.52df2560.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-200italic.bbc2d552.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300.10bb6a0a.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300.9e1c48af.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300italic.c76f2ab5.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-300italic.d3566d5b.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400.263d6267.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400.a2c56f94.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400italic.272f8611.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-400italic.89a93a1b.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500.0866c244.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500.f6d5c5d5.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500italic.ccd41bd1.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-500italic.ffd12d59.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600.337b1651.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600.7852d4dc.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600italic.17e5379f.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-600italic.6f4ba6aa.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700.b8809d61.woff
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700.c9983d3d.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700italic.02954bee.woff2
+%%DATADIR%%/web/static/media/ibm-plex-sans-latin-700italic.72e9af40.woff
+%%DATADIR%%/web/static/media/material-icons.0509ab09.woff2
+%%DATADIR%%/web/tv-react.html
 %%DATADIR%%/web/tv.html
 %%DATADIR%%/web/version.txt
 @mode
@@ -420,6 +506,7 @@ sbin/netdatacli
 @group
 @dir(netdata,netdata,0750) %%ETCDIR%%/charts.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/custom-plugins.d
+@dir(netdata,netdata,0750) %%ETCDIR%%/ebpf.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/go.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/health.d
 @dir(netdata,netdata,0750) %%ETCDIR%%/node.d