Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Aug 2024 09:24:45 GMT
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 8e8fb488e116 - main - net/ntopng: Update to 6.2 latest snapshot
Message-ID:  <202408170924.47H9OjRU094400@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot:

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

commit 8e8fb488e11621f54d31f30a2afd7b47cecddf22
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-08-17 09:23:00 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2024-08-17 09:23:00 +0000

    net/ntopng: Update to 6.2 latest snapshot
---
 net/ntopng/Makefile                    |   6 +-
 net/ntopng/distinfo                    |  10 +-
 net/ntopng/files/patch-configure.ac.in |  92 +++++++++--------
 net/ntopng/pkg-plist                   | 175 +++++++++++++++++++++++----------
 4 files changed, 184 insertions(+), 99 deletions(-)

diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile
index 6fd656273505..6bb2d3ae2d57 100644
--- a/net/ntopng/Makefile
+++ b/net/ntopng/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ntopng
-PORTVERSION=	6.0.d20240805
+PORTVERSION=	6.2.d20240813
 PORTEPOCH=	1
 CATEGORIES=	net
 
@@ -38,9 +38,9 @@ GROUPS=		ntopng
 PLIST_SUB=	NTOPNGUSER="${USERS}" NTOPNGROUP="${GROUPS}"
 
 USE_GITHUB=	yes
-GH_TUPLE=	ntop:ntopng-dist:1dcd0a1:dist/httpdocs/dist
+GH_TUPLE=	ntop:ntopng-dist:659ed71:dist/httpdocs/dist
 GH_ACCOUNT=	ntop
-GH_TAGNAME=	e968941f
+GH_TAGNAME=	9a35ae5
 
 CPE_VENDOR=	ntop
 
diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo
index fb2bcbe59ac3..5fe58c09172c 100644
--- a/net/ntopng/distinfo
+++ b/net/ntopng/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1723142270
-SHA256 (ntop-ntopng-6.0.d20240805-e968941f_GH0.tar.gz) = 4fa71fcc16c6d554f8c768b37fb483d0211a6101750828ea1ba97b000493f095
-SIZE (ntop-ntopng-6.0.d20240805-e968941f_GH0.tar.gz) = 68322033
-SHA256 (ntop-ntopng-dist-1dcd0a1_GH0.tar.gz) = 91716a773c07d49680b16572a5622b2d2bc0da1edc98b897a4665c10c2643b91
-SIZE (ntop-ntopng-dist-1dcd0a1_GH0.tar.gz) = 2886790
+TIMESTAMP = 1723807556
+SHA256 (ntop-ntopng-6.2.d20240813-9a35ae5_GH0.tar.gz) = 71d52eafa3ecdea6c32449f268f3a2b185cb49980ea2ee465cd2148ed575fec3
+SIZE (ntop-ntopng-6.2.d20240813-9a35ae5_GH0.tar.gz) = 78899793
+SHA256 (ntop-ntopng-dist-659ed71_GH0.tar.gz) = 68c530984be9cb75f264655a4fcf7c11bd7602a31eeb5b8c176d7d81055a5959
+SIZE (ntop-ntopng-dist-659ed71_GH0.tar.gz) = 3104383
diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in
index f0b7cc680a7e..d6196ea62455 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	2024-01-02 16:25:47 UTC
+--- configure.ac.in.orig	2024-08-13 16:12:12 UTC
 +++ configure.ac.in
-@@ -142,40 +142,8 @@ LIBPCAP=-lpcap
+@@ -153,40 +153,8 @@ LIBPCAP=-lpcap
  MAKE=make
  BIN_PATH=/usr/bin
  LIBPCAP=-lpcap
@@ -42,7 +42,7 @@
  dnl> Remove spaces
  OS="${OS#"${OS%%[![:space:]]*}"}"
  
-@@ -220,15 +188,6 @@ fi
+@@ -233,24 +201,6 @@ fi
    LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack"
  fi
  
@@ -55,10 +55,19 @@
 -  LIBS="${LIBS} -L/usr/local/lib"
 -fi
 -
- if test -d /opt/local/include; then :
-   CFLAGS="${CFLAGS} -I/opt/local/include"
-   CXXFLAGS="${CXXFLAGS} -I/opt/local/include"
-@@ -282,15 +241,12 @@ AC_ARG_WITH(ndpi-includes,
+-if test -d /opt/local/include; then :
+-  CFLAGS="${CFLAGS} -I/opt/local/include"
+-  CXXFLAGS="${CXXFLAGS} -I/opt/local/include"
+-fi
+-
+-if test -d /opt/local/lib; then :
+-  LIBS="${LIBS} -L/opt/local/lib"
+-fi
+-
+ if [ test -f /usr/bin/lsb_release ]; then
+   CODENAME=`/usr/bin/lsb_release -c|cut -f 2`
+   if test $CODENAME = "wheezy" ; then
+@@ -313,15 +263,12 @@ AC_ARG_WITH(ndpi-includes,
        NDPI_CUST_INC="-I$withval -I$withval/../lib/third_party/include"
     ])
  
