Merging upstream version 1.12.2.

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

9 files changed, 312 insertions, 855 deletions

diff --git a/web/gui/Makefile.in b/web/gui/Makefile.in
deleted file mode 100644
index 345a3403..00000000
--- a/web/gui/Makefile.in
+++ /dev/null
@@ -1,838 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = web/gui
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(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)/build/m4/ax_c___atomic.m4 \
-	$(top_srcdir)/build/m4/ax_c__generic.m4 \
-	$(top_srcdir)/build/m4/ax_c_lto.m4 \
-	$(top_srcdir)/build/m4/ax_c_mallinfo.m4 \
-	$(top_srcdir)/build/m4/ax_c_mallopt.m4 \
-	$(top_srcdir)/build/m4/ax_check_compile_flag.m4 \
-	$(top_srcdir)/build/m4/ax_gcc_func_attribute.m4 \
-	$(top_srcdir)/build/m4/ax_pthread.m4 \
-	$(top_srcdir)/build/m4/jemalloc.m4 \
-	$(top_srcdir)/build/m4/tcmalloc.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-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@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CUPSCONFIG = @CUPSCONFIG@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-IPMIMONITORING_CFLAGS = @IPMIMONITORING_CFLAGS@
-IPMIMONITORING_LIBS = @IPMIMONITORING_LIBS@
-LDFLAGS = @LDFLAGS@
-LIBCAP_CFLAGS = @LIBCAP_CFLAGS@
-LIBCAP_LIBS = @LIBCAP_LIBS@
-LIBMNL_CFLAGS = @LIBMNL_CFLAGS@
-LIBMNL_LIBS = @LIBMNL_LIBS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MATH_CFLAGS = @MATH_CFLAGS@
-MATH_LIBS = @MATH_LIBS@
-MKDIR_P = @MKDIR_P@
-NFACCT_CFLAGS = @NFACCT_CFLAGS@
-NFACCT_LIBS = @NFACCT_LIBS@
-OBJEXT = @OBJEXT@
-OPTIONAL_CUPS_CFLAGS = @OPTIONAL_CUPS_CFLAGS@
-OPTIONAL_CUPS_LIBS = @OPTIONAL_CUPS_LIBS@
-OPTIONAL_IPMIMONITORING_CFLAGS = @OPTIONAL_IPMIMONITORING_CFLAGS@
-OPTIONAL_IPMIMONITORING_LIBS = @OPTIONAL_IPMIMONITORING_LIBS@
-OPTIONAL_LIBCAP_CFLAGS = @OPTIONAL_LIBCAP_CFLAGS@
-OPTIONAL_LIBCAP_LIBS = @OPTIONAL_LIBCAP_LIBS@
-OPTIONAL_MATH_CLFAGS = @OPTIONAL_MATH_CLFAGS@
-OPTIONAL_MATH_LIBS = @OPTIONAL_MATH_LIBS@
-OPTIONAL_NFACCT_CLFAGS = @OPTIONAL_NFACCT_CLFAGS@
-OPTIONAL_NFACCT_LIBS = @OPTIONAL_NFACCT_LIBS@
-OPTIONAL_UUID_CLFAGS = @OPTIONAL_UUID_CLFAGS@
-OPTIONAL_UUID_LIBS = @OPTIONAL_UUID_LIBS@
-OPTIONAL_ZLIB_CLFAGS = @OPTIONAL_ZLIB_CLFAGS@
-OPTIONAL_ZLIB_LIBS = @OPTIONAL_ZLIB_LIBS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_RPM_VERSION = @PACKAGE_RPM_VERSION@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-PTHREAD_CC = @PTHREAD_CC@
-PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-PTHREAD_LIBS = @PTHREAD_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SSE_CANDIDATE = @SSE_CANDIDATE@
-STRIP = @STRIP@
-UUID_CFLAGS = @UUID_CFLAGS@
-UUID_LIBS = @UUID_LIBS@
-VERSION = @VERSION@
-ZLIB_CFLAGS = @ZLIB_CFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-ax_pthread_config = @ax_pthread_config@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_target = @build_target@
-build_vendor = @build_vendor@
-builddir = @builddir@
-cachedir = @cachedir@
-chartsdir = @chartsdir@
-configdir = @configdir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-has_jemalloc = @has_jemalloc@
-has_tcmalloc = @has_tcmalloc@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libconfigdir = @libconfigdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-logdir = @logdir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-nodedir = @nodedir@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pluginsdir = @pluginsdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pythondir = @pythondir@
-registrydir = @registrydir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-varlibdir = @varlibdir@
-webdir = @webdir@
-
-#
-# Copyright (C) 2015 Alon Bar-Lev <alon.barlev@gmail.com>
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-CLEANFILES = \
-	dashboard.js \
-	version.txt \
-	$(NULL)
-
-DASHBOARD_JS_FILES = \
-    src/dashboard.js/prologue.js.inc \
-    src/dashboard.js/utils.js \
-    src/dashboard.js/server-detection.js \
-    src/dashboard.js/dependencies.js \
-    src/dashboard.js/error-handling.js \
-    src/dashboard.js/compatibility.js \
-    src/dashboard.js/xss.js \
-    src/dashboard.js/colors.js \
-    src/dashboard.js/units-conversion.js \
-    src/dashboard.js/options.js \
-    src/dashboard.js/localstorage.js \
-    src/dashboard.js/timeout.js \
-    src/dashboard.js/themes.js \
-    src/dashboard.js/charting/dygraph.js \
-    src/dashboard.js/charting/sparkline.js \
-    src/dashboard.js/charting/google-charts.js \
-    src/dashboard.js/charting/gauge.js \
-    src/dashboard.js/charting/easy-pie-chart.js \
-    src/dashboard.js/charting/d3pie.js \
-    src/dashboard.js/charting/d3.js \
-    src/dashboard.js/charting/peity.js \
-    src/dashboard.js/charting.js \
-    src/dashboard.js/chart-registry.js \
-    src/dashboard.js/common.js \
-    src/dashboard.js/main.js \
-    src/dashboard.js/alarms.js \
-    src/dashboard.js/registry.js \
-    src/dashboard.js/boot.js \
-    src/dashboard.js/epilogue.js.inc \
-    $(NULL)
-
-dist_noinst_DATA = \
-	README.md \
-	$(DASHBOARD_JS_FILES) \
-	$(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 \
-	main.css \
-	main.js \
-	infographic.html \
-	robots.txt \
-	refresh-badges.js \
-	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/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/pako-1.0.6.min.js \
-	lib/perfect-scrollbar-0.6.15.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/netdata-logomark.svg \
-	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/android-icon-36x36.png \
-	images/android-icon-48x48.png \
-	images/android-icon-72x72.png \
-	images/android-icon-96x96.png \
-	images/android-icon-144x144.png \
-	images/android-icon-192x192.png \
-    images/apple-icon-57x57.png \
-    images/apple-icon-60x60.png \
-    images/apple-icon-72x72.png \
-    images/apple-icon-76x76.png \
-    images/apple-icon-114x114.png \
-    images/apple-icon-120x120.png \
-    images/apple-icon-144x144.png \
-    images/apple-icon-152x152.png \
-    images/apple-icon-180x180.png \
-    images/apple-icon-precomposed.png \
-    images/apple-icon.png \
-    images/favicon-16x16.png \
-    images/favicon-32x32.png \
-    images/favicon-96x96.png \
-    images/favicon.ico \
-    images/ms-icon-70x70.png \
-    images/ms-icon-144x144.png \
-    images/ms-icon-150x150.png \
-    images/ms-icon-310x310.png \
-	images/banner-icon-144x144.png \
-	$(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
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu web/gui/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu web/gui/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-dist_webDATA: $(dist_web_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(webdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webdir)" || exit $$?; \
-	done
-
-uninstall-dist_webDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(webdir)'; $(am__uninstall_files_from_dir)
-install-dist_webcssDATA: $(dist_webcss_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_webcss_DATA)'; test -n "$(webcssdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(webcssdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webcssdir)" || exit $$?; \
-	done
-
-uninstall-dist_webcssDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webcss_DATA)'; test -n "$(webcssdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(webcssdir)'; $(am__uninstall_files_from_dir)
-install-dist_webdntDATA: $(dist_webdnt_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_webdnt_DATA)'; test -n "$(webdntdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(webdntdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webdntdir)" || exit $$?; \
-	done
-
-uninstall-dist_webdntDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webdnt_DATA)'; test -n "$(webdntdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(webdntdir)'; $(am__uninstall_files_from_dir)
-install-dist_webfontsDATA: $(dist_webfonts_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_webfonts_DATA)'; test -n "$(webfontsdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(webfontsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webfontsdir)" || exit $$?; \
-	done
-
-uninstall-dist_webfontsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webfonts_DATA)'; test -n "$(webfontsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(webfontsdir)'; $(am__uninstall_files_from_dir)
-install-dist_webimagesDATA: $(dist_webimages_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_webimages_DATA)'; test -n "$(webimagesdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(webimagesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webimagesdir)" || exit $$?; \
-	done
-
-uninstall-dist_webimagesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webimages_DATA)'; test -n "$(webimagesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(webimagesdir)'; $(am__uninstall_files_from_dir)
-install-dist_weblibDATA: $(dist_weblib_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_weblib_DATA)'; test -n "$(weblibdir)" || list=; \
-	if test -n "$$list"; then \
-	  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)$(weblibdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(weblibdir)" || exit $$?; \
-	done
-
-uninstall-dist_weblibDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_weblib_DATA)'; test -n "$(weblibdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	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:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	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
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-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-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: 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_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_webDATA uninstall-dist_webcssDATA \
-	uninstall-dist_webdntDATA uninstall-dist_webfontsDATA \
-	uninstall-dist_webimagesDATA uninstall-dist_weblibDATA \
-	uninstall-dist_webwellknownDATA
-
-
-dashboard.js: $(DASHBOARD_JS_FILES)
-	if test -f $@; then rm -f $@; fi
-	cat $(DASHBOARD_JS_FILES) > $@.tmp && mv $@.tmp $@
-
-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 $@
-
-# regenerate these files, even if they are up to date
-.PHONY: version.txt dashboard.js
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/web/gui/browserconfig.xml b/web/gui/browserconfig.xml
new file mode 100644
index 00000000..32f47595
--- /dev/null
+++ b/web/gui/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="images/ms-icon-70x70.png"/><square150x150logo src="images/ms-icon-150x150.png"/><square310x310logo src="images/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
diff --git a/web/gui/images/seo-performance-128.png b/web/gui/images/seo-performance-128.png
new file mode 100644
index 00000000..2a212a47
--- /dev/null
+++ b/web/gui/images/seo-performance-128.png
diff --git a/web/gui/main.js b/web/gui/main.js
index 86dca62f..8ea33e54 100644
--- a/web/gui/main.js
+++ b/web/gui/main.js
@@ -550,10 +550,6 @@ function renderStreamedHosts(options) {
 }
 
 function renderMachines(machinesArray) {
-    // let html = isSignedIn() 
-    //     ? `<div class="info-item">My nodes</div>`
-    //     : `<div class="info-item">My nodes</div>`;
-
     let html = `<div class="info-item">My nodes</div>`;
 
     if (machinesArray === null) {
@@ -710,13 +706,6 @@ function renderMyNetdataMenu(machinesArray) {
     const el = document.getElementById('my-netdata-dropdown-content');
     el.classList.add(`theme-${netdataTheme}`);
 
-    if (!isSignedIn()) {
-        if (!NETDATA.registry.isRegistryEnabled()) {
-            restrictMyNetdataMenu();
-            return;
-        }
-    }
-
     if (machinesArray == registryAgents) {
         console.log("Rendering my-netdata menu from registry");
     } else {
@@ -725,6 +714,18 @@ function renderMyNetdataMenu(machinesArray) {
 
     let html = '';
 
+    if (!isSignedIn()) {
+        if (!NETDATA.registry.isRegistryEnabled()) {
+            html += (
+                `<div class="info-item" style="white-space: nowrap">
+                    <span>Please <a href="#" onclick="signInDidClick(event); return false">sign in to netdata.cloud</a> to view your nodes!</span>
+                    <div></div>
+                </div>
+                <hr />`
+            );
+        }
+    }
+
     if (isSignedIn()) {
         html += (
             `<div class="filter-control">
@@ -743,16 +744,26 @@ function renderMyNetdataMenu(machinesArray) {
         );
     }
 
+    // options.hosts = [
+    //     {
+    //         hostname: "streamed1",
+    //     },
+    //     {
+    //         hostname: "streamed2",
+    //     },
+    // ]
+
     if (options.hosts.length > 1) {
         html += `<div id="my-netdata-menu-streamed">${renderStreamedHosts(options)}</div><hr />`;
     }
 
-    html += `<div id="my-netdata-menu-machines">${renderMachines(machinesArray)}</div>`;
+    if (isSignedIn() || NETDATA.registry.isRegistryEnabled()) {
+        html += `<div id="my-netdata-menu-machines">${renderMachines(machinesArray)}</div><hr />`;
+    }
 
     if (!isSignedIn()) {
         html += (
-            `<hr />
-            <div class="agent-item">
+            `<div class="agent-item">
                 <i class="fas fa-cog""></i>
                 <a href="#" onclick="switchRegistryModalHandler(); return false;">Switch Identity</a>
                 <div></div>
@@ -765,8 +776,7 @@ function renderMyNetdataMenu(machinesArray) {
         )
     } else {
         html += (
-            `<hr />
-            <div class="agent-item">
+            `<div class="agent-item">
                 <i class="fas fa-sync"></i>
                 <a href="#" onclick="showSyncModal(); return false">Synchronize with netdata.cloud</a>
                 <div></div>
diff --git a/web/gui/manifest.json b/web/gui/manifest.json
new file mode 100644
index 00000000..52cb4831
--- /dev/null
+++ b/web/gui/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "images\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "images\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "images\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "images\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "images\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "images\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
diff --git a/web/gui/src/dashboard.js/charting/_c3.js b/web/gui/src/dashboard.js/charting/_c3.js
new file mode 100644
index 00000000..6688bbcc
--- /dev/null
+++ b/web/gui/src/dashboard.js/charting/_c3.js
@@ -0,0 +1,114 @@
+
+// DEPRECATED: will be removed!
+
+// c3
+
+NETDATA.c3Initialize = function(callback) {
+    if (typeof netdataNoC3 === 'undefined' || !netdataNoC3) {
+
+        // C3 requires D3
+        if (!NETDATA.chartLibraries.d3.initialized) {
+            if (NETDATA.chartLibraries.d3.enabled) {
+                NETDATA.d3Initialize(function() {
+                    NETDATA.c3Initialize(callback);
+                });
+            } else {
+                NETDATA.chartLibraries.c3.enabled = false;
+                if (typeof callback === "function")
+                    return callback();
+            }
+        } else {
+            NETDATA._loadCSS(NETDATA.c3_css);
+
+            $.ajax({
+                url: NETDATA.c3_js,
+                cache: true,
+                dataType: "script",
+                xhrFields: { withCredentials: true } // required for the cookie
+            })
+            .done(function() {
+                NETDATA.registerChartLibrary('c3', NETDATA.c3_js);
+            })
+            .fail(function() {
+                NETDATA.chartLibraries.c3.enabled = false;
+                NETDATA.error(100, NETDATA.c3_js);
+            })
+            .always(function() {
+                if (typeof callback === "function")
+                    return callback();
+            });
+        }
+    } else {
+        NETDATA.chartLibraries.c3.enabled = false;
+        if (typeof callback === "function")
+            return callback();
+    }
+};
+
+NETDATA.c3ChartUpdate = function(state, data) {
+    state.c3_instance.destroy();
+    return NETDATA.c3ChartCreate(state, data);
+
+    //state.c3_instance.load({
+    //  rows: data.result,
+    //  unload: true
+    //});
+
+    //return true;
+};
+
+NETDATA.c3ChartCreate = function(state, data) {
+
+    state.element_chart.id = 'c3-' + state.uuid;
+    // console.log('id = ' + state.element_chart.id);
+
+    state.c3_instance = c3.generate({
+        bindto: '#' + state.element_chart.id,
+        size: {
+            width: state.chartWidth(),
+            height: state.chartHeight()
+        },
+        color: {
+            pattern: state.chartColors()
+        },
+        data: {
+            x: 'time',
+            rows: data.result,
+            type: (state.chart.chart_type === 'line')?'spline':'area-spline'
+        },
+        axis: {
+            x: {
+                type: 'timeseries',
+                tick: {
+                    format: function(x) {
+                        return NETDATA.dateTime.xAxisTimeString(x);
+                    }
+                }
+            }
+        },
+        grid: {
+            x: {
+                show: true
+            },
+            y: {
+                show: true
+            }
+        },
+        point: {
+            show: false
+        },
+        line: {
+            connectNull: false
+        },
+        transition: {
+            duration: 0
+        },
+        interaction: {
+            enabled: true
+        }
+    });
+
+    // console.log(state.c3_instance);
+
+    return true;
+};
diff --git a/web/gui/src/dashboard.js/charting/_morris.js b/web/gui/src/dashboard.js/charting/_morris.js
new file mode 100644
index 00000000..30789e4e
--- /dev/null
+++ b/web/gui/src/dashboard.js/charting/_morris.js
@@ -0,0 +1,81 @@
+
+// DEPRECATED: will be removed!
+
+// morris
+
+NETDATA.morrisInitialize = function(callback) {
+    if (typeof netdataNoMorris === 'undefined' || !netdataNoMorris) {
+
+        // morris requires raphael
+        if (!NETDATA.chartLibraries.raphael.initialized) {
+            if (NETDATA.chartLibraries.raphael.enabled) {
+                NETDATA.raphaelInitialize(function() {
+                    NETDATA.morrisInitialize(callback);
+                });
+            } else {
+                NETDATA.chartLibraries.morris.enabled = false;
+                if (typeof callback === "function")
+                    return callback();
+            }
+        } else {
+            NETDATA._loadCSS(NETDATA.morris_css);
+
+            $.ajax({
+                url: NETDATA.morris_js,
+                cache: true,
+                dataType: "script",
+                xhrFields: { withCredentials: true } // required for the cookie
+            })
+            .done(function() {
+                NETDATA.registerChartLibrary('morris', NETDATA.morris_js);
+            })
+            .fail(function() {
+                NETDATA.chartLibraries.morris.enabled = false;
+                NETDATA.error(100, NETDATA.morris_js);
+            })
+            .always(function() {
+                if (typeof callback === "function")
+                    return callback();
+            });
+        }
+    } else {
+        NETDATA.chartLibraries.morris.enabled = false;
+        if (typeof callback === "function")
+            return callback();
+    }
+};
+
+NETDATA.morrisChartUpdate = function(state, data) {
+    state.morris_instance.setData(data.result.data);
+    return true;
+};
+
+NETDATA.morrisChartCreate = function(state, data) {
+
+    state.morris_options = {
+            element: state.element_chart.id,
+            data: data.result.data,
+            xkey: 'time',
+            ykeys: data.dimension_names,
+            labels: data.dimension_names,
+            lineWidth: 2,
+            pointSize: 3,
+            smooth: true,
+            hideHover: 'auto',
+            parseTime: true,
+            continuousLine: false,
+            behaveLikeLine: false
+    };
+
+    if (state.chart.chart_type === 'line')
+        state.morris_instance = new Morris.Line(state.morris_options);
+
+    else if (state.chart.chart_type === 'area') {
+        state.morris_options.behaveLikeLine = true;
+        state.morris_instance = new Morris.Area(state.morris_options);
+    }
+    else // stacked
+        state.morris_instance = new Morris.Area(state.morris_options);
+
+    return true;
+};
diff --git a/web/gui/src/dashboard.js/charting/_raphael.js b/web/gui/src/dashboard.js/charting/_raphael.js
new file mode 100644
index 00000000..2d89a22a
--- /dev/null
+++ b/web/gui/src/dashboard.js/charting/_raphael.js
@@ -0,0 +1,48 @@
+
+// DEPRECATED: will be removed!
+
+// raphael
+
+NETDATA.raphaelInitialize = function(callback) {
+    if (typeof netdataStopRaphael === 'undefined' || !netdataStopRaphael) {
+        $.ajax({
+            url: NETDATA.raphael_js,
+            cache: true,
+            dataType: "script",
+            xhrFields: { withCredentials: true } // required for the cookie
+        })
+        .done(function() {
+            NETDATA.registerChartLibrary('raphael', NETDATA.raphael_js);
+        })
+        .fail(function() {
+            NETDATA.chartLibraries.raphael.enabled = false;
+            NETDATA.error(100, NETDATA.raphael_js);
+        })
+        .always(function() {
+            if (typeof callback === "function")
+                return callback();
+        });
+    } else {
+        NETDATA.chartLibraries.raphael.enabled = false;
+        if (typeof callback === "function")
+            return callback();
+    }
+};
+
+NETDATA.raphaelChartUpdate = function(state, data) {
+    $(state.element_chart).raphael(data.result, {
+        width: state.chartWidth(),
+        height: state.chartHeight()
+    });
+
+    return false;
+};
+
+NETDATA.raphaelChartCreate = function(state, data) {
+    $(state.element_chart).raphael(data.result, {
+        width: state.chartWidth(),
+        height: state.chartHeight()
+    });
+
+    return false;
+};
diff --git a/web/gui/version.txt b/web/gui/version.txt
deleted file mode 100644
index 66fc13bd..00000000
--- a/web/gui/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-942646651fe614885bdb2eb54672f69416af02dd