git: b36b859ad9bc - main - net/ntopng: Update to 5.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Wed, 09 Feb 2022 14:17:16 UTC
The branch main has been updated by madpilot:

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

commit b36b859ad9bce95d990ac294de4a9b33b5bda7e6
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-02-09 14:16:55 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2022-02-09 14:16:55 +0000

    net/ntopng: Update to 5.2
---
 net/ntopng/Makefile                    |   6 +-
 net/ntopng/distinfo                    |   6 +-
 net/ntopng/files/patch-Makefile.in     |  19 +--
 net/ntopng/files/patch-configure.ac.in |  11 ++
 net/ntopng/files/patch-configure.seed  |  76 ------------
 net/ntopng/pkg-plist                   | 218 ++++++++++++++++++++-------------
 6 files changed, 154 insertions(+), 182 deletions(-)

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 5c67784d9448..14d3aa8dceab 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,7 +1,7 @@
 # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com>
 
 PORTNAME=	ntopng
-PORTVERSION=	5.0.d20211220
+PORTVERSION=	5.2.d20220208
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -25,7 +25,7 @@ LIB_DEPENDS=	librrd.so:databases/rrdtool \
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		autoreconf compiler:c++11-lang cpe gmake libtool localbase \
-		lua:53 mysql pathfix pkgconfig shebangfix sqlite ssl
+		lua:54 mysql pathfix pkgconfig shebangfix sqlite ssl
 USE_OPENLDAP=	yes
 
 SUB_FILES=	ntopng-geoip2update.sh pkg-deinstall
@@ -40,7 +40,7 @@ PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	f9f1dd9
+GH_TAGNAME=	747a4a6
 
 CPE_VENDOR=	ntop
 
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index bfd4bdc6f19f..92e433085480 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640250040
-SHA256 (ntop-ntopng-5.0.d20211220-f9f1dd9_GH0.tar.gz) = c015e953a1019cad1f5e1405af8dacf71a7c42ab5ebe503d77f6346e68fdefc1
-SIZE (ntop-ntopng-5.0.d20211220-f9f1dd9_GH0.tar.gz) = 57936555
+TIMESTAMP = 1644343091
+SHA256 (ntop-ntopng-5.2.d20220208-747a4a6_GH0.tar.gz) = 14cd028c846de70db877f2ce7bade5565e8574496a752627e269a0e41878f754
+SIZE (ntop-ntopng-5.2.d20220208-747a4a6_GH0.tar.gz) = 60279980
diff --git a/net/ntopng/files/patch-Makefile.in b/net/ntopng/files/patch-Makefile.in
index f8bf8fec1eda..590e114ac818 100644
--- a/net/ntopng/files/patch-Makefile.in
+++ b/net/ntopng/files/patch-Makefile.in
@@ -1,25 +1,16 @@
---- Makefile.in.orig	2021-08-20 09:38:15 UTC
+--- Makefile.in.orig	2022-02-08 09:52:25 UTC
 +++ Makefile.in
-@@ -39,7 +39,8 @@ else ifeq ($(OS),Darwin)
+@@ -44,7 +44,8 @@ else ifeq ($(OS),Darwin)
  	LUA_PLATFORM=macosx
  else ifeq ($(OS), $(filter $(OS), FreeBSD))
  	LUA_PLATFORM=freebsd
 -	LUA_LIB=/usr/local/lib/liblua-5.3.a
-+        LUA_INC=-I%%LOCALBASE%%/include/lua53
-+	LUA_LIB=-llua-5.3
++	LUA_INC=-I%%LOCALBASE%%/include/lua54
++	LUA_LIB=-llua-5.4
  endif
  
  