@@ -80,7 +89,7 @@
        if test -d "./nDPI" ; then :
           NDPI_HOME=./nDPI
        elif test -d "../nDPI" ; then :
-@@ -315,8 +271,8 @@ AC_MSG_CHECKING(for nDPI source)
+@@ -346,8 +293,8 @@ AC_MSG_CHECKING(for nDPI source)
        else
           AC_MSG_RESULT(not found)
        fi
@@ -90,15 +99,17 @@
  if test ! -z "$NDPI_CUST_INC" ; then :
    NDPI_INC=$NDPI_CUST_INC
  fi
-@@ -339,45 +295,10 @@ AC_ARG_WITH(json-c-static,
+@@ -370,44 +317,10 @@ AC_ARG_WITH(json-c-static,
      [PKG_CHECK_MODULES(JSON, json-c, [], [AC_MSG_ERROR(Please install libjson-c-dev package prerequisite)])]
  )
  
 -if test -x /bin/freebsd-version; then
 - FREEBSD_VERSION=`freebsd-version | cut -f 1 -d '.'`
 -fi
++AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
++SSL_INC="-I%%SSL_INC%%"
++SSL_LIB="-L%%SSL_LIB%% -lssl -lcrypto"
  
--if test "${FREEBSD_VERSION}" != "14"; then
 -pkg-config --exists libssl
 -if test "$?" -ne 1; then
 -  AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
@@ -109,7 +120,7 @@
 -  if test -d "/usr/local/Cellar/openssl@1.1"; then
 -    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
 -    SSL_INC="-I/usr/local/Cellar/openssl@1.1/include"
--    SSL_LIB="-L/usr/local/Cellar/openssl@1.1 -lssl -lcrypto"
+-    SSL_LIB="-L/usr/local/Cellar/openssl@1.1/lib -lssl -lcrypto"
 -  elif test -d "/usr/local/opt/openssl/lib"; then
 -    AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
 -    SSL_INC="-I/usr/local/opt/openssl/include"
@@ -132,33 +143,38 @@
 -    exit -1
 -  fi
 -fi
--fi
-+AC_DEFINE_UNQUOTED(NO_SSL_DL, 1, [has openssl])
-+SSL_INC="-I%%SSL_INC%%"
-+SSL_LIB="-L%%SSL_LIB%% -lssl -lcrypto"
- 
+-
  AC_MSG_CHECKING([PF_RING nBPF])
  NBPF_HOME=${PWD}/../PF_RING/userland/nbpf
-@@ -510,12 +431,8 @@ AS_VAR_IF(with_hiredis, yes, [
+ LIBNBPF=${NBPF_HOME}/libnbpf.a
+@@ -540,17 +453,12 @@ AS_VAR_IF(with_hiredis, yes, [
+ AS_VAR_IF(with_hiredis, yes, [
      pkg-config --exists hiredis
      if test "$?" -ne 1; then
-     HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
--    if test $SYSTEM = "FreeBSD"; then
+-    HIREDIS_INC="`pkg-config --cflags hiredis` -I/usr/include/hiredis"
+-    if test $SYSTEM = "FreeBSD" && $FREEBSD_VERSION != "15"; then
+-	dnl> Note: on freebsd 15 .a is not installed
 -        HIREDIS_LIB="/usr/local/lib/libhiredis.a"
-+    HIREDIS_LIB="`pkg-config --libs hiredis`"
++      HIREDIS_INC="`pkg-config --cflags hiredis`"
++      HIREDIS_LIB="`pkg-config --libs hiredis`"
      else
 -        HIREDIS_LIB="`pkg-config --libs hiredis`"
--    fi
--    else
-     echo "Please install hiredis package prerequisite"
-     exit -1
++      echo "Please install hiredis package prerequisite"
++      exit -1
      fi
-@@ -533,14 +450,14 @@ if test "${with_nedge+set}" != set; then
+-    else
+-    echo "Please install hiredis package prerequisite"
+-    exit -1
+-    fi
+ ])
+ 
+ if test "${with_nedge+set}" != set; then
+@@ -565,14 +473,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)
@@ -170,7 +186,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"
-@@ -560,18 +477,18 @@ if test "${with_nedge+set}" != set; then
+@@ -592,18 +500,18 @@ if test "${with_nedge+set}" != set; then
           CXXFLAGS="${CXXFLAGS} -I/opt/pfring/include"
           echo "Using PF_RING installed in /opt/pfring"
        else
@@ -180,8 +196,8 @@
 -          echo "Using PF_RING installed in /usr/local/lib"
 +       if test -f "%%LOCALBASE%%/lib/libpfring.a"; then
 +        if test -f "%%LOCALBASE%%/lib/libpcap.a"; then
-+        LIBS="${LIBS} %%LOCALBASE%%/lib/libpfring.a"
-+        echo "Using PF_RING installed in %%LOCALBASE%%/lib"
++    	  LIBS="${LIBS} %%LOCALBASE%%/lib/libpfring.a"
++          echo "Using PF_RING installed in %%LOCALBASE%%/lib"
  	  AC_CHECK_LIB([pcap], [pcap_open_live], pcap=true)
  	  if test x$pcap = x
  	  then
@@ -195,25 +211,21 @@
  	  echo "Please make sure you have installed your PF_RING libraries and try again"
  	  exit 1
          fi
-@@ -756,14 +673,12 @@ else
-     echo "Building without support for MySQL libraries."
+@@ -784,11 +692,9 @@ else
    fi
  else
--  if test "${FREEBSD_VERSION}" != "14"; then
     dnl> FreeBSD
-    if test -f "/usr/local/lib/mysql/libmysqlclient.a"; then
+-   if test -f "/usr/local/lib/mysql/libmysqlclient.a"; then
 -     MYSQL_LIB=/usr/local/lib/mysql/libmysqlclient.a
 -     MYSQL_INC="-I /usr/local/include/mysql/"
--     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])
-    fi
--  fi
++     MYSQL_LIB="-L%%LOCALBASE%%/lib/mysql -lmysqlclient"
++     MYSQL_INC="-I%%LOCALBASE%%/include/mysql"
+      AC_DEFINE_UNQUOTED(HAVE_MYSQL, 1, [use mysql])
+-   fi
  fi
  
  AC_CHECK_LIB([expat], [XML_ParserCreate], expat=true)
-@@ -818,7 +733,7 @@ fi
+@@ -843,7 +749,7 @@ fi
    INSTALL_DIR=${ac_default_prefix}
  fi
  
diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist
index 4a588255357a..371e406881cb 100644
--- a/net/ntopng/pkg-plist
+++ b/net/ntopng/pkg-plist
@@ -3,27 +3,21 @@ bin/ntopng-geoip2update.sh
 share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/css/README.md
 %%DATADIR%%/httpdocs/css/select2.min.css
-%%DATADIR%%/httpdocs/dist/0a1b701f5563c2288281.ttf
-%%DATADIR%%/httpdocs/dist/15d98c18221c8bcb2334.ttf
-%%DATADIR%%/httpdocs/dist/2bd53024cba1f2355d53.png
-%%DATADIR%%/httpdocs/dist/3d503f89ccaf1b224aa5.woff2
-%%DATADIR%%/httpdocs/dist/4896d4b04430cc3dfb06.woff2
-%%DATADIR%%/httpdocs/dist/52eba2c567c521b8d58a.ttf
-%%DATADIR%%/httpdocs/dist/73879eafee8fd84e7c13.png
-%%DATADIR%%/httpdocs/dist/79da213423ac0def2058.ttf
-%%DATADIR%%/httpdocs/dist/8dbb811c120eea1560c8.png
+%%DATADIR%%/httpdocs/dist/2eb7b3ef25042305f3ff.ttf
+%%DATADIR%%/httpdocs/dist/45a265d0f07b31cde85f.ttf
+%%DATADIR%%/httpdocs/dist/6205fd00fb1b573e9f0f.ttf
+%%DATADIR%%/httpdocs/dist/8d3cabfc66809162fb4d.woff2
 %%DATADIR%%/httpdocs/dist/95ce97b96124cddcc6ff.png
-%%DATADIR%%/httpdocs/dist/a0d12b5793f7a819cf4a.png
+%%DATADIR%%/httpdocs/dist/adc51aab4d771ab65f81.ttf
 %%DATADIR%%/httpdocs/dist/b18a220ea3ed601ec968.png
-%%DATADIR%%/httpdocs/dist/bdacea417c235e289149.png
+%%DATADIR%%/httpdocs/dist/b3049b13a93f07e026fc.woff2
 %%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
+%%DATADIR%%/httpdocs/dist/e931bc0d14f5bbb1da22.woff2
+%%DATADIR%%/httpdocs/dist/fb8184add5a3101ad0a3.woff2
 %%DATADIR%%/httpdocs/dist/images.css
 %%DATADIR%%/httpdocs/dist/images.js
 %%DATADIR%%/httpdocs/dist/images/blank.gif
@@ -34,12 +28,6 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/dist/images/marker-icon-red.png
 %%DATADIR%%/httpdocs/dist/images/marker-icon.png
 %%DATADIR%%/httpdocs/dist/images/marker-shadow.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
@@ -52,8 +40,6 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/favicon.ico
 %%DATADIR%%/httpdocs/geoip/README.geolocation.md
 %%DATADIR%%/httpdocs/img/README.md
-%%DATADIR%%/httpdocs/inc/as_stats_id.inc
-%%DATADIR%%/httpdocs/inc/country_stats_id.inc
 %%DATADIR%%/httpdocs/inc/geolocation_disclaimer.inc
 %%DATADIR%%/httpdocs/inc/host_to_server_id.inc
 %%DATADIR%%/httpdocs/inc/host_to_server_top.inc
@@ -76,6 +62,8 @@ share/man/man8/ntopng.8.gz
 %%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/db_schema_clickhouse_old.sql
+%%DATADIR%%/httpdocs/misc/db_schema_clickhouse_unused.sql
 %%DATADIR%%/httpdocs/misc/lists/builtin/abuse_ch.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/adway.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/alienvault.list
@@ -83,9 +71,11 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/misc/lists/builtin/disconnect_me.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/dshield_7days.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/ellio.list
+%%DATADIR%%/httpdocs/misc/lists/builtin/ellio_ntop.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/ipsum.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/nocoin.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/snort.list
 %%DATADIR%%/httpdocs/misc/lists/builtin/sslbl_c2.list
@@ -118,17 +108,36 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/tables_config/alert_snmp_device.json
 %%DATADIR%%/httpdocs/tables_config/alert_system.json
 %%DATADIR%%/httpdocs/tables_config/alert_user.json
+%%DATADIR%%/httpdocs/tables_config/as_stats.json
+%%DATADIR%%/httpdocs/tables_config/blacklists.json
+%%DATADIR%%/httpdocs/tables_config/countries_stats.json
 %%DATADIR%%/httpdocs/tables_config/device_exclusions.json
+%%DATADIR%%/httpdocs/tables_config/exporters.json
+%%DATADIR%%/httpdocs/tables_config/exporters_details.json
 %%DATADIR%%/httpdocs/tables_config/flow_historical.json
 %%DATADIR%%/httpdocs/tables_config/flow_historical_aggregated.json
+%%DATADIR%%/httpdocs/tables_config/flows_list.json
+%%DATADIR%%/httpdocs/tables_config/flows_list_with_exporters.json
+%%DATADIR%%/httpdocs/tables_config/hosts_list.json
+%%DATADIR%%/httpdocs/tables_config/hosts_list_with_vlans.json
 %%DATADIR%%/httpdocs/tables_config/hosts_to_scan.json
 %%DATADIR%%/httpdocs/tables_config/inactive_hosts.json
+%%DATADIR%%/httpdocs/tables_config/network_discovery.json
 %%DATADIR%%/httpdocs/tables_config/open_ports.json
+%%DATADIR%%/httpdocs/tables_config/probes.json
 %%DATADIR%%/httpdocs/tables_config/server_ports_analysis.json
+%%DATADIR%%/httpdocs/tables_config/snmp_device_interfaces.json
+%%DATADIR%%/httpdocs/tables_config/snmp_devices.json
+%%DATADIR%%/httpdocs/tables_config/snmp_interfaces.json
+%%DATADIR%%/httpdocs/tables_config/snmp_similarity.json
+%%DATADIR%%/httpdocs/tables_config/snmp_topology.json
+%%DATADIR%%/httpdocs/tables_config/snmp_usage.json
+%%DATADIR%%/httpdocs/tables_config/vs_reports.json
 %%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/analyze_db.template
 %%DATADIR%%/httpdocs/templates/analyze_pcap.template
 %%DATADIR%%/httpdocs/templates/htmlPages/hostDetails/hosttraffic.html
 %%DATADIR%%/httpdocs/templates/htmlPages/hostDetails/listening-ports.template
@@ -256,6 +265,8 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/pages/notifications/thehive/thehive_recipient.template
 %%DATADIR%%/httpdocs/templates/pages/notifications/webhook/webhook_endpoint.template
 %%DATADIR%%/httpdocs/templates/pages/notifications/webhook/webhook_recipient.template
+%%DATADIR%%/httpdocs/templates/pages/notifications/wechat/wechat_endpoint.template
+%%DATADIR%%/httpdocs/templates/pages/notifications/wechat/wechat_recipient.template
 %%DATADIR%%/httpdocs/templates/pages/observation_points_config.template
 %%DATADIR%%/httpdocs/templates/pages/recipients_list.template
 %%DATADIR%%/httpdocs/templates/pages/sankey_vlan.template
@@ -264,6 +275,7 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/delete.template
 %%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/export.template
 %%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/inactive_interfaces_data.template
+%%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/purge.template
 %%DATADIR%%/httpdocs/templates/pages/tabs/manage_data/system_interface_data.template
 %%DATADIR%%/httpdocs/templates/pages/test_gui_widgets.template
 %%DATADIR%%/httpdocs/templates/pages/top_sites.template
@@ -280,6 +292,7 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/callbacks/5minute-delayed/interface/local_network_checks.lua
 %%DATADIR%%/scripts/callbacks/5minute/interface/timeseries.lua
 %%DATADIR%%/scripts/callbacks/5minute/system/active_monitoring.lua
+%%DATADIR%%/scripts/callbacks/5minute/system/blacklist.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
@@ -311,11 +324,11 @@ share/man/man8/ntopng.8.gz
 %%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/network_discovery.lua
 %%DATADIR%%/scripts/callbacks/minute-delayed/system/radius_accounting.lua
+%%DATADIR%%/scripts/callbacks/minute-delayed/system/radius_acct_cleanup.lua
 %%DATADIR%%/scripts/callbacks/minute/interface/timeseries.lua
 %%DATADIR%%/scripts/callbacks/minute/system/active_monitoring.lua
-%%DATADIR%%/scripts/callbacks/minute/system/dispatch_message_example.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
@@ -331,7 +344,13 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/historical/alerts/flow/contacts_by_type.json
 %%DATADIR%%/scripts/historical/alerts/flow/contacts_with_port.json
 %%DATADIR%%/scripts/historical/alerts/flow/info.json
+%%DATADIR%%/scripts/historical/alerts/flow/mitre_id.json
+%%DATADIR%%/scripts/historical/alerts/flow/mitre_tactic.json
+%%DATADIR%%/scripts/historical/alerts/flow/mitre_technique.json
 %%DATADIR%%/scripts/historical/alerts/host/host_by_type.json
+%%DATADIR%%/scripts/historical/alerts/host/mitre_id.json
+%%DATADIR%%/scripts/historical/alerts/host/mitre_tactic.json
+%%DATADIR%%/scripts/historical/alerts/host/mitre_technique.json
 %%DATADIR%%/scripts/historical/analysis/README
 %%DATADIR%%/scripts/historical/analysis/asn.json
 %%DATADIR%%/scripts/historical/analysis/flow_geomap.json
@@ -360,18 +379,23 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/historical/tables/top_sender_countries.json
 %%DATADIR%%/scripts/historical/tables/top_sender_networks.json
 %%DATADIR%%/scripts/historical/tables/top_servers.json
+%%DATADIR%%/scripts/historical/tables/top_vlans.json
 %%DATADIR%%/scripts/locales/cn.lua
 %%DATADIR%%/scripts/locales/cz.lua
 %%DATADIR%%/scripts/locales/de.lua
 %%DATADIR%%/scripts/locales/en.lua
+%%DATADIR%%/scripts/locales/es.lua
+%%DATADIR%%/scripts/locales/fr.lua
 %%DATADIR%%/scripts/locales/icmp/en.lua
 %%DATADIR%%/scripts/locales/it.lua
 %%DATADIR%%/scripts/locales/jp.lua
+%%DATADIR%%/scripts/locales/ko.lua
 %%DATADIR%%/scripts/locales/pt.lua
 %%DATADIR%%/scripts/lua/10mb.lua
 %%DATADIR%%/scripts/lua/1mb.lua
 %%DATADIR%%/scripts/lua/API.lua
 %%DATADIR%%/scripts/lua/about.lua
+%%DATADIR%%/scripts/lua/admin/blacklists.lua
 %%DATADIR%%/scripts/lua/admin/change_user_prefs.lua
 %%DATADIR%%/scripts/lua/admin/dhcp.lua
 %%DATADIR%%/scripts/lua/admin/edit_categories.lua
@@ -396,9 +420,9 @@ share/man/man8/ntopng.8.gz
 %%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/blacklists_stats.lua
 %%DATADIR%%/scripts/lua/captive_portal.lua
 %%DATADIR%%/scripts/lua/change_password.lua
 %%DATADIR%%/scripts/lua/check_recording_data.lua
@@ -425,6 +449,7 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/examples/hello_world.lua
 %%DATADIR%%/scripts/lua/examples/interface.lua
 %%DATADIR%%/scripts/lua/examples/ntop.lua
+%%DATADIR%%/scripts/lua/experiments/stats_to_mbroker.lua
 %%DATADIR%%/scripts/lua/export_data.lua
 %%DATADIR%%/scripts/lua/find_app.lua
 %%DATADIR%%/scripts/lua/find_category.lua
@@ -436,7 +461,6 @@ share/man/man8/ntopng.8.gz
 %%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
 %%DATADIR%%/scripts/lua/get_check_config.lua
 %%DATADIR%%/scripts/lua/get_checks.lua
@@ -449,7 +473,6 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/get_dhcp_config.lua
 %%DATADIR%%/scripts/lua/get_discover_progress.lua
 %%DATADIR%%/scripts/lua/get_endpoint_configs.lua
-%%DATADIR%%/scripts/lua/get_extracted_traffic.lua
 %%DATADIR%%/scripts/lua/get_flow_process_tree.lua
 %%DATADIR%%/scripts/lua/get_flows_data.lua
 %%DATADIR%%/scripts/lua/get_historical_data.lua
@@ -544,10 +567,14 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/macs_stats.lua
 %%DATADIR%%/scripts/lua/manage_data.lua
 %%DATADIR%%/scripts/lua/modules/alert.lua
+%%DATADIR%%/scripts/lua/modules/alert_categories.lua
+%%DATADIR%%/scripts/lua/modules/alert_category_utils.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_client_contact.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_blacklisted_country.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_blacklisted_server_contact.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_broadcast_non_udp_traffic.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_custom_lua_script.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_data_exfiltration.lua
@@ -617,10 +644,11 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_periodicity_changed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_rare_destination.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_local_insecure_flow.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_remote_to_remote.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tcp_connection_no_answer.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tcp_connection_refused.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tcp_flow_reset.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
 %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_tls_certificate_selfsigned.lua
@@ -637,21 +665,19 @@ share/man/man8/ntopng.8.gz
 %%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
+%%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_host_scanner.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_scan_detected.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_server_ports_contacts.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
@@ -663,10 +689,13 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_attack_mitigation_via_snmp.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_broadcast_domain_too_large.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_cidr_rule_threshold_crossed.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_cloud_disconnected.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_cloud_reconnected.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_contacts_anomaly.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_exporters_limit_exceeded.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_fail2ban_executed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_flow_flood_victim.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_gateway_unreachable.lua
@@ -690,41 +719,51 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_network_score_per_host.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_exporter_activity.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_no_if_activity.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_no_probe_activity.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_periodic_activity_not_executed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_duplexstatus_change.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_errors.lua
-%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_load_threshold_exceeded.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_mac_appeared.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_mac_changed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_port_mac_disappeared.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_profile_rule_threshold_crossed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_quota_exceeded.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_score_behavior_anomaly.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_shell_script_executed.lua
 %%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_polling_error.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_interface_threshold_crossed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_snmp_topology_changed.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_snmp_trap.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_system_error.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_traffic_behavior_anomaly.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_user_activity.lua
+%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_vlan_rule_threshold_crossed.lua
 %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_vulnerability_scan.lua
 %%DATADIR%%/scripts/lua/modules/alert_entities.lua
+%%DATADIR%%/scripts/lua/modules/alert_entities_utils.lua
+%%DATADIR%%/scripts/lua/modules/alert_entity_builders.lua
 %%DATADIR%%/scripts/lua/modules/alert_exclusions.lua
+%%DATADIR%%/scripts/lua/modules/alert_granularities.lua
 %%DATADIR%%/scripts/lua/modules/alert_keys/flow_alert_keys.lua
 %%DATADIR%%/scripts/lua/modules/alert_keys/host_alert_keys.lua
 %%DATADIR%%/scripts/lua/modules/alert_keys/other_alert_keys.lua
+%%DATADIR%%/scripts/lua/modules/alert_management.lua
 %%DATADIR%%/scripts/lua/modules/alert_roles.lua
 %%DATADIR%%/scripts/lua/modules/alert_severities.lua
+%%DATADIR%%/scripts/lua/modules/alert_severity_groups.lua
 %%DATADIR%%/scripts/lua/modules/alert_store/alert_store.lua
 %%DATADIR%%/scripts/lua/modules/alert_store/alert_store_utils.lua
 %%DATADIR%%/scripts/lua/modules/alert_store/all_alert_store.lua
@@ -741,7 +780,6 @@ share/man/man8/ntopng.8.gz
 %%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
 %%DATADIR%%/scripts/lua/modules/base64.lua
@@ -752,8 +790,9 @@ share/man/man8/ntopng.8.gz
 %%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/blacklisted_client_contact.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/blacklisted_server_contact.lua
 %%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
@@ -804,8 +843,9 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/not_purged.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/rare_destination.lua
 %%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_local_insecure_flow.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/flow/remote_to_remote.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/flow/tcp_flow_reset.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
@@ -818,17 +858,13 @@ share/man/man8/ntopng.8.gz
 %%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
-%%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/rst_scan.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/host/scan_detection.lua
@@ -839,16 +875,12 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/dropped_alerts.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/ghost_networks.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/no_if_activity.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/interface/no_probe_or_exporter_activity.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/periodic_activity_not_executed.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/interface/slow_periodic_activity.lua
-%%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/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/network_issues.lua
@@ -858,9 +890,12 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/check_definitions/syslog/nbox.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/syslog/suricata.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/system/dropped_alerts.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/system/exporters_limit_exceeded.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/system/ids_ips_log.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/system/periodic_activity_not_executed.lua
 %%DATADIR%%/scripts/lua/modules/check_definitions/system/slow_periodic_activity.lua
+%%DATADIR%%/scripts/lua/modules/check_definitions/system/system_error.lua
+%%DATADIR%%/scripts/lua/modules/check_redis_prefs.lua
 %%DATADIR%%/scripts/lua/modules/check_templates/check_template.lua
 %%DATADIR%%/scripts/lua/modules/check_templates/elephant_flows.lua
 %%DATADIR%%/scripts/lua/modules/check_templates/elephant_flows.template
@@ -883,6 +918,7 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/conf_handlers/wireless.lua
 %%DATADIR%%/scripts/lua/modules/configuration_utils.lua
 %%DATADIR%%/scripts/lua/modules/connectivity_utils.lua
+%%DATADIR%%/scripts/lua/modules/consts.lua
 %%DATADIR%%/scripts/lua/modules/continent_codes.lua
 %%DATADIR%%/scripts/lua/modules/control_groups.lua
 %%DATADIR%%/scripts/lua/modules/country_codes.lua
@@ -903,9 +939,9 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/discover_utils.lua
 %%DATADIR%%/scripts/lua/modules/dkjson.lua
 %%DATADIR%%/scripts/lua/modules/dns_utils.lua
-%%DATADIR%%/scripts/lua/modules/doa_ox.lua
 %%DATADIR%%/scripts/lua/modules/dscp_consts.lua
 %%DATADIR%%/scripts/lua/modules/ebpf_utils.lua
+%%DATADIR%%/scripts/lua/modules/field_units.lua
 %%DATADIR%%/scripts/lua/modules/file_utils.lua
 %%DATADIR%%/scripts/lua/modules/fingerprint_utils.lua
 %%DATADIR%%/scripts/lua/modules/flow_consts.lua
@@ -918,9 +954,11 @@ share/man/man8/ntopng.8.gz
 %%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/gui_utils.lua
 %%DATADIR%%/scripts/lua/modules/historical_flow_details_formatter.lua
 %%DATADIR%%/scripts/lua/modules/historical_flow_utils.lua
 %%DATADIR%%/scripts/lua/modules/host_pools_nedge.lua
+%%DATADIR%%/scripts/lua/modules/host_utils.lua
 %%DATADIR%%/scripts/lua/modules/http_bridge_conf_utils.lua
 %%DATADIR%%/scripts/lua/modules/http_lint.lua
 %%DATADIR%%/scripts/lua/modules/http_utils.lua
@@ -944,6 +982,8 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/internals_utils.lua
 %%DATADIR%%/scripts/lua/modules/ipv4_utils.lua
 %%DATADIR%%/scripts/lua/modules/json.lua
+%%DATADIR%%/scripts/lua/modules/l4_protocol_list.lua
+%%DATADIR%%/scripts/lua/modules/label_utils.lua
 %%DATADIR%%/scripts/lua/modules/liluat.lua
 %%DATADIR%%/scripts/lua/modules/lists_utils.lua
 %%DATADIR%%/scripts/lua/modules/live_traffic_utils.lua
@@ -961,7 +1001,9 @@ share/man/man8/ntopng.8.gz
 %%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/mitre_utils.lua
+%%DATADIR%%/scripts/lua/modules/network_consts.lua
+%%DATADIR%%/scripts/lua/modules/network_formatter.lua
 %%DATADIR%%/scripts/lua/modules/new_devices.lua
 %%DATADIR%%/scripts/lua/modules/notifications/endpoints.lua
 %%DATADIR%%/scripts/lua/modules/notifications/endpoints/alert_store_db.lua
@@ -993,6 +1035,7 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/prefs_reload_utils.lua
 %%DATADIR%%/scripts/lua/modules/prefs_utils.lua
 %%DATADIR%%/scripts/lua/modules/presets_utils.lua
+%%DATADIR%%/scripts/lua/modules/profiling.lua
 %%DATADIR%%/scripts/lua/modules/protos_utils.lua
 %%DATADIR%%/scripts/lua/modules/radius_handler.lua
 %%DATADIR%%/scripts/lua/modules/recording_utils.lua
@@ -1006,10 +1049,12 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/rrd_utils.lua
 %%DATADIR%%/scripts/lua/modules/script_manager.lua
 %%DATADIR%%/scripts/lua/modules/scripts_triggers.lua
+%%DATADIR%%/scripts/lua/modules/smcroute_service_utils.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/string_utils.lua
 %%DATADIR%%/scripts/lua/modules/sys_utils.lua
 %%DATADIR%%/scripts/lua/modules/syslog_utils.lua
 %%DATADIR%%/scripts/lua/modules/system_config/appliance_config.lua
@@ -1041,7 +1086,6 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/timeseries/tests/utils_test.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/ts_common.lua
 %%DATADIR%%/scripts/lua/modules/timeseries/ts_data.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
@@ -1060,11 +1104,14 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/modules/ui_utils.lua
 %%DATADIR%%/scripts/lua/modules/vlan_utils.lua
 %%DATADIR%%/scripts/lua/modules/voip_utils.lua
+%%DATADIR%%/scripts/lua/modules/vs_db_utils.lua
 %%DATADIR%%/scripts/lua/modules/vulnerability_scan/cve_utils.lua
 %%DATADIR%%/scripts/lua/modules/vulnerability_scan/modules/cve.lua
+%%DATADIR%%/scripts/lua/modules/vulnerability_scan/modules/ipv4_netscan.lua
 %%DATADIR%%/scripts/lua/modules/vulnerability_scan/modules/tcp_portscan.lua
 %%DATADIR%%/scripts/lua/modules/vulnerability_scan/modules/udp_portscan.lua
 %%DATADIR%%/scripts/lua/modules/vulnerability_scan/modules/vulners.lua
+%%DATADIR%%/scripts/lua/modules/vulnerability_scan/vs_rest_utils.lua
 %%DATADIR%%/scripts/lua/modules/vulnerability_scan/vs_utils.lua
 %%DATADIR%%/scripts/lua/modules/widget_gui_utils.lua
 %%DATADIR%%/scripts/lua/modules/widgets_utils.lua
@@ -1230,6 +1277,7 @@ share/man/man8/ntopng.8.gz
 %%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/create/pcap/extraction/task.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/all/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/am_host/alerts.lua
 %%DATADIR%%/scripts/lua/rest/v2/delete/application/application.lua
@@ -1256,6 +1304,7 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/edit/ntopng/incr_flows.lua
 %%DATADIR%%/scripts/lua/rest/v2/edit/ntopng/incr_hosts.lua
 %%DATADIR%%/scripts/lua/rest/v2/edit/ntopng/user.lua
+%%DATADIR%%/scripts/lua/rest/v2/edit/system/edit_blacklist.lua
 %%DATADIR%%/scripts/lua/rest/v2/enable/check.lua
 %%DATADIR%%/scripts/lua/rest/v2/exec/host/schedule_vulnerability_scan.lua
 %%DATADIR%%/scripts/lua/rest/v2/export/active_monitoring/config.lua
@@ -1266,6 +1315,7 @@ share/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/%%NTOPNGUSER%%/applications.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/%%NTOPNGUSER%%/get_preferences.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
@@ -1280,6 +1330,7 @@ share/man/man8/ntopng.8.gz
 %%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/asn/get_as_data.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
@@ -1287,10 +1338,12 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/get/dashboard/template/list.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/active_list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/aggregated_live_flows.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/aggregated_live_flows_filters.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/flow_filters.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/graph.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/l4/counters.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/flow/l7/counters.lua
@@ -1298,13 +1351,16 @@ share/man/man8/ntopng.8.gz
 %%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/active_list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/alert/list.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/alert/ts.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/custom_data.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/data.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/dscp/stats.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/find.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/fingerprint/data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/host_filters.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/inactive/active_inactive.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/inactive/inactive_manufacturer.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/host/inactive/inactivity_period.lua
@@ -1322,6 +1378,7 @@ share/man/man8/ntopng.8.gz
 %%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/no_tx_peers.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/host/open_ports.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
@@ -1362,6 +1419,8 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/get/network/networks.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/ntopng/interfaces.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/ntopng/users.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/pcap/extraction/data.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/pcap/extraction/tasks.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/pools.lua
@@ -1371,12 +1430,18 @@ share/man/man8/ntopng.8.gz
 %%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/blacklists/blacklists.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/blacklists/blacklists_filters.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/blacklists/update_blacklist.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/system/configurations/download_backup.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/system/configurations/list_available_backups.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/health/flow_collection.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/system/logs.lua
+%%DATADIR%%/scripts/lua/rest/v2/get/system/status.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/tables/user_columns_config.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/timeseries/date_format.lua
 %%DATADIR%%/scripts/lua/rest/v2/get/timeseries/ts.lua
@@ -1396,13 +1461,19 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/rest/v2/reset/checks/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/reset/infrastructure/config.lua
 %%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/config.lua
+%%DATADIR%%/scripts/lua/rest/v2/set/device/alias.lua
 %%DATADIR%%/scripts/lua/rest/v2/set/host/alias.lua
+%%DATADIR%%/scripts/lua/rest/v2/set/host/config.lua
 %%DATADIR%%/scripts/lua/rest/v2/set/host/notes.lua
+%%DATADIR%%/scripts/lua/rest/v2/set/interface/alias.lua
+%%DATADIR%%/scripts/lua/rest/v2/set/network/alias.lua
 %%DATADIR%%/scripts/lua/rest/v2/set/pool/members.lua
 %%DATADIR%%/scripts/lua/rest/v2/trigger/host/alert.lua
 %%DATADIR%%/scripts/lua/rest/version.lua
+%%DATADIR%%/scripts/lua/sankey_test.lua
 %%DATADIR%%/scripts/lua/self_test.lua
 %%DATADIR%%/scripts/lua/show_geolocation_note.lua
 %%DATADIR%%/scripts/lua/sidebar-handler.lua
@@ -1420,8 +1491,6 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/lua/system_stats.lua
 %%DATADIR%%/scripts/lua/system_stats_data.lua
 %%DATADIR%%/scripts/lua/toggle_all_checks.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
@@ -1439,6 +1508,10 @@ share/man/man8/ntopng.8.gz
 %%DATADIR%%/scripts/templates/dashboard/nedge.json
 %%DATADIR%%/scripts/templates/dashboard/pro.json
 %%DATADIR%%/scripts/templates/report/default.json
+%%DATADIR%%/scripts/templates/report/flow_exporters.json
+%%DATADIR%%/scripts/templates/report/networks.json
+%%DATADIR%%/scripts/templates/report/security.json
 %%DATADIR%%/scripts/templates/report/vs_result.json
+%%DATADIR%%/scripts/templates/widgets.json
 @dir %%DATADIR%%/httpdocs/dist
 @dir(%%NTOPNGUSER%%,%%NTOPNGGROUP%%,750) /var/db/ntopng



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408170924.47H9OjRU094400>