VE_CLICKHOUSE@ +-CLICKHOUSE_HOME= +-CLICKHOUSE_INC= +-CLICKHOUSE_LIB= +-CLICKHOUSE_DEP_LIBS= +-ifeq ($(HAVE_CLICKHOUSE),1) +-CLICKHOUSE_HOME=@CLICKHOUSE_HOME@ +-CLICKHOUSE_INC=-I$(CLICKHOUSE_HOME) -I$(CLICKHOUSE_HOME)/contrib/absl +-CLICKHOUSE_LIB=$(CLICKHOUSE_HOME)/build/clickhouse/libclickhouse-cpp-lib.a +-CLICKHOUSE_DEP_LIBS=$(CLICKHOUSE_HOME)/build/contrib/cityhash/cityhash/libcityhash.a $(CLICKHOUSE_HOME)/build/contrib/lz4/lz4/liblz4.a +-endif ++HAVE_CLICKHOUSE=1 ++CLICKHOUSE_HOME=$(LOCALBASE) ++CLICKHOUSE_INC=-I$(CLICKHOUSE_HOME) ++CLICKHOUSE_LIB=$(CLICKHOUSE_HOME)/lib/libclickhouse-cpp-lib.a ++CLICKHOUSE_DEP_LIBS=$(CLICKHOUSE_HOME)/lib/libcityhash.a + + ifeq ($(OS),Linux) + LUA_PLATFORM=linux +@@ -52,7 +46,8 @@ else ifeq ($(OS), $(filter $(OS), FreeBSD)) LUA_PLATFORM=macosx else ifeq ($(OS), $(filter $(OS), FreeBSD)) LUA_PLATFORM=freebsd @@ -9,8 +32,8 @@ + LUA_LIB=-llua-5.4 endif - -@@ -77,11 +78,7 @@ ifeq ($(HAS_ZSTD), 0) + ###### +@@ -88,11 +83,7 @@ ifeq ($(HAS_ZSTD), 0) HAS_ZSTD=$(shell $(PKG_CONFIG) --exists libzstd && echo 0) ifeq ($(HAS_ZSTD), 0) @@ -23,12 +46,12 @@ endif ###### -@@ -102,7 +99,7 @@ RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVIS +@@ -113,7 +104,7 @@ RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVIS RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm ###### -LIB_TARGETS = $(LUA_LIB) -+# LIB_TARGETS = $(LUA_LIB) ++#LIB_TARGETS = $(LUA_LIB) - ifneq ($(HAS_ZEROMQ), 0) - LIB_TARGETS += $(ZEROMQ_LIB) + ifeq ($(HAVE_CLICKHOUSE),1) + LIB_TARGETS += $(CLICKHOUSE_LIB) diff --git a/net/ntopng/files/patch-autogen.sh b/net/ntopng/files/patch-autogen.sh index 53069bef9f95..bcc5367bb9d6 100644 --- a/net/ntopng/files/patch-autogen.sh +++ b/net/ntopng/files/patch-autogen.sh @@ -1,4 +1,4 @@ ---- autogen.sh.orig 2022-07-19 08:13:10 UTC +--- autogen.sh.orig 2025-12-28 10:02:12 UTC +++ autogen.sh @@ -8,31 +8,6 @@ PKG_CONFIG=$(command -v pkg-config) AUTORECONF=$(command -v autoreconf) @@ -32,7 +32,7 @@ ########################################## TODAY=`date +%y%m%d` -@@ -74,13 +49,3 @@ rm -f config.h config.h.in *~ #* +@@ -74,20 +49,3 @@ rm -f config.h config.h.in *~ #* > configure.ac rm -f config.h config.h.in *~ #* @@ -40,6 +40,13 @@ -git submodule init -git submodule update --remote - +-if test -d "pro"; then +-N=`grep __FreeBSD__ third-party/clickhouse-cpp/clickhouse/base/platform.h|wc -l|tr -d "[[:space:]]"` +-if test "${N}" = "0"; then +- cd third-party/clickhouse-cpp/; cat ../../clickhouse/clickhouse-cpp.diff | patch -p1 ; cd ../.. +-fi +-fi +- -# git submodule update --init --recursive - -echo "Wait please..." diff --git a/net/ntopng/files/patch-configure.ac.in b/net/ntopng/files/patch-configure.ac.in index aabc41845f90..003629403ac4 100644 --- a/net/ntopng/files/patch-configure.ac.in +++ b/net/ntopng/files/patch-configure.ac.in @@ -1,10 +1,14 @@ ---- configure.ac.in.orig 2025-04-29 17:01:16 UTC +--- configure.ac.in.orig 2025-12-28 10:02:12 UTC +++ configure.ac.in -@@ -153,40 +153,8 @@ LIBPCAP=-lpcap +@@ -153,44 +153,11 @@ CFLAGS="${CFLAGS} -Wall" + AC_ARG_WITH(nedge, [ --with-test-mode Enable ntopng/nEdge test mode]) + + CFLAGS="${CFLAGS} -Wall" +-OS="" ++OS=`uname -or | cut -d '-' -f 1` MAKE=make BIN_PATH=/usr/bin LIBPCAP=-lpcap -+OS=`uname -or | cut -d '-' -f 1` -if test $SYSTEM = "FreeBSD" || test $SYSTEM = "Darwin"; then - CFLAGS="${CFLAGS} -I/usr/local/include" @@ -42,7 +46,7 @@ dnl> Remove spaces OS="${OS#"${OS%%[![:space:]]*}"}" -@@ -233,24 +201,6 @@ fi +@@ -237,24 +204,6 @@ fi LIBS="${LIBS} -lnetfilter_queue -lnfnetlink -lnetfilter_conntrack" fi @@ -67,39 +71,32 @@ 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" - ]) +@@ -321,10 +270,6 @@ fi + echo "WARNING: /usr/local/include/ndpi is present and might lead to compile errors" + fi --if test -d /usr/local/include/ndpi ; then : -- echo "WARNING: /usr/local/include/ndpi is present and might lead to compile errors" --fi -- -NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` -NDPI_LIB= -NDPI_LIB_DEP= - --AC_MSG_CHECKING(for nDPI source) + AS_VAR_IF(with_dynamic_ndpi, no, [ + AC_MSG_CHECKING(for nDPI source) + if test -d "./nDPI" ; then : +@@ -354,8 +299,11 @@ AS_VAR_IF(with_dynamic_ndpi, yes, [ + ]) + + AS_VAR_IF(with_dynamic_ndpi, yes, [ +- NDPI_LIB="-lndpi" +- NDPI_LIB_DEP=$NDPI_LIB +PKG_CHECK_MODULES([NDPI], [libndpi >= 2.0], [ + NDPI_INC=`echo $NDPI_CFLAGS | sed -e "s/[ ]*$//"` + NDPI_LIB="$NDPI_LIBS" + NDPI_LIB_DEP= -+ ], [ -+ AC_MSG_CHECKING(for nDPI source) - if test -d "./nDPI" ; then : - NDPI_HOME=./nDPI - elif test -d "../nDPI" ; then : -@@ -346,8 +293,8 @@ AC_MSG_CHECKING(for nDPI source) - else - AC_MSG_RESULT(not found) - fi -+ ]) ++], []) + ]) -- if test ! -z "$NDPI_CUST_INC" ; then : - NDPI_INC=$NDPI_CUST_INC - fi -@@ -370,44 +317,10 @@ AC_ARG_WITH(json-c-static, +@@ -380,44 +328,10 @@ AC_ARG_WITH(json-c-static, [PKG_CHECK_MODULES(JSON, json-c, [], [AC_MSG_ERROR(Please install libjson-c-dev package prerequisite)])] ) @@ -147,7 +144,16 @@ AC_MSG_CHECKING([PF_RING nBPF]) NBPF_HOME=${PWD}/../PF_RING/userland/nbpf LIBNBPF=${NBPF_HOME}/libnbpf.a -@@ -544,16 +457,11 @@ AS_VAR_IF(with_hiredis, yes, [ +@@ -494,7 +408,7 @@ fi + if test -d ${TMP_CLICKHOUSE_HOME}; then + CLICKHOUSE_HOME=${TMP_CLICKHOUSE_HOME} + fi +-echo "Using clickhouse-cpp stored at ${CLICKHOUSE_HOME}" ++# echo "Using clickhouse-cpp stored at ${CLICKHOUSE_HOME}" + + dnl> fi dnl> test $SYSTEM = "Linux" + +@@ -575,16 +489,11 @@ AS_VAR_IF(with_hiredis, yes, [ else pkg-config --exists hiredis if test "$?" -ne 1; then @@ -166,13 +172,13 @@ + exit -1 fi fi - ]) -@@ -570,14 +478,14 @@ if test "${with_nedge+set}" != set; then + +@@ -604,14 +513,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) @@ -180,11 +186,11 @@ fi - if test -f "/usr/local/lib/libpfring.a" || test -f "/opt/pfring/lib/libpfring.a" || test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then -+ if test -f "%%LOCALBASE%%/lib/libpfring.a" || test -f "/opt/pfring/lib/libpfring.a" || test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then ++if test -f "%%LOCALBASE%%/lib/libpfring.a" || test -f "/opt/pfring/lib/libpfring.a" || test -f "${PF_RING_HOME}/userland/lib/libpfring.a"; then 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" -@@ -597,18 +505,18 @@ if test "${with_nedge+set}" != set; then +@@ -631,18 +540,18 @@ if test "${with_nedge+set}" != set; then CXXFLAGS="${CXXFLAGS} -I/opt/pfring/include" echo "Using PF_RING installed in /opt/pfring" else @@ -209,21 +215,7 @@ echo "Please make sure you have installed your PF_RING libraries and try again" exit 1 fi -@@ -789,11 +697,9 @@ else - fi - else - dnl> FreeBSD -- 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/" -+ 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) -@@ -848,7 +754,7 @@ fi +@@ -841,7 +750,7 @@ fi INSTALL_DIR=${ac_default_prefix} fi diff --git a/net/ntopng/pkg-plist b/net/ntopng/pkg-plist index 2cd6970e258e..48f0e1c4b794 100644 --- a/net/ntopng/pkg-plist +++ b/net/ntopng/pkg-plist @@ -3,6 +3,7 @@ bin/ntopng-geoip2update.sh share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/css/README.md %%DATADIR%%/httpdocs/css/select2.min.css +%%DATADIR%%/httpdocs/dist/ntopng.css.map %%DATADIR%%/httpdocs/dist/1815e00441357e01619e.ttf %%DATADIR%%/httpdocs/dist/2463b90d9a316e4e5294.woff2 %%DATADIR%%/httpdocs/dist/2582b0e4bcf85eceead0.ttf @@ -16,10 +17,12 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/dist/d68ae9f02541036a991d.png %%DATADIR%%/httpdocs/dist/da94ef451f4969af06e6.ttf %%DATADIR%%/httpdocs/dist/dark-mode.css +%%DATADIR%%/httpdocs/dist/dark-mode.css.map %%DATADIR%%/httpdocs/dist/dark-mode.js %%DATADIR%%/httpdocs/dist/ea8f94e1d22e0d35ccd4.woff2 %%DATADIR%%/httpdocs/dist/images.css %%DATADIR%%/httpdocs/dist/images.js +%%DATADIR%%/httpdocs/dist/images.js.map %%DATADIR%%/httpdocs/dist/images/blank.gif %%DATADIR%%/httpdocs/dist/images/flags.png %%DATADIR%%/httpdocs/dist/images/layers-2x.png @@ -30,12 +33,16 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/dist/images/marker-shadow.png %%DATADIR%%/httpdocs/dist/images/virustotal.svg %%DATADIR%%/httpdocs/dist/login.js +%%DATADIR%%/httpdocs/dist/login.js.map %%DATADIR%%/httpdocs/dist/ntopng.css %%DATADIR%%/httpdocs/dist/ntopng.js %%DATADIR%%/httpdocs/dist/third-party.css +%%DATADIR%%/httpdocs/dist/third-party.css.map %%DATADIR%%/httpdocs/dist/third-party.js %%DATADIR%%/httpdocs/dist/third-party.js.LICENSE.txt +%%DATADIR%%/httpdocs/dist/third-party.js.map %%DATADIR%%/httpdocs/dist/white-mode.css +%%DATADIR%%/httpdocs/dist/white-mode.css.map %%DATADIR%%/httpdocs/dist/white-mode.js %%DATADIR%%/httpdocs/favicon.ico %%DATADIR%%/httpdocs/geoip/README.geolocation.md @@ -44,14 +51,12 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/inc/host_to_server_id.inc %%DATADIR%%/httpdocs/inc/host_to_server_top.inc %%DATADIR%%/httpdocs/inc/hosts_stats_id.inc -%%DATADIR%%/httpdocs/inc/http_servers_stats_id.inc %%DATADIR%%/httpdocs/inc/index_TopASNs.inc %%DATADIR%%/httpdocs/inc/index_TopApplications.inc %%DATADIR%%/httpdocs/inc/index_TopFlowSenders.inc %%DATADIR%%/httpdocs/inc/index_TopHosts.inc %%DATADIR%%/httpdocs/inc/index_TopPorts.inc %%DATADIR%%/httpdocs/inc/mac_stats_id.inc -%%DATADIR%%/httpdocs/inc/network_stats_id.inc %%DATADIR%%/httpdocs/inc/os_stats_id.inc %%DATADIR%%/httpdocs/inc/pool_stats_id.inc %%DATADIR%%/httpdocs/inc/processes_stats_id.inc @@ -60,6 +65,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/inc/vlan_stats_id.inc %%DATADIR%%/httpdocs/misc/alert_store_schema.sql %%DATADIR%%/httpdocs/misc/alert_view_store_schema.sql +%%DATADIR%%/httpdocs/misc/db_schema_as_sqlite.sql %%DATADIR%%/httpdocs/misc/db_schema_clickhouse.sql %%DATADIR%%/httpdocs/misc/db_schema_clickhouse_cluster.sql %%DATADIR%%/httpdocs/misc/lists/builtin/abuse_ch.list @@ -99,6 +105,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/tables_config/aggregated_live_flows.json %%DATADIR%%/httpdocs/tables_config/alert_all.json %%DATADIR%%/httpdocs/tables_config/alert_am_host.json +%%DATADIR%%/httpdocs/tables_config/alert_as.json %%DATADIR%%/httpdocs/tables_config/alert_flow.json %%DATADIR%%/httpdocs/tables_config/alert_host.json %%DATADIR%%/httpdocs/tables_config/alert_interface.json @@ -107,14 +114,19 @@ 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/all_exporters_interfaces.json %%DATADIR%%/httpdocs/tables_config/as_stats.json +%%DATADIR%%/httpdocs/tables_config/as_stats_ixp_mode.json %%DATADIR%%/httpdocs/tables_config/assets.json +%%DATADIR%%/httpdocs/tables_config/assets_snmp.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/dhcp_leases.json +%%DATADIR%%/httpdocs/tables_config/exporter_interfaces.json %%DATADIR%%/httpdocs/tables_config/exporters.json -%%DATADIR%%/httpdocs/tables_config/exporters_details.json -%%DATADIR%%/httpdocs/tables_config/exporters_interfaces.json +%%DATADIR%%/httpdocs/tables_config/exporters_interfaces_stats.json +%%DATADIR%%/httpdocs/tables_config/exporters_interfaces_stats_ixp_mode.json %%DATADIR%%/httpdocs/tables_config/flow_exporters_list.json %%DATADIR%%/httpdocs/tables_config/flow_historical.json %%DATADIR%%/httpdocs/tables_config/flow_historical_aggregated.json @@ -123,14 +135,24 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/tables_config/flows_list_enterprise_l.json %%DATADIR%%/httpdocs/tables_config/flows_list_with_exporters.json %%DATADIR%%/httpdocs/tables_config/flows_list_with_exporters_enterprise_l.json +%%DATADIR%%/httpdocs/tables_config/flows_list_with_exporters_enterprise_l_ixp_mode.json +%%DATADIR%%/httpdocs/tables_config/host_pools.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/ingress_egress_as_stats.json %%DATADIR%%/httpdocs/tables_config/limits_table.json %%DATADIR%%/httpdocs/tables_config/local_hosts_report.json +%%DATADIR%%/httpdocs/tables_config/macs_list.json +%%DATADIR%%/httpdocs/tables_config/manage_host_pool.json +%%DATADIR%%/httpdocs/tables_config/nedge_hosts_list.json +%%DATADIR%%/httpdocs/tables_config/nedge_hosts_list_with_vlans.json +%%DATADIR%%/httpdocs/tables_config/nedge_macs_list.json %%DATADIR%%/httpdocs/tables_config/network_discovery.json +%%DATADIR%%/httpdocs/tables_config/networks_list.json %%DATADIR%%/httpdocs/tables_config/observation_points.json %%DATADIR%%/httpdocs/tables_config/open_ports.json +%%DATADIR%%/httpdocs/tables_config/probe_exporters_interfaces.json %%DATADIR%%/httpdocs/tables_config/probes.json %%DATADIR%%/httpdocs/tables_config/redis_stats.json %%DATADIR%%/httpdocs/tables_config/server_ports.json @@ -141,11 +163,16 @@ share/man/man8/ntopng.8.gz %%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/table_exporter_as_stats.json %%DATADIR%%/httpdocs/tables_config/top_interface_applications.json %%DATADIR%%/httpdocs/tables_config/top_interface_categories.json +%%DATADIR%%/httpdocs/tables_config/traffic_between_ases.json +%%DATADIR%%/httpdocs/tables_config/traffic_profiles.json +%%DATADIR%%/httpdocs/tables_config/user_traffic_breakdown.json %%DATADIR%%/httpdocs/tables_config/vs_reports.json %%DATADIR%%/httpdocs/templates/analyze_db.template %%DATADIR%%/httpdocs/templates/analyze_pcap.template +%%DATADIR%%/httpdocs/templates/dropdown_snmp_type.html %%DATADIR%%/httpdocs/templates/htmlPages/hostDetails/hosttraffic.html %%DATADIR%%/httpdocs/templates/htmlPages/hostDetails/listening-ports.template %%DATADIR%%/httpdocs/templates/import_modal.html @@ -213,7 +240,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/httpdocs/templates/pages/manage_configurations.template %%DATADIR%%/httpdocs/templates/pages/manage_configurations_backup.template %%DATADIR%%/httpdocs/templates/pages/manage_data.template -%%DATADIR%%/httpdocs/templates/pages/manage_host_members.template %%DATADIR%%/httpdocs/templates/pages/modals/alerts/acknowledge_alert.template %%DATADIR%%/httpdocs/templates/pages/modals/alerts/acknowledge_alerts.template %%DATADIR%%/httpdocs/templates/pages/modals/alerts/delete_alert_exclusion_modal.template @@ -272,7 +298,6 @@ share/man/man8/ntopng.8.gz %%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 %%DATADIR%%/httpdocs/templates/pages/server_ports.template %%DATADIR%%/httpdocs/templates/pages/simple_widgets_list.template %%DATADIR%%/httpdocs/templates/pages/table_pools.template @@ -283,6 +308,7 @@ share/man/man8/ntopng.8.gz %%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 +%%DATADIR%%/httpdocs/templates/pages/ts_overview.template %%DATADIR%%/httpdocs/templates/pages/vue_page.template %%DATADIR%%/httpdocs/templates/prefs_search.template %%DATADIR%%/httpdocs/templates/traffic_extraction_dialog.html @@ -315,7 +341,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/callbacks/daily-delayed/interface/timeseries_retention.lua %%DATADIR%%/scripts/callbacks/daily-delayed/system/backup_configurations.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/daily/system/reset_blacklists.lua @@ -437,7 +462,8 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/admin/validate_new_user.lua %%DATADIR%%/scripts/lua/alert_details.lua %%DATADIR%%/scripts/lua/alert_stats.lua -%%DATADIR%%/scripts/lua/analyze_pcap.lua +%%DATADIR%%/scripts/lua/alerts_geomap.lua +%%DATADIR%%/scripts/lua/as_overview.lua %%DATADIR%%/scripts/lua/as_stats.lua %%DATADIR%%/scripts/lua/authorize_captive.lua %%DATADIR%%/scripts/lua/blacklists_stats.lua @@ -499,7 +525,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_hosts_data.lua %%DATADIR%%/scripts/lua/get_hosts_stats.lua %%DATADIR%%/scripts/lua/get_http_hosts.lua -%%DATADIR%%/scripts/lua/get_http_hosts_data.lua %%DATADIR%%/scripts/lua/get_icmp_data.lua %%DATADIR%%/scripts/lua/get_internals_checks_stats.lua %%DATADIR%%/scripts/lua/get_internals_hash_tables_stats.lua @@ -507,8 +532,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_internals_queues_stats.lua %%DATADIR%%/scripts/lua/get_macs_data.lua %%DATADIR%%/scripts/lua/get_macs_stats.lua -%%DATADIR%%/scripts/lua/get_network_data.lua -%%DATADIR%%/scripts/lua/get_networks_data.lua %%DATADIR%%/scripts/lua/get_os_data.lua %%DATADIR%%/scripts/lua/get_pods_data.lua %%DATADIR%%/scripts/lua/get_pool_data.lua @@ -518,7 +541,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/get_recipients_endpoint.lua %%DATADIR%%/scripts/lua/get_system_interfaces_stats.lua %%DATADIR%%/scripts/lua/get_timeseries_list.lua -%%DATADIR%%/scripts/lua/get_top_talkers.lua %%DATADIR%%/scripts/lua/get_treemap.lua %%DATADIR%%/scripts/lua/get_unknown_devices_data.lua %%DATADIR%%/scripts/lua/get_username_data.lua @@ -538,7 +560,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/hosts_geomap.lua %%DATADIR%%/scripts/lua/hosts_stats.lua %%DATADIR%%/scripts/lua/hotspot-detect.lua -%%DATADIR%%/scripts/lua/http_servers_stats.lua %%DATADIR%%/scripts/lua/http_status_code.lua %%DATADIR%%/scripts/lua/if_pkt_distro.lua %%DATADIR%%/scripts/lua/if_stats.lua @@ -550,7 +571,6 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/inc/add_user_dialog.lua %%DATADIR%%/scripts/lua/inc/container_columns.lua %%DATADIR%%/scripts/lua/inc/delete_user_dialog.lua -%%DATADIR%%/scripts/lua/inc/ebpf_flows_stats.lua %%DATADIR%%/scripts/lua/inc/edit_categories.lua %%DATADIR%%/scripts/lua/inc/edit_ndpi_applications.lua %%DATADIR%%/scripts/lua/inc/edit_presets.lua @@ -629,6 +649,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malicious_fingerprint.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malicious_sha1_certificate.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_malware_host_contacted.lua +%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_mismatching_protocol_with_ip.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_numeric_ip_host.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_periodic_flow.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_possible_exploit.lua @@ -649,10 +670,12 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_suspicious_extension.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_tls_uncommon_alpn.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unidirectional_traffic.lua +%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unresolved_hostname.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_unsafe_protocol.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_rce_injection.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_sql_injection.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_ndpi_url_possible_xss.lua +%%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_nedge_policy_violation.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_packets_issues.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_periodicity_changed.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/flow/alert_qoe_degraded.lua @@ -661,7 +684,6 @@ share/man/man8/ntopng.8.gz %%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 @@ -700,6 +722,8 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/alert_definitions/host/host_alert_unexpected_gateway.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_acl_violation_arp.lua %%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_am_threshold_cross.lua +%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_as_ranking_changed.lua +%%DATADIR%%/scripts/lua/modules/alert_definitions/other/alert_asn_rule_threshold_crossed.lua %%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 @@ -782,6 +806,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/alert_store/alert_store_utils.lua %%DATADIR%%/scripts/lua/modules/alert_store/all_alert_store.lua %%DATADIR%%/scripts/lua/modules/alert_store/am_alert_store.lua +%%DATADIR%%/scripts/lua/modules/alert_store/as_alert_store.lua %%DATADIR%%/scripts/lua/modules/alert_store/flow_alert_store.lua %%DATADIR%%/scripts/lua/modules/alert_store/host_alert_store.lua %%DATADIR%%/scripts/lua/modules/alert_store/interface_alert_store.lua @@ -794,14 +819,17 @@ 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 %%DATADIR%%/scripts/lua/modules/behavior_utils.lua %%DATADIR%%/scripts/lua/modules/blog_utils.lua +%%DATADIR%%/scripts/lua/modules/cache_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/as/PLACEHOLDER %%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 @@ -923,8 +951,11 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/classes.lua %%DATADIR%%/scripts/lua/modules/code_editor.lua %%DATADIR%%/scripts/lua/modules/companion_interface_utils.lua +%%DATADIR%%/scripts/lua/modules/conf_handlers/isc_dhcp_server.lua +%%DATADIR%%/scripts/lua/modules/conf_handlers/kea_dhcp_server.lua %%DATADIR%%/scripts/lua/modules/conf_handlers/netplan.lua %%DATADIR%%/scripts/lua/modules/conf_handlers/network_ifaces.lua +%%DATADIR%%/scripts/lua/modules/conf_handlers/smcroute.lua %%DATADIR%%/scripts/lua/modules/conf_handlers/wireless.lua %%DATADIR%%/scripts/lua/modules/configuration_utils.lua %%DATADIR%%/scripts/lua/modules/connectivity_utils.lua @@ -932,6 +963,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/continent_codes.lua %%DATADIR%%/scripts/lua/modules/control_groups.lua %%DATADIR%%/scripts/lua/modules/country_codes.lua +%%DATADIR%%/scripts/lua/modules/country_keys.lua %%DATADIR%%/scripts/lua/modules/country_utils.lua %%DATADIR%%/scripts/lua/modules/cpu_utils.lua %%DATADIR%%/scripts/lua/modules/custom_column_utils.lua @@ -944,22 +976,28 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/modules/datatable_utils.lua %%DATADIR%%/scripts/lua/modules/db_utils.lua %%DATADIR%%/scripts/lua/modules/delete_data_utils.lua -%%DATADIR%%/scripts/lua/modules/dhcp_service_utils.lua +%%DATADIR%%/scripts/lua/modules/dhcp_server_utils.lua %%DATADIR%%/scripts/lua/modules/dhcp_utils.lua %%DATADIR%%/scripts/lua/modules/discover_utils.lua %%DATADIR%%/scripts/lua/modules/dkjson.lua %%DATADIR%%/scripts/lua/modules/dns_utils.lua %%DATADIR%%/scripts/lua/modules/dscp_consts.lua %%DATADIR%%/scripts/lua/modules/ebpf_utils.lua +%%DATADIR%%/scripts/lua/modules/exporters_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 +%%DATADIR%%/scripts/lua/modules/flow_data.lua +%%DATADIR%%/scripts/lua/modules/flow_data_historical.lua +%%DATADIR%%/scripts/lua/modules/flow_data_preset.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_pie.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_sankey.lua %%DATADIR%%/scripts/lua/modules/flow_utils.lua %%DATADIR%%/scripts/lua/modules/format_utils.lua %%DATADIR%%/scripts/lua/modules/graph_common.lua @@ -967,6 +1005,7 @@ share/man/man8/ntopng.8.gz %%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/historical_format_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 @@ -1058,7 +1097,6 @@ 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 @@ -1146,11 +1184,13 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/rest/v2/acknowledge/system/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/acknowledge/user/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/add/host/pool.lua +%%DATADIR%%/scripts/lua/rest/v2/add/host/pool_member.lua %%DATADIR%%/scripts/lua/rest/v2/add/host/to_scan.lua %%DATADIR%%/scripts/lua/rest/v2/add/ntopng/analyze_pcap.lua %%DATADIR%%/scripts/lua/rest/v2/add/ntopng/user.lua %%DATADIR%%/scripts/lua/rest/v2/add/tables/user_columns_config.lua %%DATADIR%%/scripts/lua/rest/v2/bind/host/pool/member.lua +%%DATADIR%%/scripts/lua/rest/v2/blacklist/reload.lua %%DATADIR%%/scripts/lua/rest/v2/connect/test.lua %%DATADIR%%/scripts/lua/rest/v2/create/ntopng/api_token.lua %%DATADIR%%/scripts/lua/rest/v2/create/ntopng/session.lua @@ -1159,12 +1199,14 @@ share/man/man8/ntopng.8.gz %%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 +%%DATADIR%%/scripts/lua/rest/v2/delete/as/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/delete/endpoints.lua %%DATADIR%%/scripts/lua/rest/v2/delete/flow/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/delete/host/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/delete/host/delete_host_to_scan.lua %%DATADIR%%/scripts/lua/rest/v2/delete/host/new_devices.lua %%DATADIR%%/scripts/lua/rest/v2/delete/host/pool.lua +%%DATADIR%%/scripts/lua/rest/v2/delete/host/pool_member.lua %%DATADIR%%/scripts/lua/rest/v2/delete/interface/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/delete/mac/alerts.lua %%DATADIR%%/scripts/lua/rest/v2/delete/network/alerts.lua @@ -1177,6 +1219,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/rest/v2/edit/application/application.lua %%DATADIR%%/scripts/lua/rest/v2/edit/category/category.lua %%DATADIR%%/scripts/lua/rest/v2/edit/host/pool.lua +%%DATADIR%%/scripts/lua/rest/v2/edit/host/pool/member.lua %%DATADIR%%/scripts/lua/rest/v2/edit/host/update_va_scan_period.lua %%DATADIR%%/scripts/lua/rest/v2/edit/ntopng/incr_flows.lua %%DATADIR%%/scripts/lua/rest/v2/edit/ntopng/incr_hosts.lua @@ -1211,9 +1254,16 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/rest/v2/get/all/alert/ts.lua %%DATADIR%%/scripts/lua/rest/v2/get/am_host/alert/list.lua %%DATADIR%%/scripts/lua/rest/v2/get/am_host/alert/ts.lua +%%DATADIR%%/scripts/lua/rest/v2/get/as/alert/alert_details.lua +%%DATADIR%%/scripts/lua/rest/v2/get/as/alert/list.lua +%%DATADIR%%/scripts/lua/rest/v2/get/as/alert/ts.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/config.lua %%DATADIR%%/scripts/lua/rest/v2/get/asn/get_as_data.lua +%%DATADIR%%/scripts/lua/rest/v2/get/asn/get_top_asn.lua +%%DATADIR%%/scripts/lua/rest/v2/get/asn/pie.lua +%%DATADIR%%/scripts/lua/rest/v2/get/asn/sankey.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/checks/subdirs.lua @@ -1282,6 +1332,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/rest/v2/get/interface/alert/ts.lua %%DATADIR%%/scripts/lua/rest/v2/get/interface/arp.lua %%DATADIR%%/scripts/lua/rest/v2/get/interface/bcast_domains.lua +%%DATADIR%%/scripts/lua/rest/v2/get/interface/current_interface.lua %%DATADIR%%/scripts/lua/rest/v2/get/interface/data.lua %%DATADIR%%/scripts/lua/rest/v2/get/interface/dscp/stats.lua %%DATADIR%%/scripts/lua/rest/v2/get/interface/l7/cat_data.lua @@ -1297,12 +1348,17 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/rest/v2/get/mac/alert/list.lua %%DATADIR%%/scripts/lua/rest/v2/get/mac/alert/ts.lua %%DATADIR%%/scripts/lua/rest/v2/get/mac/data.lua +%%DATADIR%%/scripts/lua/rest/v2/get/mac/mac_filters.lua +%%DATADIR%%/scripts/lua/rest/v2/get/mac/macs_list.lua +%%DATADIR%%/scripts/lua/rest/v2/get/ndpi/export/categories.lua +%%DATADIR%%/scripts/lua/rest/v2/get/ndpi/export/protocols.lua %%DATADIR%%/scripts/lua/rest/v2/get/network/alert/list.lua %%DATADIR%%/scripts/lua/rest/v2/get/network/alert/ts.lua %%DATADIR%%/scripts/lua/rest/v2/get/network/config.lua %%DATADIR%%/scripts/lua/rest/v2/get/network/discovery/discover.lua %%DATADIR%%/scripts/lua/rest/v2/get/network/discovery/run_discovery.lua %%DATADIR%%/scripts/lua/rest/v2/get/network/networks.lua +%%DATADIR%%/scripts/lua/rest/v2/get/network/networks_stats.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 @@ -1328,6 +1384,7 @@ share/man/man8/ntopng.8.gz %%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/reload_ndpi.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 @@ -1353,6 +1410,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/rest/v2/reset/snmp/config.lua %%DATADIR%%/scripts/lua/rest/v2/reset/snmp_data/config.lua %%DATADIR%%/scripts/lua/rest/v2/set/active_monitoring/measurement.lua +%%DATADIR%%/scripts/lua/rest/v2/set/asn/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 @@ -1384,6 +1442,7 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/lua/system_stats_data.lua %%DATADIR%%/scripts/lua/toggle_all_checks.lua %%DATADIR%%/scripts/lua/traffic_recording_config.lua +%%DATADIR%%/scripts/lua/ts_overview.lua %%DATADIR%%/scripts/lua/unknown_devices.lua %%DATADIR%%/scripts/lua/update_blog_posts.lua %%DATADIR%%/scripts/lua/update_prefs.lua @@ -1395,8 +1454,8 @@ share/man/man8/ntopng.8.gz %%DATADIR%%/scripts/shell/README %%DATADIR%%/scripts/templates/dashboard/assets.json %%DATADIR%%/scripts/templates/dashboard/community.json -%%DATADIR%%/scripts/templates/dashboard/enterprise-with-db.json %%DATADIR%%/scripts/templates/dashboard/enterprise.json +%%DATADIR%%/scripts/templates/dashboard/enterprise_as_mode.json %%DATADIR%%/scripts/templates/dashboard/infrastructure.json %%DATADIR%%/scripts/templates/dashboard/nedge-enterprise.json %%DATADIR%%/scripts/templates/dashboard/nedge.json