-@@ -87,7 +88,7 @@ ifeq (@NEDGE@, 0)
-  HAS_ZEROMQ=$(shell pkg-config --exists libzmq && echo 0)
-  ifeq ($(HAS_ZEROMQ), 0)
- 	ZEROMQ_INC = $(shell pkg-config --cflags libzmq)
--	ZMQ_STATIC=/usr/local/lib/libzmq.a
-+	ZMQ_STATIC=/nonexistent
- 	ifeq ($(wildcard $(ZMQ_STATIC)),)
- 		ZEROMQ_LIB = $(shell pkg-config --libs libzmq)
- 	else
-@@ -123,7 +124,7 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLA
+@@ -102,7 +103,7 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@REVISION@.$(PLA
  RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm
  ######
  
diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in
new file mode 100644
index 000000000000..6beddc465a27
--- /dev/null
+++ b/net/ntopng/files/patch-configure.ac.in
@@ -0,0 +1,11 @@
+--- configure.ac.in.orig	2022-02-08 09:52:25 UTC
++++ configure.ac.in
+@@ -444,7 +444,7 @@ if test "${with_nedge+set}" != set; then
+  PF_RING_HOME=${HOME}/PF_RING
+ 
+   if test $SYSTEM = "FreeBSD"; then
+-     LIBPCAP="${PF_RING_HOME}/userland/libpcap/libpcap.a"
++     # Use pcap from base
+   else
+     if test -d ${PF_RING_HOME}; then
+       AC_MSG_CHECKING(for PF_RING source installed in $PF_RING_HOME)
diff --git a/net/ntopng/files/patch-configure.seed b/net/ntopng/files/patch-configure.seed
deleted file mode 100644
index b9958d2766f8..000000000000
--- a/net/ntopng/files/patch-configure.seed
+++ /dev/null
@@ -1,76 +0,0 @@
---- configure.seed.orig	2021-08-20 09:38:15 UTC
-+++ configure.seed
-@@ -5,7 +5,7 @@ dnl> Do not add anything above
- HERE=`pwd`
- SYSTEM=`uname -s`
- 
--CPPFLAGS="${CPPFLAGS} -Wno-address-of-packed-member -Wno-unused-function"
-+CPPFLAGS="${CPPFLAGS} -Wno-unused-function"
- AC_PROG_CPP
- AC_PROG_CXX
- 
-@@ -142,33 +142,8 @@ fi
- # On CentOS 6 `git rev-list HEAD --count` does not work
- #
- #
--REVISION=`git log --pretty=oneline | wc -l`
-+#REVISION=`git log --pretty=oneline | wc -l`
- 
--if test -d "/usr/local/include"; then
--  CFLAGS="${CFLAGS} -I/usr/local/include"
--  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
--fi
--
--if test -d "/usr/local/lib"; then
--  LDFLAGS="${LDFLAGS} -L/usr/local/lib"
--fi
--
--if test -d /opt/local/include; then :
--  CFLAGS="${CFLAGS} -I/opt/local/include"
--  CPPFLAGS="${CPPFLAGS} -I/opt/local/include"
--fi
--
--if test -d /opt/local/lib; then :
--  LDFLAGS="${LDFLAGS} -L/opt/local/lib"
--fi
--
--if [ test -f /usr/bin/lsb_release ]; then
--  CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
--  if [[ $CODENAME == "wheezy" ]]; then :
--    CPPFLAGS="${CPPFLAGS} -DOLD_NETFILTER_INTERFACE=1"
--  fi
--fi
--
- SHORT_MACHINE=`uname -m | cut -b1-3`
- 
- GIT_RELEASE="@GIT_RELEASE@"
-@@ -312,7 +287,7 @@ else
-   fi
- fi
- 
--AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt"])
-+AC_CHECK_LIB([gcrypt], [gcry_cipher_checktag], [LDFLAGS="${LDFLAGS} -lgcrypt -lgpg-error"])
- 
- AC_MSG_CHECKING(for ntopng professional edition)
- 
-@@ -454,7 +429,7 @@ if test "${with_nedge+set}" != set; then
-  PF_RING_HOME=${HOME}/PF_RING
- 
-   if test $SYSTEM = "FreeBSD"; then
--     LIBPCAP="${PF_RING_HOME}/userland/libpcap/libpcap.a"
-+     # Use pcap from base
-   else
-     if test -d ${PF_RING_HOME}; then
-       AC_MSG_CHECKING(for PF_RING source installed in $PF_RING_HOME)
-@@ -730,11 +705,6 @@ AC_DEFINE_UNQUOTED(_CRT_SECURE_NO_WARNINGS, 1, [Disabl
- GMAKE=`which gmake`
- if test x$GMAKE = x; then
-   GMAKE="make"
--fi
--
--GIT=`which git`
--if test x$GIT = x; then
--  AC_MSG_RESULT(FATAL ERROR: git is not installed on your host)
- fi
- 
- umask 002
diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist
index f812dc54158e..d396c8e6273f 100644
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@@ -1844,6 +1844,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/js/nv.d3.js
 %%DATADIR%%/httpdocs/js/osm-maps.js
 %%DATADIR%%/httpdocs/js/pages/components/ifaces-dropdown.js
+%%DATADIR%%/httpdocs/js/pages/dhcp_active_leases.js
 %%DATADIR%%/httpdocs/js/pages/edit_alert_exclusions.js
 %%DATADIR%%/httpdocs/js/pages/endpoint-notifications-list.js
 %%DATADIR%%/httpdocs/js/pages/flowdevice_details.js
@@ -1853,7 +1854,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/js/pages/infrastructure-dashboard.js
 %%DATADIR%%/httpdocs/js/pages/interface_nprobes.js
 %%DATADIR%%/httpdocs/js/pages/manage-configurations.js
-%%DATADIR%%/httpdocs/js/pages/observation_points_page.js
 %%DATADIR%%/httpdocs/js/pages/pools/host-members.js
 %%DATADIR%%/httpdocs/js/pages/pools/pools.js
 %%DATADIR%%/httpdocs/js/pages/recipients-endpoints.js
@@ -1877,6 +1877,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/js/tagify.min.js
 %%DATADIR%%/httpdocs/js/tempusdominus.min.js
 %%DATADIR%%/httpdocs/js/timeline.js
+%%DATADIR%%/httpdocs/js/utils/active_monitoring_utils.js
 %%DATADIR%%/httpdocs/js/utils/are-you-sure-utils.js
 %%DATADIR%%/httpdocs/js/utils/blog-notification-utils.js
 %%DATADIR%%/httpdocs/js/utils/bootstrap-datatable-utils.js
@@ -1911,6 +1912,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/leaflet/leaflet.markercluster.js
 %%DATADIR%%/httpdocs/leaflet/leaflet.markercluster.js.map
 %%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/ntopng-add-user.sh
 %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config
 %%DATADIR%%/httpdocs/misc/ntopng-utils-manage-config.in
@@ -1933,11 +1936,16 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/selectpicker/js/bootstrap-select.js
 %%DATADIR%%/httpdocs/ssl/README
 %%DATADIR%%/httpdocs/ssl/ntopng-cert.pem.dummy
+%%DATADIR%%/httpdocs/templates/active_monitoring_stats.template
+%%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/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/alerts/alert-stats.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
 %%DATADIR%%/httpdocs/templates/pages/alerts/families/all/table.js.template
 %%DATADIR%%/httpdocs/templates/pages/alerts/families/all/table.template
@@ -1962,6 +1970,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/pages/arp.template
 %%DATADIR%%/httpdocs/templates/pages/components/blog-dropdown.template
 %%DATADIR%%/httpdocs/templates/pages/components/breadcrumb.template
+%%DATADIR%%/httpdocs/templates/pages/components/datatable.template
+%%DATADIR%%/httpdocs/templates/pages/components/db-analysis.template
 %%DATADIR%%/httpdocs/templates/pages/components/export-policy-configuration-link.template
 %%DATADIR%%/httpdocs/templates/pages/components/ifaces-dropdown.template
 %%DATADIR%%/httpdocs/templates/pages/components/ifaces-select.template
@@ -1980,6 +1990,7 @@ man/man8/ntopng.8.gz
 %%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/hosts_geomap.template
 %%DATADIR%%/httpdocs/templates/pages/hosts_map.template
 %%DATADIR%%/httpdocs/templates/pages/interface_nprobes.template
 %%DATADIR%%/httpdocs/templates/pages/ja3_fingerprint.template
@@ -2027,34 +2038,67 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/traffic_report.html
 %%DATADIR%%/httpdocs/templates/typeahead_input.html
 %%DATADIR%%/httpdocs/templates/widgets/chart-widget.template
+%%DATADIR%%/httpdocs/templates/widgets/geomap-widget.template
 %%DATADIR%%/httpdocs/templates/wizard_dialog.html
 %%DATADIR%%/httpdocs/tempusdominus/css/tempusdominus-bootstrap-4.css
 %%DATADIR%%/httpdocs/tempusdominus/js/tempusdominus-bootstrap-4.js
-%%DATADIR%%/scripts/callbacks/interface/5min.lua
-%%DATADIR%%/scripts/callbacks/interface/daily.lua
-%%DATADIR%%/scripts/callbacks/interface/hourly.lua
-%%DATADIR%%/scripts/callbacks/interface/interface.lua
-%%DATADIR%%/scripts/callbacks/interface/minute.lua
-%%DATADIR%%/scripts/callbacks/interface/network.lua
-%%DATADIR%%/scripts/callbacks/interface/periodic_checks.lua
-%%DATADIR%%/scripts/callbacks/system/5min.lua
+%%DATADIR%%/scripts/callbacks/5minute-delayed/interface/interface_checks.lua
+%%DATADIR%%/scripts/callbacks/5minute-delayed/interface/local_network_checks.lua
+%%DATADIR%%/scripts/callbacks/5minute-delayed/system/snmp_device_checks.lua
+%%DATADIR%%/scripts/callbacks/5minute/interface/timeseries.lua
+%%DATADIR%%/scripts/callbacks/5minute/system/active_monitoring.lua
+%%DATADIR%%/scripts/callbacks/5minute/system/export_influxdb_stats.lua
+%%DATADIR%%/scripts/callbacks/5minute/system/system_checks.lua
+%%DATADIR%%/scripts/callbacks/5second/system/housekeeping.lua
+%%DATADIR%%/scripts/callbacks/5second/system/influxdb.lua
+%%DATADIR%%/scripts/callbacks/5second/system/nedge_pinger.lua
+%%DATADIR%%/scripts/callbacks/5second/system/network_discovery.lua
+%%DATADIR%%/scripts/callbacks/5second/system/notifications.lua
+%%DATADIR%%/scripts/callbacks/5second/system/timeseries.lua
+%%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
+%%DATADIR%%/scripts/callbacks/daily-delayed/interface/timeseries_retention.lua
+%%DATADIR%%/scripts/callbacks/daily-delayed/system/clickhouse_retention.lua
+%%DATADIR%%/scripts/callbacks/daily-delayed/system/fetch_blog_feed.lua
+%%DATADIR%%/scripts/callbacks/daily-delayed/system/mysql_retention.lua
+%%DATADIR%%/scripts/callbacks/daily-delayed/system/stats_retention.lua
+%%DATADIR%%/scripts/callbacks/daily-delayed/system/system_checks.lua
+%%DATADIR%%/scripts/callbacks/hourly-delayed/interface/checks_cleanup.lua
+%%DATADIR%%/scripts/callbacks/hourly-delayed/interface/interface_checks.lua
+%%DATADIR%%/scripts/callbacks/hourly-delayed/interface/local_network_checks.lua
+%%DATADIR%%/scripts/callbacks/hourly-delayed/system/connectivity.lua
+%%DATADIR%%/scripts/callbacks/hourly-delayed/system/system_checks.lua
+%%DATADIR%%/scripts/callbacks/hourly/system/active_monitoring.lua
+%%DATADIR%%/scripts/callbacks/hourly/system/disk_monitor.lua
+%%DATADIR%%/scripts/callbacks/minute-delayed/interface/interface_checks.lua
+%%DATADIR%%/scripts/callbacks/minute-delayed/interface/local_network_checks.lua
+%%DATADIR%%/scripts/callbacks/minute-delayed/system/clickhouse.lua
+%%DATADIR%%/scripts/callbacks/minute/interface/localhosts_stats.lua
+%%DATADIR%%/scripts/callbacks/minute/interface/timeseries.lua
+%%DATADIR%%/scripts/callbacks/minute/system/active_monitoring.lua
+%%DATADIR%%/scripts/callbacks/minute/system/drop_host_pool.lua
+%%DATADIR%%/scripts/callbacks/minute/system/influxdb_checks.lua
+%%DATADIR%%/scripts/callbacks/minute/system/redis_timeseries.lua
+%%DATADIR%%/scripts/callbacks/minute/system/system_checks.lua
+%%DATADIR%%/scripts/callbacks/minute/system/timeseries.lua
+%%DATADIR%%/scripts/callbacks/second/system/timeseries.lua
 %%DATADIR%%/scripts/callbacks/system/boot.lua
-%%DATADIR%%/scripts/callbacks/system/daily.lua
-%%DATADIR%%/scripts/callbacks/system/discover.lua
-%%DATADIR%%/scripts/callbacks/system/hourly.lua
-%%DATADIR%%/scripts/callbacks/system/housekeeping.lua
-%%DATADIR%%/scripts/callbacks/system/minute.lua
-%%DATADIR%%/scripts/callbacks/system/notifications.lua
-%%DATADIR%%/scripts/callbacks/system/pinger.lua
-%%DATADIR%%/scripts/callbacks/system/recovery.lua
-%%DATADIR%%/scripts/callbacks/system/second.lua
 %%DATADIR%%/scripts/callbacks/system/shutdown.lua
-%%DATADIR%%/scripts/callbacks/system/snmp_device.lua
 %%DATADIR%%/scripts/callbacks/system/startup.lua
-%%DATADIR%%/scripts/callbacks/system/stats_update.lua
 %%DATADIR%%/scripts/callbacks/system/syslog.lua
-%%DATADIR%%/scripts/callbacks/system/system.lua
-%%DATADIR%%/scripts/callbacks/system/timeseries.lua
+%%DATADIR%%/scripts/historical/analysis/README
+%%DATADIR%%/scripts/historical/analysis/asn.json
+%%DATADIR%%/scripts/historical/analysis/flow_status.json
+%%DATADIR%%/scripts/historical/analysis/protos.json
+%%DATADIR%%/scripts/historical/analysis/score.json
+%%DATADIR%%/scripts/historical/tables/README
+%%DATADIR%%/scripts/historical/tables/latency_by_asn.json
+%%DATADIR%%/scripts/historical/tables/top_clients.json
+%%DATADIR%%/scripts/historical/tables/top_conversations.json
+%%DATADIR%%/scripts/historical/tables/top_l7_contacts.json
+%%DATADIR%%/scripts/historical/tables/top_server_ports.json
+%%DATADIR%%/scripts/historical/tables/top_servers.json
 %%DATADIR%%/scripts/locales/cn.lua
 %%DATADIR%%/scripts/locales/cz.lua
 %%DATADIR%%/scripts/locales/de.lua
@@ -2063,6 +2107,7 @@ 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
@@ -2092,6 +2137,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/admin/service_restart.lua
 %%DATADIR%%/scripts/lua/admin/users.lua
 %%DATADIR%%/scripts/lua/admin/validate_new_user.lua
+%%DATADIR%%/scripts/lua/alert_details.lua
 %%DATADIR%%/scripts/lua/alert_stats.lua
 %%DATADIR%%/scripts/lua/as_details.lua
 %%DATADIR%%/scripts/lua/as_stats.lua
@@ -2113,6 +2159,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/discover.lua
 %%DATADIR%%/scripts/lua/dismiss_toast.lua
 %%DATADIR%%/scripts/lua/do_export_data.lua
+%%DATADIR%%/scripts/lua/edit_active_monitoring_host.lua
 %%DATADIR%%/scripts/lua/edit_check_config.lua
 %%DATADIR%%/scripts/lua/edit_datasources.lua
 %%DATADIR%%/scripts/lua/edit_endpoint.lua
@@ -2132,6 +2179,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/flow_stats.lua
 %%DATADIR%%/scripts/lua/flows_stats.lua
 %%DATADIR%%/scripts/lua/geoip_config.lua
+%%DATADIR%%/scripts/lua/get_active_monitoring_hosts.lua
 %%DATADIR%%/scripts/lua/get_arp_data.lua
 %%DATADIR%%/scripts/lua/get_as_data.lua
 %%DATADIR%%/scripts/lua/get_ases_data.lua
@@ -2143,7 +2191,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_countries_data.lua
 %%DATADIR%%/scripts/lua/get_country_data.lua
 %%DATADIR%%/scripts/lua/get_db_data.lua
-%%DATADIR%%/scripts/lua/get_db_flows.lua
 %%DATADIR%%/scripts/lua/get_dhcp_config.lua
 %%DATADIR%%/scripts/lua/get_discover_data.lua
 %%DATADIR%%/scripts/lua/get_discover_progress.lua
@@ -2152,7 +2199,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_flow_db_data.lua
 %%DATADIR%%/scripts/lua/get_flow_process_tree.lua
 %%DATADIR%%/scripts/lua/get_flows_data.lua
-%%DATADIR%%/scripts/lua/get_geo_hosts.lua
 %%DATADIR%%/scripts/lua/get_historical_data.lua
 %%DATADIR%%/scripts/lua/get_historical_favourites.lua
 %%DATADIR%%/scripts/lua/get_host_data.lua
@@ -2234,11 +2280,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/index.lua
 %%DATADIR%%/scripts/lua/info_portal.lua
 %%DATADIR%%/scripts/lua/install_update.lua
-%%DATADIR%%/scripts/lua/jsontest.lua
 %%DATADIR%%/scripts/lua/license.lua
 %%DATADIR%%/scripts/lua/live_capture_data.lua
 %%DATADIR%%/scripts/lua/live_capture_stats.lua
-%%DATADIR%%/scripts/lua/live_traffic.lua
 %%DATADIR%%/scripts/lua/login.lua
 %%DATADIR%%/scripts/lua/logout.lua
 %%DATADIR%%/scripts/lua/mac_details.lua
@@ -2249,7 +2293,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert.lua
 %%DATADIR%%/scripts/lua/modules/alert_consts.lua
 %%DATADIR%%/scripts/lua/modules/alert_creators.lua
+%%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_data_exfiltration.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_device_protocol_not_allowed.lua
@@ -2260,7 +2306,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_flow_blacklisted.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_flow_blocked.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_flow_low_goodput.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_flow_risk.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_flow_tcp_no_data_exchanged.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_iec_invalid_transition.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_iec_unexpected_type_id.lua
@@ -2276,7 +2321,8 @@ man/man8/ntopng.8.gz
 %%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_smb_insecure_version.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_ssh_obsolete.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_tls_cert_validity_too_long.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_missing_sni.lua
@@ -2291,7 +2337,6 @@ man/man8/ntopng.8.gz
 %%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
-%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_suspicious_file_transfer.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tcp_connection_refused.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tls_certificate_expired.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tls_certificate_mismatch.lua
@@ -2305,17 +2350,22 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_unexpected_smtp_server.lua
 %%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_dangerous_host.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_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
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_icmp_flood.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_ntp_server_contacts.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_ntp_traffic.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_p2p_traffic.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_pkt_threshold.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_remote_connection.lua
 %%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_tcp_syn_flood.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_tcp_syn_scan.lua
@@ -2332,6 +2382,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_ghost_network.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_host_pool_connection.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_host_pool_disconnection.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_ids_ips_jail_add.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_ids_ips_jail_remove.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_influxdb_error.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_influxdb_export_failure.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_ip_outsite_dhcp_range.lua
@@ -2340,6 +2392,7 @@ man/man8/ntopng.8.gz
 %%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
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_network_discovery_executed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_nfq_flushed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_ngi_trust_event.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_no_if_activity.lua
@@ -2349,6 +2402,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_load_threshold_exceeded.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_mac_changed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_status_change.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_too_many_macs.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_process_notification.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_quota_exceeded.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_shell_script_executed.lua
@@ -2383,6 +2437,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_store/user_alert_store.lua
 %%DATADIR%%/scripts/lua/modules/alert_utils.lua
 %%DATADIR%%/scripts/lua/modules/alerts_api.lua
+%%DATADIR%%/scripts/lua/modules/am_import_export.lua
+%%DATADIR%%/scripts/lua/modules/am_utils.lua
 %%DATADIR%%/scripts/lua/modules/as_utils.lua
 %%DATADIR%%/scripts/lua/modules/auth.lua
 %%DATADIR%%/scripts/lua/modules/auth_sessions_utils.lua
@@ -2390,8 +2446,11 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/behavior_utils.lua
 %%DATADIR%%/scripts/lua/modules/blog_utils.lua
 %%DATADIR%%/scripts/lua/modules/callback_utils.lua
+%%DATADIR%%/scripts/lua/modules/captive_portal_utils.lua
 %%DATADIR%%/scripts/lua/modules/categories_utils.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/binary_application_transfer.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/blacklisted.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/broadcast_non_udp_traffic.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/country_check.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/device_protocol_not_allowed.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/external_alert_check.lua
@@ -2406,7 +2465,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_http_suspicious_user_agent.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_malformed_packet.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_smb_insecure_version.lua
-%%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_ssh_obsolete.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_tls_missing_sni.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/ndpi_tls_not_carrying_https.lua
@@ -2419,7 +2479,6 @@ 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/suspicious_file_transfer.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/udp_unidirectional.lua
@@ -2429,14 +2488,19 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/unexpected_smtp.lua
 %%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/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/flow_flood.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/host/icmp_flood.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/ntp.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/ntp_contacts.lua
 %%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/score_threshold.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/smtp_contacts.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/syn_flood.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/syn_scan.lua
@@ -2471,6 +2535,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/datamodel/heatmap.lua
 %%DATADIR%%/scripts/lua/modules/datamodel/slices.lua
 %%DATADIR%%/scripts/lua/modules/datasources_utils.lua
+%%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_utils.lua
@@ -2487,12 +2552,13 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/flow_dbms/flow_dbms.lua
 %%DATADIR%%/scripts/lua/modules/flow_field_value_maps.lua
 %%DATADIR%%/scripts/lua/modules/flow_field_value_maps/sonicwall_app_id.lua
+%%DATADIR%%/scripts/lua/modules/flow_risk_simple_alert_definition.lua
+%%DATADIR%%/scripts/lua/modules/flow_risk_simple_check_definition.lua
 %%DATADIR%%/scripts/lua/modules/flow_risk_utils.lua
 %%DATADIR%%/scripts/lua/modules/flow_utils.lua
 %%DATADIR%%/scripts/lua/modules/format_utils.lua
 %%DATADIR%%/scripts/lua/modules/graph_common.lua
 %%DATADIR%%/scripts/lua/modules/graph_utils.lua
-%%DATADIR%%/scripts/lua/modules/historical_utils.lua
 %%DATADIR%%/scripts/lua/modules/host_pools_migration.lua
 %%DATADIR%%/scripts/lua/modules/host_pools_nedge.lua
 %%DATADIR%%/scripts/lua/modules/hosts_map_utils.lua
@@ -2513,6 +2579,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/import_export/notifications_import_export.lua
 %%DATADIR%%/scripts/lua/modules/import_export/pool_import_export.lua
 %%DATADIR%%/scripts/lua/modules/import_export/snmp_import_export.lua
+%%DATADIR%%/scripts/lua/modules/influxdb_export_api.lua
 %%DATADIR%%/scripts/lua/modules/internals_utils.lua
 %%DATADIR%%/scripts/lua/modules/ipv4_utils.lua
 %%DATADIR%%/scripts/lua/modules/json.lua
@@ -2524,12 +2591,18 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/lua_trace.lua
 %%DATADIR%%/scripts/lua/modules/lua_utils.lua
 %%DATADIR%%/scripts/lua/modules/mac_utils.lua
+%%DATADIR%%/scripts/lua/modules/measurements/cicmp.lua
+%%DATADIR%%/scripts/lua/modules/measurements/http.lua
+%%DATADIR%%/scripts/lua/modules/measurements/http_download.lua
+%%DATADIR%%/scripts/lua/modules/measurements/icmp.lua
+%%DATADIR%%/scripts/lua/modules/measurements/speedtest.lua
 %%DATADIR%%/scripts/lua/modules/network_utils.lua
 %%DATADIR%%/scripts/lua/modules/new_devices.lua
 %%DATADIR%%/scripts/lua/modules/notifications/endpoints.lua
 %%DATADIR%%/scripts/lua/modules/notifications/recipients.lua
 %%DATADIR%%/scripts/lua/modules/notifications/recipients_rest_utils.lua
 %%DATADIR%%/scripts/lua/modules/ntop_utils.lua
+%%DATADIR%%/scripts/lua/modules/os_data_utils.lua
 %%DATADIR%%/scripts/lua/modules/os_utils.lua
 %%DATADIR%%/scripts/lua/modules/page_utils.lua
 %%DATADIR%%/scripts/lua/modules/periodic_activities_utils.lua
@@ -2558,6 +2631,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/protos_utils.lua
 %%DATADIR%%/scripts/lua/modules/recording_utils.lua
 %%DATADIR%%/scripts/lua/modules/recovery_utils.lua
+%%DATADIR%%/scripts/lua/modules/redis_api.lua
 %%DATADIR%%/scripts/lua/modules/rest_utils.lua
 %%DATADIR%%/scripts/lua/modules/resty/template.lua
 %%DATADIR%%/scripts/lua/modules/resty/template/html.lua
@@ -2584,7 +2658,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/timeseries/custom/ts_5min_custom.lua.sample
 %%DATADIR%%/scripts/lua/modules/timeseries/custom/ts_minute_custom.lua.sample
 %%DATADIR%%/scripts/lua/modules/timeseries/drivers/influxdb.lua
-%%DATADIR%%/scripts/lua/modules/timeseries/drivers/nindex.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/drivers/rrd.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/drivers/sample.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/schemas/ts_5min.lua
@@ -2602,6 +2675,7 @@ man/man8/ntopng.8.gz
 %%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/tls_consts.lua
 %%DATADIR%%/scripts/lua/modules/toasts/defined_toasts.lua
 %%DATADIR%%/scripts/lua/modules/toasts/predicates_defined_toasts.lua
 %%DATADIR%%/scripts/lua/modules/toasts/toast_ui.lua
@@ -2618,6 +2692,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/widget_gui_utils.lua
 %%DATADIR%%/scripts/lua/modules/widgets_utils.lua
 %%DATADIR%%/scripts/lua/modules/xmlSimple.lua
+%%DATADIR%%/scripts/lua/monitor/active_monitoring_monitor.lua
+%%DATADIR%%/scripts/lua/monitor/influxdb_monitor.lua
+%%DATADIR%%/scripts/lua/monitor/redis_monitor.lua
 %%DATADIR%%/scripts/lua/network_details.lua
 %%DATADIR%%/scripts/lua/network_stats.lua
 %%DATADIR%%/scripts/lua/os_details.lua
@@ -2701,7 +2778,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v1/get/active_monitoring/pools.lua
 %%DATADIR%%/scripts/lua/rest/v1/get/alert/.dontdelete
 %%DATADIR%%/scripts/lua/rest/v1/get/alert/severity/consts.lua
+%%DATADIR%%/scripts/lua/rest/v1/get/alert/severity/counters.lua
 %%DATADIR%%/scripts/lua/rest/v1/get/alert/type/consts.lua
+%%DATADIR%%/scripts/lua/rest/v1/get/alert/type/counters.lua
 %%DATADIR%%/scripts/lua/rest/v1/get/all/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v1/get/all/alert/ts.lua
 %%DATADIR%%/scripts/lua/rest/v1/get/am_host/alert/list.lua
@@ -2823,6 +2902,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/delete/network/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/network/pool.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
@@ -2849,7 +2929,9 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/export/snmp/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/active_monitoring/pools.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/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
@@ -2865,6 +2947,7 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/l7/counters.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/pools.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/traffic_stats.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/geo_map/hosts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/active.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/alert/ts.lua
@@ -2902,9 +2985,12 @@ man/man8/ntopng.8.gz
 %%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/recipient/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/system/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/system/alert/ts.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/system/pools.lua
@@ -2927,8 +3013,10 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/reset/notifications/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/reset/pool/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/reset/snmp/config.lua
+%%DATADIR%%/scripts/lua/rest/v2/set/checks/auto_refresh.lua
 %%DATADIR%%/scripts/lua/rest/v2/set/checks/config.lua
 %%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/version.lua
 %%DATADIR%%/scripts/lua/show_geolocation_note.lua
@@ -2948,9 +3036,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/system_stats.lua
 %%DATADIR%%/scripts/lua/system_stats_data.lua
 %%DATADIR%%/scripts/lua/telemetry.lua
-%%DATADIR%%/scripts/lua/test_delete_nindex.lua
-%%DATADIR%%/scripts/lua/test_locales.lua
-%%DATADIR%%/scripts/lua/test_notification_endpoints.lua
 %%DATADIR%%/scripts/lua/toggle_all_checks.lua
 %%DATADIR%%/scripts/lua/toggle_check.lua
 %%DATADIR%%/scripts/lua/top_hosts.lua
@@ -2963,7 +3048,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/username_details.lua
 %%DATADIR%%/scripts/lua/vlan_details.lua
 %%DATADIR%%/scripts/lua/vlan_stats.lua
-%%DATADIR%%/scripts/lua/widgets/widget.lua
 %%DATADIR%%/scripts/plugins/README.md
 %%DATADIR%%/scripts/plugins/alerts/internals/alerts_drops/checks/interface/dropped_alerts.lua
 %%DATADIR%%/scripts/plugins/alerts/internals/alerts_drops/checks/system/dropped_alerts.lua
@@ -2981,6 +3065,10 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/plugins/alerts/internals/slow_purge/manifest.lua
 %%DATADIR%%/scripts/plugins/alerts/network/broadcast_domain_too_large/checks/interface/broadcast_domain_too_large.lua
 %%DATADIR%%/scripts/plugins/alerts/network/broadcast_domain_too_large/manifest.lua
+%%DATADIR%%/scripts/plugins/alerts/network/network_discovery/checks/interface/network_discovery.lua
+%%DATADIR%%/scripts/plugins/alerts/network/network_discovery/locales/en.lua
+%%DATADIR%%/scripts/plugins/alerts/network/network_discovery/locales/it.lua
+%%DATADIR%%/scripts/plugins/alerts/network/network_discovery/manifest.lua
 %%DATADIR%%/scripts/plugins/alerts/network/remote_connection/manifest.lua
 %%DATADIR%%/scripts/plugins/alerts/network/snmp_topology_change/checks/snmp_device/lldp_topology_changed.lua
 %%DATADIR%%/scripts/plugins/alerts/network/snmp_topology_change/manifest.lua
@@ -2993,6 +3081,8 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/plugins/alerts/security/flow_flood/manifest.lua
 %%DATADIR%%/scripts/plugins/alerts/security/ghost_networks/checks/interface/ghost_networks.lua
 %%DATADIR%%/scripts/plugins/alerts/security/ghost_networks/manifest.lua
+%%DATADIR%%/scripts/plugins/alerts/security/ids_ips_log/checks/system/ids_ips_log.lua
+%%DATADIR%%/scripts/plugins/alerts/security/ids_ips_log/manifest.lua
 %%DATADIR%%/scripts/plugins/alerts/security/score_anomaly/manifest.lua
 %%DATADIR%%/scripts/plugins/alerts/security/syn_flood/checks/network/syn_flood_victim.lua
 %%DATADIR%%/scripts/plugins/alerts/security/syn_flood/manifest.lua
@@ -3006,12 +3096,13 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/plugins/collectors/host_log_collector/checks/syslog/host_log.lua
 %%DATADIR%%/scripts/plugins/collectors/host_log_collector/locales/en.lua
 %%DATADIR%%/scripts/plugins/collectors/host_log_collector/manifest.lua
-%%DATADIR%%/scripts/plugins/collectors/ngi_trust_collector/checks/syslog/ngi_trust.lua
-%%DATADIR%%/scripts/plugins/collectors/ngi_trust_collector/locales/en.lua
-%%DATADIR%%/scripts/plugins/collectors/ngi_trust_collector/manifest.lua
 %%DATADIR%%/scripts/plugins/collectors/suricata_collector/checks/syslog/suricata.lua
 %%DATADIR%%/scripts/plugins/collectors/suricata_collector/locales/en.lua
 %%DATADIR%%/scripts/plugins/collectors/suricata_collector/manifest.lua
+%%DATADIR%%/scripts/plugins/endpoints/alert_store_db_endpoint/alert_endpoints/alert_store_db.lua
+%%DATADIR%%/scripts/plugins/endpoints/alert_store_db_endpoint/manifest.lua
+%%DATADIR%%/scripts/plugins/endpoints/alert_store_db_endpoint/templates/alert_store_db_endpoint.template
+%%DATADIR%%/scripts/plugins/endpoints/alert_store_db_endpoint/templates/alert_store_db_recipient.template
 %%DATADIR%%/scripts/plugins/endpoints/discord_alert_endpoint/alert_endpoints/discord.lua
 %%DATADIR%%/scripts/plugins/endpoints/discord_alert_endpoint/http_lint.lua
 %%DATADIR%%/scripts/plugins/endpoints/discord_alert_endpoint/locales/en.lua
@@ -3034,10 +3125,6 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/plugins/endpoints/slack_alert_endpoint/manifest.lua
 %%DATADIR%%/scripts/plugins/endpoints/slack_alert_endpoint/templates/slack_endpoint.template
 %%DATADIR%%/scripts/plugins/endpoints/slack_alert_endpoint/templates/slack_recipient.template
-%%DATADIR%%/scripts/plugins/endpoints/sqlite_alert_endpoint/alert_endpoints/sqlite.lua
-%%DATADIR%%/scripts/plugins/endpoints/sqlite_alert_endpoint/manifest.lua
-%%DATADIR%%/scripts/plugins/endpoints/sqlite_alert_endpoint/templates/sqlite_endpoint.template
-%%DATADIR%%/scripts/plugins/endpoints/sqlite_alert_endpoint/templates/sqlite_recipient.template
 %%DATADIR%%/scripts/plugins/endpoints/syslog_alert_endpoint/alert_endpoints/syslog.lua
 %%DATADIR%%/scripts/plugins/endpoints/syslog_alert_endpoint/http_lint.lua
 %%DATADIR%%/scripts/plugins/endpoints/syslog_alert_endpoint/locales/en.lua
@@ -3069,46 +3156,5 @@ man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/plugins/examples/example/ts_schemas/min.lua
 %%DATADIR%%/scripts/plugins/examples/example/web_gui/example_page.lua
 %%DATADIR%%/scripts/plugins/examples/example/web_gui/menu.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/checks/system/active_monitoring.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/http_lint.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/httpdocs/active_monitoring_utils.js
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/locales/en.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/manifest.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/measurements/cicmp.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/measurements/http.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/measurements/http_download.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/measurements/icmp.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/measurements/speedtest.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/modules/am_import_export.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/modules/am_utils.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/templates/active_monitoring_stats.template
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/templates/am_add_host_modal.html
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/templates/am_delete_host_modal.html
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/templates/am_edit_host_modal.html
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/ts_schemas/5mins.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/ts_schemas/hour.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/ts_schemas/min.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/web_gui/active_monitoring_stats.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/web_gui/edit_active_monitoring_host.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/web_gui/get_active_monitoring_hosts.lua
-%%DATADIR%%/scripts/plugins/monitors/network/active_monitoring/web_gui/menu.lua
-%%DATADIR%%/scripts/plugins/monitors/system/disk_monitor/checks/system/disk_monitor.lua
-%%DATADIR%%/scripts/plugins/monitors/system/disk_monitor/manifest.lua
-%%DATADIR%%/scripts/plugins/monitors/system/influxdb_monitor/checks/system/influxdb_monitor.lua
-%%DATADIR%%/scripts/plugins/monitors/system/influxdb_monitor/manifest.lua
-%%DATADIR%%/scripts/plugins/monitors/system/influxdb_monitor/ts_schemas/5mins.lua
-%%DATADIR%%/scripts/plugins/monitors/system/influxdb_monitor/web_gui/influxdb_stats.lua
-%%DATADIR%%/scripts/plugins/monitors/system/influxdb_monitor/web_gui/menu.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/checks/system/redis_monitor.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/manifest.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/ts_schemas/min.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_info.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/web_gui/get_redis_stats.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/web_gui/menu.lua
-%%DATADIR%%/scripts/plugins/monitors/system/redis_monitor/web_gui/redis_stats.lua
-%%DATADIR%%/scripts/plugins/monitors/system/timeseries/checks/system/alerts_ts.lua
-%%DATADIR%%/scripts/plugins/monitors/system/timeseries/checks/system/memory_ts.lua
-%%DATADIR%%/scripts/plugins/monitors/system/timeseries/manifest.lua
-%%DATADIR%%/scripts/plugins/monitors/system/timeseries/ts_schemas/min.lua
 %%DATADIR%%/scripts/shell/README
 @dir(%%NTOPNGUSER%%,%%NTOPNGGROUP%%,750) /var/db/ntopng