git: 216ec712fa98 - main - net/ntopng: Update to 5.6 latest upstream stable snapshot

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Mon, 20 Feb 2023 11:37:07 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=216ec712fa982e2444b6b4b1c4d03141a6c61f43

commit 216ec712fa982e2444b6b4b1c4d03141a6c61f43
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-02-20 11:36:37 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-02-20 11:36:37 +0000

    net/ntopng: Update to 5.6 latest upstream stable snapshot
---
 net/ntopng/Makefile                    |   6 +-
 net/ntopng/distinfo                    |  10 +-
 net/ntopng/files/patch-FlowDevicesFix  |  41 --------
 net/ntopng/files/patch-configure.ac.in | 111 ++++++++++++--------
 net/ntopng/pkg-plist                   | 182 ++++++++++++++++++++++++++-------
 5 files changed, 219 insertions(+), 131 deletions(-)

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 1dc1566522a7..a5bd4f43c90e 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ntopng
-PORTVERSION=	5.4.d20221219
+PORTVERSION=	5.6.d20230216
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -38,9 +38,9 @@ GROUPS=		ntopng
 PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
-GH_TUPLE=	ntop:ntopng-dist:9579bab:dist/httpdocs/dist
+GH_TUPLE=	ntop:ntopng-dist:6f66796:dist/httpdocs/dist
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	05f68a1
+GH_TAGNAME=	39ce2fd
 
 CPE_VENDOR=	ntop
 
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index a75d33fd591f..4e1bcd99e266 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1671612269
-SHA256 (ntop-ntopng-5.4.d20221219-05f68a1_GH0.tar.gz) = 762eed49add7c8125357a1c0e0304355abbb306854442ade71d93ed9ec129ee1
-SIZE (ntop-ntopng-5.4.d20221219-05f68a1_GH0.tar.gz) = 42663355
-SHA256 (ntop-ntopng-dist-9579bab_GH0.tar.gz) = 5108087df5ad60512d646909db5f63aceedd99c24ba0f8c594c4c88dba1a04dd
-SIZE (ntop-ntopng-dist-9579bab_GH0.tar.gz) = 1712425
+TIMESTAMP = 1676626872
+SHA256 (ntop-ntopng-5.6.d20230216-39ce2fd_GH0.tar.gz) = 3d0f50dfc52ab5404318fa86d3fbdc5260ef1324f850bcdd79d4556e534af27c
+SIZE (ntop-ntopng-5.6.d20230216-39ce2fd_GH0.tar.gz) = 46322951
+SHA256 (ntop-ntopng-dist-6f66796_GH0.tar.gz) = d75d0e5c8afd81aa4615e4cbd5701ff623106e1ef1f9a17cb50f16da99b32044
+SIZE (ntop-ntopng-dist-6f66796_GH0.tar.gz) = 2480369
diff --git a/net/ntopng/files/patch-FlowDevicesFix b/net/ntopng/files/patch-FlowDevicesFix
deleted file mode 100644
index 55a058a54355..000000000000
--- a/net/ntopng/files/patch-FlowDevicesFix
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9d7bdc36a0d9cf7f06fd66f1ee26d7bb79c7c109 Mon Sep 17 00:00:00 2001
-From: Luca Deri <deri@ntop.org>
-Date: Mon, 12 Dec 2022 10:37:13 +0100
-Subject: [PATCH] Fixes #7029
-
----
- scripts/lua/inc/menu.lua   | 2 +-
- src/LuaEngineInterface.cpp | 4 +++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/scripts/lua/inc/menu.lua b/scripts/lua/inc/menu.lua
-index 24bfbabd3b3..081c7729171 100644
---- scripts/lua/inc/menu.lua
-+++ scripts/lua/inc/menu.lua
-@@ -305,7 +305,7 @@ else
-    
-    -- Exporters
- 
--   local has_exporters = (ifs.type == "zmq") or (ifs.type == "custom") or (table.len(interface.getFlowDevices()) > 0)
-+   local has_exporters = (ifs.type == "zmq") or (ifs.type == "custom") or (ntop.isPro() and (table.len(interface.getFlowDevices()) > 0))
- 
-    page_utils.add_menubar_section(
-       {
-diff --git a/src/LuaEngineInterface.cpp b/src/LuaEngineInterface.cpp
-index fa1cc582fa1..9dfc147effd 100644
---- src/LuaEngineInterface.cpp
-+++ src/LuaEngineInterface.cpp
-@@ -4657,10 +4657,12 @@ static luaL_Reg _ntop_interface_reg[] = {
-   /* SNMP */
-   { "getSNMPStats",                     ntop_interface_get_snmp_stats         },
- 
-+#ifdef NTOPNG_PRO
-   /* Flow Devices */
-   { "getFlowDevices",                   ntop_get_flow_devices                  },
-   { "getFlowDeviceInfo",                ntop_get_flow_device_info              },
--
-+#endif
-+  
- #ifdef HAVE_NEDGE
-   /* L7 */
-   { "reloadL7Rules",                    ntop_reload_l7_rules                   },
diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in
index 004b011f0ea6..72c8dad69b2f 100644
--- a/net/ntopng/files/patch-configure.ac.in
+++ b/net/ntopng/files/patch-configure.ac.in
@@ -1,6 +1,6 @@
---- configure.ac.in.orig	2022-07-19 08:13:10 UTC
+--- configure.ac.in.orig	2023-02-16 14:08:39 UTC
 +++ configure.ac.in
-@@ -86,56 +86,8 @@ LIBPCAP=-lpcap
+@@ -91,56 +91,8 @@ LIBPCAP=-lpcap
  MAKE=make
  BIN_PATH=/usr/bin
  LIBPCAP=-lpcap
@@ -12,7 +12,7 @@
 -
 -   dnl> https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
 -   CC=clang
--   CXX="clang++ -fPIE"
+-   CXX="clang++ -fpie -fno-color-diagnostics $CLANG_STDLIB"
 -   if test $SYSTEM = "FreeBSD"; then
 -    MAKE=gmake
 -    BIN_PATH=/usr/local/bin
@@ -37,28 +37,28 @@
 -            CFLAGS="-fno-color-diagnostics $CFLAGS"
 -      fi
 -   fi
--else
--  if test $SYSTEM = "Linux"; then
--    if [ test -f /usr/bin/clang++ ]; then
--      CC=clang
--      CXX="clang++ -fPIE"
--      AC_MSG_RESULT(Using clang++ compiler)
--    fi
--
--    if [ test -f /etc/redhat-release ]; then
--      OS=`cat /etc/redhat-release`
--    else
--      if [ test -f /usr/bin/lsb_release ]; then
--        OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2`
--      fi
--    fi
--  fi
+-dnl> else
+-dnl>   if test $SYSTEM = "Linux"; then
+-dnl>     if [ test -f /usr/bin/clang++ ]; then
+-dnl>       CC=clang
+-dnl>       CXX="clang++ -fpie -fno-color-diagnostics $CLANG_STDLIB"
+-dnl>       AC_MSG_RESULT(Using clang++ compiler)
+-dnl>     fi
+-dnl> 
+-dnl>     if [ test -f /etc/redhat-release ]; then
+-dnl>       OS=`cat /etc/redhat-release`
+-dnl>     else
+-dnl>       if [ test -f /usr/bin/lsb_release ]; then
+-dnl>         OS=`/usr/bin/lsb_release -d|cut -d ':' -f 2`
+-dnl>       fi
+-dnl>     fi
+-dnl>   fi
 -fi
 -
  dnl> Remove spaces
  OS="${OS#"${OS%%[![:space:]]*}"}"
  
-@@ -176,15 +128,6 @@ fi
+@@ -182,15 +134,6 @@ fi
    LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack"
  fi
  
@@ -74,7 +74,7 @@
  if test -d /opt/local/include; then :
    CFLAGS="${CFLAGS} -I/opt/local/include"
    CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
-@@ -238,15 +181,12 @@ AC_ARG_WITH(ndpi-includes,
+@@ -244,15 +187,12 @@ AC_ARG_WITH(ndpi-includes,
        NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include"
     ])
  
@@ -96,7 +96,7 @@
        if test -d "./nDPI" ; then :
           NDPI_HOME=./nDPI
        elif test -d "../nDPI" ; then :
-@@ -271,8 +211,8 @@ AC_MSG_CHECKING(for nDPI source)
+@@ -277,8 +217,8 @@ AC_MSG_CHECKING(for nDPI source)
        else
           AC_MSG_RESULT(not found)
        fi
@@ -106,30 +106,51 @@
  if test ! -z "$NDPI_CUST_INC" ; then :
    NDPI_INC=$NDPI_CUST_INC
  fi
-@@ -290,7 +230,7 @@ if test $SYSTEM = "FreeBSD"; then
+@@ -295,18 +235,14 @@ dnl finish: nDPI handling
+ fi
  dnl finish: nDPI handling
  
- if test $SYSTEM = "FreeBSD"; then
+-if test $SYSTEM = "FreeBSD"; then
 -   JSON_LIB=/usr/local/lib/libjson-c.a
-+   JSON_LIB=%%LOCALBASE%%/lib/libjson-c.a
-    JSON_INC=`pkg-config --cflags json-c`
+-   JSON_INC=`pkg-config --cflags json-c`
++
++pkg-config --exists json-c
++if test "$?" -ne 1; then
++  JSON_INC=`pkg-config --cflags json-c`
++  JSON_LIB=`pkg-config --libs json-c`
  else
-    pkg-config --exists json-c
-@@ -446,7 +386,7 @@ if test "$?" -ne 1; then
+-   pkg-config --exists json-c
+-   if test "$?" -ne 1; then
+-     JSON_INC=`pkg-config --cflags json-c`
+-     JSON_LIB=`pkg-config --libs json-c`
+-   else
+-     echo "Please install libjson-c-dev package prerequisite"
+-     exit -1
+-   fi
++  echo "Please install libjson-c-dev package prerequisite"
++  exit -1
+ fi
+ 
+ pkg-config --exists libssl
+@@ -461,11 +397,7 @@ if test "$?" -ne 1; then
+ pkg-config --exists hiredis
  if test "$?" -ne 1; then
    HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
-   if test $SYSTEM = "FreeBSD"; then
+-  if test $SYSTEM = "FreeBSD"; then
 -     HIREDIS_LIB="/usr/local/lib/libhiredis.a"
-+     HIREDIS_LIB="%%LOCALBASE%%/lib/libhiredis.a"
-    else
-      HIREDIS_LIB="`pkg-config --libs hiredis`"
-   fi
-@@ -467,14 +407,14 @@ if test "${with_nedge+set}" != set; then
+-   else
+-     HIREDIS_LIB="`pkg-config --libs hiredis`"
+-  fi
++  HIREDIS_LIB="`pkg-config --libs hiredis`"
+ else
+   echo "Please install hiredis package prerequisite"
+   exit -1
+@@ -483,14 +415,14 @@ if test "${with_nedge+set}" != set; then
    fi
  
    if test $SYSTEM = "FreeBSD"; then
 -     LIBPCAP="${PF_RING_HOME}/userland/libpcap/libpcap.a"
-+     # Use pcap from base
++    # Use pcap from base
    else
      if test -d ${PF_RING_HOME}; then
        AC_MSG_CHECKING(for PF_RING source installed in $PF_RING_HOME)
@@ -141,7 +162,7 @@
    AC_DEFINE_UNQUOTED(HAVE_PF_RING, 1, [Native PF_RING support])
    if test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then
       echo "${PF_RING_HOME}/userland/libpcap/libpcap.a"
-@@ -494,18 +434,18 @@ if test "${with_nedge+set}" != set; then
+@@ -510,18 +442,18 @@ if test "${with_nedge+set}" != set; then
           CPPFLAGS="${CPPFLAGS} -I/opt/pfring/include"
           echo "Using PF_RING installed in /opt/pfring"
        else
@@ -166,14 +187,16 @@
  	  echo "Please make sure you have installed your PF_RING libraries and try again"
  	  exit 1
          fi
-@@ -654,8 +594,8 @@ if test $SYSTEM = "FreeBSD"; then
+@@ -670,9 +602,9 @@ dnl> FreeBSD
  fi
  
- if test $SYSTEM = "FreeBSD"; then
--   MYSQL_LIB=/usr/local/lib/mysql/libmysqlclient.a
--    MYSQL_INC="-I /usr/local/include/mysql/"
-+   MYSQL_LIB=%%LOCALBASE%%/lib/mysql/libmysqlclient.a
-+    MYSQL_INC="-I %%LOCALBASE%%/include/mysql/"
-    AC_DEFINE_UNQUOTED(HAVE_MYSQL, 1, [use mysql])
- else
+ dnl> FreeBSD
+-dnl> MYSQL_LIB=/usr/local/lib/mysql/libmysqlclient.a
+-dnl> MYSQL_INC="-I /usr/local/include/mysql/"
+-dnl> AC_DEFINE_UNQUOTED(HAVE_MYSQL, 1, [use mysql])
++MYSQL_LIB="-L%%LOCALBASE%%/lib/mysql -lmysqlclient"
++MYSQL_INC="-I%%LOCALBASE%%/include/mysql"
++AC_DEFINE_UNQUOTED(HAVE_MYSQL, 1, [use mysql])
+ 
+ if test $SYSTEM != "FreeBSD"; then
   if test "${with_nedge+set}" != set; then
diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist
index 0fe2da50b3e4..a95917586837 100644
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@@ -3,23 +3,27 @@ bin/ntopng-geoip2update.sh
 man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/css/README.md
 %%DATADIR%%/httpdocs/css/select2.min.css
-%%DATADIR%%/httpdocs/dist/%%NTOPNGUSER%%.css
-%%DATADIR%%/httpdocs/dist/%%NTOPNGUSER%%.js
 %%DATADIR%%/httpdocs/dist/0a1b701f5563c2288281.ttf
 %%DATADIR%%/httpdocs/dist/15d98c18221c8bcb2334.ttf
 %%DATADIR%%/httpdocs/dist/1a6e7eaefbde2f91f471.png
+%%DATADIR%%/httpdocs/dist/2bd53024cba1f2355d53.png
 %%DATADIR%%/httpdocs/dist/4896d4b04430cc3dfb06.woff2
 %%DATADIR%%/httpdocs/dist/4e48546121b5478aa6cd.png
 %%DATADIR%%/httpdocs/dist/518b8c59f15bff8fad43.png
 %%DATADIR%%/httpdocs/dist/6a2400dc21b9371537a6.png
+%%DATADIR%%/httpdocs/dist/73879eafee8fd84e7c13.png
 %%DATADIR%%/httpdocs/dist/79da213423ac0def2058.ttf
+%%DATADIR%%/httpdocs/dist/8dbb811c120eea1560c8.png
 %%DATADIR%%/httpdocs/dist/95ce97b96124cddcc6ff.png
+%%DATADIR%%/httpdocs/dist/a0d12b5793f7a819cf4a.png
 %%DATADIR%%/httpdocs/dist/b18a220ea3ed601ec968.png
 %%DATADIR%%/httpdocs/dist/b2160eb121c76bb72cb1.png
+%%DATADIR%%/httpdocs/dist/bdacea417c235e289149.png
 %%DATADIR%%/httpdocs/dist/custom-theme.css
 %%DATADIR%%/httpdocs/dist/custom-theme.js
 %%DATADIR%%/httpdocs/dist/d68ae9f02541036a991d.png
 %%DATADIR%%/httpdocs/dist/d79c2ec96ab9ff1161a2.woff2
+%%DATADIR%%/httpdocs/dist/d86d12736d91b3cc9934.png
 %%DATADIR%%/httpdocs/dist/dark-mode.css
 %%DATADIR%%/httpdocs/dist/dark-mode.js
 %%DATADIR%%/httpdocs/dist/f77bcc98bb7468c8b15a.woff2
@@ -38,8 +42,16 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/dist/images/sort_both.png
 %%DATADIR%%/httpdocs/dist/images/sort_desc.png
 %%DATADIR%%/httpdocs/dist/images/sort_desc_disabled.png
+%%DATADIR%%/httpdocs/dist/images/ui-icons_444444_256x240.png
+%%DATADIR%%/httpdocs/dist/images/ui-icons_555555_256x240.png
+%%DATADIR%%/httpdocs/dist/images/ui-icons_777620_256x240.png
+%%DATADIR%%/httpdocs/dist/images/ui-icons_777777_256x240.png
+%%DATADIR%%/httpdocs/dist/images/ui-icons_cc0000_256x240.png
+%%DATADIR%%/httpdocs/dist/images/ui-icons_ffffff_256x240.png
 %%DATADIR%%/httpdocs/dist/images/virustotal.svg
 %%DATADIR%%/httpdocs/dist/login.js
+%%DATADIR%%/httpdocs/dist/ntopng.css
+%%DATADIR%%/httpdocs/dist/ntopng.js
 %%DATADIR%%/httpdocs/dist/third-party.css
 %%DATADIR%%/httpdocs/dist/third-party.js
 %%DATADIR%%/httpdocs/dist/third-party.js.LICENSE.txt
@@ -68,16 +80,34 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/inc/sprobe_process.inc
 %%DATADIR%%/httpdocs/inc/sprobe_process_header.inc
 %%DATADIR%%/httpdocs/inc/vlan_stats_id.inc
-%%DATADIR%%/httpdocs/misc/%%NTOPNGUSER%%_template_elk8.json
 %%DATADIR%%/httpdocs/misc/alert_store_schema.sql
-%%DATADIR%%/httpdocs/misc/alert_store_schema_clickhouse.sql
 %%DATADIR%%/httpdocs/misc/alert_view_store_schema.sql
+%%DATADIR%%/httpdocs/misc/db_schema_clickhouse.sql
+%%DATADIR%%/httpdocs/misc/db_schema_clickhouse_cluster.sql
+%%DATADIR%%/httpdocs/misc/lists/builtin/abuse_ch.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/adway.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/alienvault.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/antiwebminer.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/disconnect_me.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/dshield_7days.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/emerging_threats.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/feodo.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/feodo_c2.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/nocoin.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/snort.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/sslbl_c2.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/sslbl_ja3.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/stratosphere.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/threatfox.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/urlhaus.list
+%%DATADIR%%/httpdocs/misc/lists/custom/README.txt
 %%DATADIR%%/httpdocs/misc/ntopng-add-user.sh
 %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config
 %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config.in
 %%DATADIR%%/httpdocs/misc/ntopng_template_elk.json
 %%DATADIR%%/httpdocs/misc/ntopng_template_elk6.json
 %%DATADIR%%/httpdocs/misc/ntopng_template_elk7.json
+%%DATADIR%%/httpdocs/misc/ntopng_template_elk8.json
 %%DATADIR%%/httpdocs/other/EtherOUI.txt
 %%DATADIR%%/httpdocs/other/TimeZones.txt
 %%DATADIR%%/httpdocs/other/radcli_dictionary.txt
@@ -88,12 +118,14 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/am_add_host_modal.html
 %%DATADIR%%/httpdocs/templates/am_delete_host_modal.html
 %%DATADIR%%/httpdocs/templates/am_edit_host_modal.html
+%%DATADIR%%/httpdocs/templates/analyze_pcap.template
 %%DATADIR%%/httpdocs/templates/htmlPages/hostDetails/hosttraffic.html
 %%DATADIR%%/httpdocs/templates/htmlPages/hostDetails/listening-ports.template
 %%DATADIR%%/httpdocs/templates/import_modal.html
 %%DATADIR%%/httpdocs/templates/modal_confirm_dialog.html
 %%DATADIR%%/httpdocs/templates/modal_confirm_dialog_form.template
 %%DATADIR%%/httpdocs/templates/on_off_switch.html
+%%DATADIR%%/httpdocs/templates/pages/aggregated_live_flows.template
 %%DATADIR%%/httpdocs/templates/pages/alerts/alert_details.template
 %%DATADIR%%/httpdocs/templates/pages/alerts/datatable.js.template
 %%DATADIR%%/httpdocs/templates/pages/alerts/defs_overview.template
@@ -125,6 +157,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/pages/components/db-analysis.template
 %%DATADIR%%/httpdocs/templates/pages/components/edit-categories.template
 %%DATADIR%%/httpdocs/templates/pages/components/export-policy-configuration-link.template
+%%DATADIR%%/httpdocs/templates/pages/components/historical_interface.template
 %%DATADIR%%/httpdocs/templates/pages/components/ifaces-dropdown.template
 %%DATADIR%%/httpdocs/templates/pages/components/ifaces-select.template
 %%DATADIR%%/httpdocs/templates/pages/components/manage-configuration-link.template
@@ -141,11 +174,15 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/pages/edit_check.template
 %%DATADIR%%/httpdocs/templates/pages/edit_configset.template
 %%DATADIR%%/httpdocs/templates/pages/endpoint_notifications_list.template
-%%DATADIR%%/httpdocs/templates/pages/hassh_fingerprint.template
+%%DATADIR%%/httpdocs/templates/pages/host_map.template
+%%DATADIR%%/httpdocs/templates/pages/host_ssh.template
+%%DATADIR%%/httpdocs/templates/pages/host_tls.template
+%%DATADIR%%/httpdocs/templates/pages/hosts/l7_stats.template
+%%DATADIR%%/httpdocs/templates/pages/hosts/packets_stats.template
+%%DATADIR%%/httpdocs/templates/pages/hosts/ports_stats.template
+%%DATADIR%%/httpdocs/templates/pages/hosts/traffic_stats.template
 %%DATADIR%%/httpdocs/templates/pages/hosts_geomap.template
-%%DATADIR%%/httpdocs/templates/pages/hosts_map.template
 %%DATADIR%%/httpdocs/templates/pages/interface_nprobes.template
-%%DATADIR%%/httpdocs/templates/pages/ja3_fingerprint.template
 %%DATADIR%%/httpdocs/templates/pages/license.template
 %%DATADIR%%/httpdocs/templates/pages/manage_configurations.template
 %%DATADIR%%/httpdocs/templates/pages/manage_data.template
@@ -200,8 +237,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/pages/notifications/webhook/webhook_recipient.template
 %%DATADIR%%/httpdocs/templates/pages/observation_points_config.template
 %%DATADIR%%/httpdocs/templates/pages/recipients_list.template
+%%DATADIR%%/httpdocs/templates/pages/sankey_vlan.template
 %%DATADIR%%/httpdocs/templates/pages/simple_widgets_list.template
-%%DATADIR%%/httpdocs/templates/pages/system_alerts_stats.template
 %%DATADIR%%/httpdocs/templates/pages/table_pools.template
 %%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/delete.template
 %%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/export.template
@@ -213,10 +250,10 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/traffic_extraction_dialog.html
 %%DATADIR%%/httpdocs/templates/traffic_report.html
 %%DATADIR%%/httpdocs/templates/typeahead_input.html
+%%DATADIR%%/httpdocs/templates/upload_pcap.template
 %%DATADIR%%/httpdocs/templates/widgets/chart-widget.template
 %%DATADIR%%/httpdocs/templates/widgets/geomap-widget.template
 %%DATADIR%%/httpdocs/templates/wizard_dialog.html
-%%DATADIR%%/httpdocs/test/echarts.js
 %%DATADIR%%/httpdocs/tmp/bootstrap-select/bootstrap-select.css.map
 %%DATADIR%%/httpdocs/tmp/bootstrap-select/bootstrap-select.js
 %%DATADIR%%/httpdocs/tmp/bootstrap-select/bootstrap-select.min.css
@@ -232,6 +269,11 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/callbacks/5second/system/notifications.lua
 %%DATADIR%%/scripts/callbacks/5second/system/timeseries.lua
 %%DATADIR%%/scripts/callbacks/5second/system/upload_timeseries.lua
+%%DATADIR%%/scripts/callbacks/checks/flows/custom_flow_end_script.lua.sample
+%%DATADIR%%/scripts/callbacks/checks/flows/custom_flow_periodic_script.lua.sample
+%%DATADIR%%/scripts/callbacks/checks/flows/custom_flow_protocol_detected_script.lua.sample
+%%DATADIR%%/scripts/callbacks/checks/hosts/custom_host_lua_script.lua
+%%DATADIR%%/scripts/callbacks/checks/hosts/custom_host_lua_script.lua.sample
 %%DATADIR%%/scripts/callbacks/daily-delayed/interface/interface_checks.lua
 %%DATADIR%%/scripts/callbacks/daily-delayed/interface/local_network_checks.lua
 %%DATADIR%%/scripts/callbacks/daily-delayed/interface/stats_retention.lua
@@ -271,6 +313,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/historical/analysis/sites.json
 %%DATADIR%%/scripts/historical/tables/README
 %%DATADIR%%/scripts/historical/tables/latency_by_asn.json
+%%DATADIR%%/scripts/historical/tables/number_of_hosts.json
 %%DATADIR%%/scripts/historical/tables/top_alerted_domains.json
 %%DATADIR%%/scripts/historical/tables/top_clients.json
 %%DATADIR%%/scripts/historical/tables/top_conversations.json
@@ -286,7 +329,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/locales/it.lua
 %%DATADIR%%/scripts/locales/jp.lua
 %%DATADIR%%/scripts/locales/pt.lua
-%%DATADIR%%/scripts/lua/%%NTOPNGUSER%%_logout.lua
 %%DATADIR%%/scripts/lua/10mb.lua
 %%DATADIR%%/scripts/lua/1mb.lua
 %%DATADIR%%/scripts/lua/API.lua
@@ -316,12 +358,12 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/admin/validate_new_user.lua
 %%DATADIR%%/scripts/lua/alert_details.lua
 %%DATADIR%%/scripts/lua/alert_stats.lua
+%%DATADIR%%/scripts/lua/analyze_pcap.lua
 %%DATADIR%%/scripts/lua/as_details.lua
 %%DATADIR%%/scripts/lua/as_stats.lua
 %%DATADIR%%/scripts/lua/authorize_captive.lua
 %%DATADIR%%/scripts/lua/captive_portal.lua
 %%DATADIR%%/scripts/lua/change_password.lua
-%%DATADIR%%/scripts/lua/check_details.lua
 %%DATADIR%%/scripts/lua/check_recording_data.lua
 %%DATADIR%%/scripts/lua/check_update.lua
 %%DATADIR%%/scripts/lua/checks_overview.lua
@@ -383,7 +425,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_http_hosts.lua
 %%DATADIR%%/scripts/lua/get_http_hosts_data.lua
 %%DATADIR%%/scripts/lua/get_icmp_data.lua
-%%DATADIR%%/scripts/lua/get_influxdb_info.lua
 %%DATADIR%%/scripts/lua/get_internals_checks_stats.lua
 %%DATADIR%%/scripts/lua/get_internals_hash_tables_stats.lua
 %%DATADIR%%/scripts/lua/get_internals_periodic_activities_stats.lua
@@ -470,7 +511,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_binary_application_transfer.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_blacklisted_country.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_broadcast_non_udp_traffic.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_connection_issues.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_custom_lua_script.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_data_exfiltration.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_device_protocol_not_allowed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_dns_data_exfiltration.lua
@@ -489,31 +530,48 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_lateral_movement.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_longlived.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_malicious_signature.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_anonymous_subscriber.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_clear_text_credentials.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_desktop_or_file_sharing_session.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_fragmented.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_invalid_characters.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_large_packet.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_dns_suspicious_traffic.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_error_code.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_crawler_bot.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_numeric_ip_host.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_obsolete_server.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_content.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_header.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_url.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_http_suspicious_user_agent.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malformed_packet.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malicious_ja3.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malicious_sha1_certificate.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_possible_exploit.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_punicody_idn.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_risky_asn.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_risky_domain.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_smb_insecure_version.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_ssh_obsolete_client.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_ssh_obsolete_server.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_suspicious_dga_domain.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_suspicious_entropy.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_cert_validity_too_long.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_certificate_about_to_expire.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_fatal_alert.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_missing_sni.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_not_carrying_https.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_suspicious_esni_usage.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_suspicious_extension.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_uncommon_alpn.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unidirectional_traffic.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unsafe_protocol.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_rce_injection.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_sql_injection.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_xss.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_packets_issues.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_periodicity_changed.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_potentially_dangerous_protocol.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_remote_access.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_remote_to_local_insecure_proto.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_remote_to_remote.lua
@@ -531,10 +589,13 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_web_mining.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_zero_tcp_window.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_countries_contacts.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_custom_lua_script.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_dangerous_host.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_dns_flood.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_dns_server_contacts.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_dns_traffic.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_domain_names_contacts.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_external_script.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_flow_anomaly.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_flow_flood.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_host_log.lua
@@ -548,16 +609,18 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_score_anomaly.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_score_threshold.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_smtp_server_contacts.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_snmp_flood.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_tcp_fin_scan.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_tcp_rst_scan.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_tcp_syn_flood.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_tcp_syn_scan.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_traffic_volume.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_am_threshold_cross.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_attack_mitigation_via_snmp.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_behavior_anomaly.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_broadcast_domain_too_large.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_contacts_anomaly.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_device_connection.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_device_disconnection.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_device_connection_disconnection.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_dhcp_storm.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_dropped_alerts.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_fail2ban_executed.lua
@@ -573,6 +636,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_ip_outsite_dhcp_range.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_list_download_failed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_list_download_succeeded.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_local_host_blacklisted.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_login_failed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_mac_ip_association_change.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_misconfigured_app.lua
@@ -596,12 +660,13 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_slow_periodic_activity.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_slow_purge.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_snmp_device_reset.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_snmp_device_traffic_change.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_snmp_interface_errors.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_snmp_topology_changed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_tcp_syn_flood_victim.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_tcp_syn_scan_victim.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_threshold_cross.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_too_many_drops.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_unexpected_new_device.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua
 %%DATADIR%%/scripts/lua/modules/alert_entities.lua
 %%DATADIR%%/scripts/lua/modules/alert_exclusions.lua
@@ -640,6 +705,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/broadcast_non_udp_traffic.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/connection_failed.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/country_check.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/custom_lua_script.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/device_protocol_not_allowed.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/external_alert_check.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/iec_invalid_command_transition.lua
@@ -647,20 +713,34 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/iec_unexpected_type_id.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/known_proto_on_non_std_port.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/low_goodput.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_anonymous_subscriber.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_clear_text_credentials.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_desktop_or_file_sharing_session.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_dns_fragmented.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_dns_large_packet.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_dns_suspicious_traffic.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_error_code_detected.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_crawler_bot.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_numeric_ip_host.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_obsolete_server.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_content.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_header.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_url.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_user_agent.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_invalid_characters.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_malformed_packet.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_malicious_ja3.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_malicious_sha1_certificate.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_possible_exploit.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_punicody_idn.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_risky_asn.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_risky_domain.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_smb_insecure_version.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_ssh_obsolete_client.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_ssh_obsolete_server.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_suspicious_dga_domain.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_suspicious_entropy.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_tls_certificate_about_to_expire.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_tls_missing_sni.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_tls_not_carrying_https.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_tls_suspicious_esni_usage.lua
@@ -673,8 +753,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/remote_access.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/remote_to_local_insecure_proto.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/remote_to_remote.lua
-%%DATADIR%%/scripts/lua/modules/check_definitions/flow/tcp_issues_generic.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/tcp_no_data_exchanged.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/tcp_packets_issues.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/unexpected_dhcp.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/unexpected_dns.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/unexpected_ntp.lua
@@ -682,10 +762,12 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/web_mining.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/zero_tcp_window.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/countries_contacts.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/host/custom_host_lua_script.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/dangerous_host.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/dns.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/dns_contacts.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/domain_names_contacts.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/host/external_host_script.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/fin_scan.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/flow_flood.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/icmp_flood.lua
@@ -694,6 +776,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/p2p.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/pkt_threshold.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/remote_connection.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/host/rst_scan.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/scan_detection.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/score_threshold.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/smtp_contacts.lua
@@ -707,12 +790,12 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/slow_purge.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/throughput.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/too_many_drops.lua
-%%DATADIR%%/scripts/lua/modules/check_definitions/interface/unexpected_new_device.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/broadcast_domain_too_large.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/egress.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/flow_flood_victim.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/ingress.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/inner.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/network/ip_reassignment.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/network_discovery.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/syn_flood_victim.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/network/syn_scan_victim.lua
@@ -730,6 +813,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_templates/long_lived.lua
 %%DATADIR%%/scripts/lua/modules/check_templates/long_lived.template
 %%DATADIR%%/scripts/lua/modules/check_templates/multi_select.lua
+%%DATADIR%%/scripts/lua/modules/check_templates/multi_threshold_cross.lua
+%%DATADIR%%/scripts/lua/modules/check_templates/multi_threshold_cross.template
 %%DATADIR%%/scripts/lua/modules/check_templates/threshold_cross.lua
 %%DATADIR%%/scripts/lua/modules/check_templates/threshold_cross.template
 %%DATADIR%%/scripts/lua/modules/checks.lua
@@ -756,6 +841,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/datatable_utils.lua
 %%DATADIR%%/scripts/lua/modules/db_utils.lua
 %%DATADIR%%/scripts/lua/modules/delete_data_utils.lua
+%%DATADIR%%/scripts/lua/modules/dhcp_service_utils.lua
 %%DATADIR%%/scripts/lua/modules/dhcp_utils.lua
 %%DATADIR%%/scripts/lua/modules/discover_utils.lua
 %%DATADIR%%/scripts/lua/modules/dkjson.lua
@@ -811,6 +897,10 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/lua_path_utils.lua
 %%DATADIR%%/scripts/lua/modules/lua_trace.lua
 %%DATADIR%%/scripts/lua/modules/lua_utils.lua
+%%DATADIR%%/scripts/lua/modules/lua_utils_generic.lua
+%%DATADIR%%/scripts/lua/modules/lua_utils_get.lua
+%%DATADIR%%/scripts/lua/modules/lua_utils_gui.lua
+%%DATADIR%%/scripts/lua/modules/lua_utils_print.lua
 %%DATADIR%%/scripts/lua/modules/mac_utils.lua
 %%DATADIR%%/scripts/lua/modules/measurements/cicmp.lua
 %%DATADIR%%/scripts/lua/modules/measurements/http.lua
@@ -861,6 +951,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/script_manager.lua
 %%DATADIR%%/scripts/lua/modules/scripts_triggers.lua
 %%DATADIR%%/scripts/lua/modules/snmp_consts.lua
+%%DATADIR%%/scripts/lua/modules/snmp_mappings.lua
 %%DATADIR%%/scripts/lua/modules/stats_utils.lua
 %%DATADIR%%/scripts/lua/modules/storage_utils.lua
 %%DATADIR%%/scripts/lua/modules/sys_utils.lua
@@ -892,9 +983,11 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/timeseries/tests/test_utils.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/tests/utils_test.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/ts_common.lua
+%%DATADIR%%/scripts/lua/modules/timeseries/ts_rest_utils.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/ts_schema.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/ts_utils.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/ts_utils_core.lua
+%%DATADIR%%/scripts/lua/modules/timeseries_info.lua
 %%DATADIR%%/scripts/lua/modules/tls_consts.lua
 %%DATADIR%%/scripts/lua/modules/toasts/defined_toasts.lua
 %%DATADIR%%/scripts/lua/modules/toasts/predicates_defined_toasts.lua
@@ -917,10 +1010,10 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/monitor/redis_monitor.lua
 %%DATADIR%%/scripts/lua/network_details.lua
 %%DATADIR%%/scripts/lua/network_stats.lua
+%%DATADIR%%/scripts/lua/ntopng_logout.lua
 %%DATADIR%%/scripts/lua/os_details.lua
 %%DATADIR%%/scripts/lua/os_stats.lua
 %%DATADIR%%/scripts/lua/page_not_found.lua
-%%DATADIR%%/scripts/lua/periodic_script_details.lua
 %%DATADIR%%/scripts/lua/please_wait.lua
 %%DATADIR%%/scripts/lua/pod_details.lua
 %%DATADIR%%/scripts/lua/pods_stats.lua
@@ -928,15 +1021,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/pool_stats.lua
 %%DATADIR%%/scripts/lua/process_details.lua
 %%DATADIR%%/scripts/lua/reset_stats.lua
-%%DATADIR%%/scripts/lua/rest/get/host/data.lua
-%%DATADIR%%/scripts/lua/rest/get/interface/data.lua
-%%DATADIR%%/scripts/lua/rest/get/pcap/live_extraction.lua
-%%DATADIR%%/scripts/lua/rest/get/pool/config.lua
-%%DATADIR%%/scripts/lua/rest/get/scripts/config.lua
-%%DATADIR%%/scripts/lua/rest/get/system/stats.lua
-%%DATADIR%%/scripts/lua/rest/get/timeseries/ts.lua
-%%DATADIR%%/scripts/lua/rest/set/pool/config.lua
-%%DATADIR%%/scripts/lua/rest/set/scripts/config.lua
 %%DATADIR%%/scripts/lua/rest/v1/acknowledge/am_host/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v1/acknowledge/flow/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v1/acknowledge/host/alerts.lua
@@ -1081,6 +1165,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/add/ntopng/user.lua
 %%DATADIR%%/scripts/lua/rest/v2/bind/host/pool/member.lua
 %%DATADIR%%/scripts/lua/rest/v2/charts/time/data.lua
+%%DATADIR%%/scripts/lua/rest/v2/connect/test.lua
 %%DATADIR%%/scripts/lua/rest/v2/create/ntopng/api_token.lua
 %%DATADIR%%/scripts/lua/rest/v2/create/ntopng/session.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/all/alerts.lua
@@ -1094,7 +1179,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/delete/mac/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/network/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/ntopng/user.lua
-%%DATADIR%%/scripts/lua/rest/v2/delete/observation_point/stats.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/pools.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/recipients.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/system/alerts.lua
@@ -1114,20 +1198,27 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/export/pool/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/export/snmp/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/alert/filter/consts.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/alert/list/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/alert/severity/consts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/alert/severity/counters.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/alert/top.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/alert/type/consts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/alert/type/counters.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/all/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/all/alert/ts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/am_host/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/am_host/alert/ts.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/am_host/list.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/asn/asn_info.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/asn/asn_name.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/category/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/checks/config.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/country/country_name.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/datasource/datasource.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/datasource/interface/packet_distro.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/dns/resolve.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/active.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/flow/aggregated_live_flows.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/alert/ts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/l4/counters.lua
@@ -1145,13 +1236,26 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/get/host/fingerprint/data.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/fingerprint/ja3.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/interfaces.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l4/contacted_hosts_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l4/data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l4/proto_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l4/traffic_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l7/breed_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l7/cat_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l7/data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/l7/proto_data.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/l7/stats.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/packets/arp_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/packets/rcvd_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/packets/sent_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/packets/tcp_flags_data.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/pool/members.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/pool_by_member.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/pools.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/port/cli_port_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/port/srv_port_data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/port/table_port_data.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/processes/listening_ports.lua
-%%DATADIR%%/scripts/lua/rest/v2/get/host/stats/charts/l4_stats.lua
-%%DATADIR%%/scripts/lua/rest/v2/get/host/stats/l4_traffic.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/interface/address.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/interface/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/interface/alert/ts.lua
@@ -1170,20 +1274,22 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/get/network/alert/ts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/network/discovery/discover.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/ntopng/interfaces.lua
-%%DATADIR%%/scripts/lua/rest/v2/get/ntopng/session.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/ntopng/users.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/pcap/live_extraction.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/pcap/live_traffic.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/pool/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/pools.lua
-%%DATADIR%%/scripts/lua/rest/v2/get/redis/redis_info.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/redis/redis_stats.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/syslog/producer/consts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/syslog/producer/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/system/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/system/alert/ts.lua
-%%DATADIR%%/scripts/lua/rest/v2/get/system/stats.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/health/influxdb.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/health/interfaces.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/health/redis.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/health/stats.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/timeseries/ts.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/timeseries/type/consts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/user/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/user/alert/ts.lua
 %%DATADIR%%/scripts/lua/rest/v2/import/active_monitoring/config.lua
@@ -1206,15 +1312,15 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/set/host/alias.lua
 %%DATADIR%%/scripts/lua/rest/v2/set/host/notes.lua
 %%DATADIR%%/scripts/lua/rest/v2/set/pool/config.lua
+%%DATADIR%%/scripts/lua/rest/v2/trigger/host/alert.lua
 %%DATADIR%%/scripts/lua/rest/version.lua
+%%DATADIR%%/scripts/lua/self_test.lua
 %%DATADIR%%/scripts/lua/show_geolocation_note.lua
 %%DATADIR%%/scripts/lua/sidebar-handler.lua
 %%DATADIR%%/scripts/lua/sprobe_host_process_data.lua
 %%DATADIR%%/scripts/lua/stop_live_capture.lua
 %%DATADIR%%/scripts/lua/syslog_producers.lua
-%%DATADIR%%/scripts/lua/system_alerts_stats.lua
 %%DATADIR%%/scripts/lua/system_interfaces_stats.lua
-%%DATADIR%%/scripts/lua/system_periodic_script_details.lua
 %%DATADIR%%/scripts/lua/system_setup_ui/date_time.lua
 %%DATADIR%%/scripts/lua/system_setup_ui/interfaces.lua
 %%DATADIR%%/scripts/lua/system_setup_ui/misc.lua
@@ -1225,13 +1331,13 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/system_stats_data.lua
 %%DATADIR%%/scripts/lua/toggle_all_checks.lua
 %%DATADIR%%/scripts/lua/toggle_check.lua
-%%DATADIR%%/scripts/lua/top_hosts.lua
 %%DATADIR%%/scripts/lua/traffic_extraction.lua
 %%DATADIR%%/scripts/lua/traffic_extraction_data.lua
 %%DATADIR%%/scripts/lua/traffic_recording_config.lua
 %%DATADIR%%/scripts/lua/unknown_devices.lua
 %%DATADIR%%/scripts/lua/update_blog_posts.lua
 %%DATADIR%%/scripts/lua/update_prefs.lua
+%%DATADIR%%/scripts/lua/upload_pcap.lua
 %%DATADIR%%/scripts/lua/username_details.lua
 %%DATADIR%%/scripts/lua/vlan_details.lua
 %%DATADIR%%/scripts/lua/vlan_stats.lua