net-mgmt/netdata: Update to v1.40.1

Changelog: https://github.com/netdata/netdata/releases/tag/v1.40.1 https://github.com/netdata/netdata/releases/tag/v1.40.0 https://github.com/netdata/netdata/releases/tag/v1.39.1 https://github.com/netdata/netdata/releases/tag/v1.39.0 PR: 271554 Reported by: trli <8354q9m1c@relay.firefox.com> Differential Revision: https://reviews.freebsd.org/D40418
freebsd · Jun 27, 2023 · 04efa33 · 04efa33
1 parent 98161b5
commit 04efa33
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 37 deletions.
diff --git a/net-mgmt/netdata/Makefile b/net-mgmt/netdata/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	netdata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.38.1
+DISTVERSION=	1.40.1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
@@ -12,21 +12,27 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libjson-c.so:devel/json-c \
+		libyaml.so:textproc/libyaml \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libuv.so:devel/libuv
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		bash:shells/bash \
 		curl:ftp/curl
 
-USES=		autoreconf cpe gmake pathfix pkgconfig:both python shebangfix \
-		ssl
+USES=		autoreconf cpe gmake localbase:ldflags pathfix \
+		pkgconfig:both python shebangfix ssl
 USE_RC_SUBR=	${PORTNAME}
 SHEBANG_GLOB=	*
 BINARY_ALIAS=	ar=llvm-ar ranlib=llvm-ranlib
 
+# Libs that you can't unbundle...
+# SQLite3, --exclude database/sqlite/sqlite3*
+# (lib)judy, --exclude libnetdata/libjudy
+EXTRACT_AFTER_ARGS=	--exclude httpd --exclude ml/dlib
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-unit-tests
+CONFIGURE_ARGS=	--disable-unit-tests --disable-httpd
 
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-D_WANT_VMMETER
@@ -43,7 +49,7 @@ PLIST_SUB=	NETDATA_CACHE=${NETDATA_CACHE} \
 		NETDATA_LOG=${NETDATA_LOG} \
 		NETDATA_PERST=${NETDATA_PERST}
 
-OPTIONS_DEFINE=		CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO
+OPTIONS_DEFINE=		CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO ML
 OPTIONS_DEFAULT=	CLOUD DBENGINE LTO
 OPTIONS_EXCLUDE_powerpc64=	LTO
 OPTIONS_EXCLUDE_riscv64=	LTO
@@ -54,9 +60,9 @@ CUPS_DESC=		Enable support for cups
 DBENGINE_DESC=		Enable support for database engine
 FREEIPMI_DESC=		Enable support for freeipmi
 GOPLUGIN_DESC=		Enable the go collector plugin
+ML_DESC=			Enable anomaly detection via dlib
 
 CLOUD_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
-CLOUD_CONFIGURE_ON=		--with-aclk-ng
 CLOUD_CONFIGURE_OFF=		--disable-cloud
 CUPS_LIB_DEPENDS=		libcups.so:print/cups
 CUPS_CONFIGURE_ENABLE=		plugin-cups
@@ -67,6 +73,8 @@ FREEIPMI_CONFIGURE_ENABLE=	plugin-freeipmi
 GOPLUGIN_RUN_DEPENDS=		${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go
 LTO_USES=			compiler:c11
 LTO_CONFIGURE_ENABLE=		lto
+ML_BUILD_DEPENDS=		${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp
+ML_CONFIGURE_ENABLE=		ml
 
 .include <bsd.port.options.mk>
 

diff --git a/net-mgmt/netdata/distinfo b/net-mgmt/netdata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1676669761
-SHA256 (netdata-v1.38.1.tar.gz) = e32a5427f0c00550210dbbf0046c2621313955256edf836db686e2bc270b8d10
-SIZE (netdata-v1.38.1.tar.gz) = 25434866
+TIMESTAMP = 1687890826
+SHA256 (netdata-v1.40.1.tar.gz) = cc86172acd5e6ec05bc0fa86a50d967502a264d8adf7f79293923ccd8febb251
+SIZE (netdata-v1.40.1.tar.gz) = 43354949
diff --git a/net-mgmt/netdata/files/patch-configure.ac b/net-mgmt/netdata/files/patch-configure.ac
@@ -1,4 +1,4 @@
---- configure.ac.orig	2022-12-28 00:24:19 UTC
+--- configure.ac.orig	2023-06-14 15:07:47 UTC
 +++ configure.ac
 @@ -5,11 +5,11 @@
  AC_PREREQ(2.60)
@@ -16,7 +16,40 @@
 
  AM_MAINTAINER_MODE([disable])
  if test x"$USE_MAINTAINER_MODE" = xyes; then
-@@ -1571,14 +1571,14 @@ AC_SUBST([OPTIONAL_DL_LIBS])
+@@ -1261,14 +1261,14 @@ if test "${enable_ml}" = "yes" -a "${have_uuid}" != "y
+ fi
+
+ # Check if submodules have not been fetched. Fail if ML was explicitly requested.
+-AC_MSG_CHECKING([if git submodules are present for machine learning functionality])
+-if test -f "ml/dlib/dlib/all/source.cpp"; then
+-    AC_MSG_RESULT([yes])
++# AC_MSG_CHECKING([if git submodules are present for machine learning functionality])
++# if test -f "ml/dlib/dlib/all/source.cpp"; then
++#    AC_MSG_RESULT([yes])
+     have_ml_submodules="yes"
+-else
+-    AC_MSG_RESULT([no])
+-    have_ml_submodules="no"
+-fi
++# else
++#    AC_MSG_RESULT([no])
++#    have_ml_submodules="no"
++# fi
+
+ if test "${enable_ml}" = "yes" -a "${have_ml_submodules}" = "no"; then
+     AC_MSG_ERROR([You have explicitly requested --enable-ml functionality but it cannot be built because the required git submodules are missing.])
+@@ -1288,8 +1288,8 @@ fi
+ AM_CONDITIONAL([ENABLE_ML], [test "${build_ml}" = "yes"])
+ if test "${build_ml}" = "yes"; then
+     AC_DEFINE([ENABLE_ML], [1], [anomaly detection usability])
+-    OPTIONAL_ML_CFLAGS="-DDLIB_NO_GUI_SUPPORT -I \$(abs_top_srcdir)/ml/dlib"
+-    OPTIONAL_ML_LIBS=""
++#    OPTIONAL_ML_CFLAGS="-DDLIB_NO_GUI_SUPPORT -I \$(abs_top_srcdir)/ml/dlib"
++#    OPTIONAL_ML_LIBS=""
+ fi
+
+
+@@ -1694,14 +1694,14 @@ AC_SUBST([OPTIONAL_DL_LIBS])
 
  AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
 

diff --git a/net-mgmt/netdata/pkg-plist b/net-mgmt/netdata/pkg-plist
@@ -47,7 +47,7 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/disks.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dns_query.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dnsmasq_dhcp.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dockerd.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/docker.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/elasticsearch.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/entropy.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/exporting.conf.sample
@@ -77,6 +77,7 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/nvme.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/pihole.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ping.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/plugin.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/portcheck.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/postgres.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/processes.conf.sample
@@ -104,7 +105,7 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vsphere.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/web_log.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/whoisquery.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/wmi.conf.sample
+@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/windows.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/x509check.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/zfs.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/health_alarm_notify.conf.sample
@@ -136,15 +137,12 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/memcached.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/monit.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/nsd.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ntpd.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/nvidia_smi.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/openldap.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/oracledb.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/pandas.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/postfix.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/proxysql.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/puppet.conf.sample
-@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/rabbitmq.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/rethinkdbs.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/retroshare.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/riakkv.conf.sample
@@ -164,17 +162,21 @@
 @sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/k6.conf.sample
 @sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample
-lib/netdata/system/netdata-freebsd
-lib/netdata/system/netdata-init-d
-lib/netdata/system/netdata-lsb
-lib/netdata/system/netdata-openrc
-lib/netdata/system/netdata-updater.service
-lib/netdata/system/netdata-updater.timer
-lib/netdata/system/netdata.crontab
-lib/netdata/system/netdata.logrotate
-lib/netdata/system/netdata.plist
-lib/netdata/system/netdata.service
-lib/netdata/system/netdata.service.v235
+@sample(netdata,netdata,0640) lib/netdata/conf.d/vnodes/vnodes.conf.sample
+lib/netdata/system/cron/netdata-updater-daily
+lib/netdata/system/freebsd/rc.d/netdata
+lib/netdata/system/initd/init.d/netdata
+lib/netdata/system/launchd/netdata.plist
+lib/netdata/system/logrotate/netdata
+lib/netdata/system/lsb/init.d/netdata
+lib/netdata/system/openrc/conf.d/netdata
+lib/netdata/system/openrc/init.d/netdata
+lib/netdata/system/runit/run
+lib/netdata/system/systemd/50-netdata.preset
+lib/netdata/system/systemd/netdata-updater.service
+lib/netdata/system/systemd/netdata-updater.timer
+lib/netdata/system/systemd/netdata.service
+lib/netdata/system/systemd/netdata.service.v235
 libexec/netdata/charts.d/ap.chart.sh
 libexec/netdata/charts.d/apcupsd.chart.sh
 libexec/netdata/charts.d/example.chart.sh
@@ -230,13 +232,11 @@ libexec/netdata/python.d/megacli.chart.py
 libexec/netdata/python.d/memcached.chart.py
 libexec/netdata/python.d/monit.chart.py
 libexec/netdata/python.d/nsd.chart.py
-libexec/netdata/python.d/ntpd.chart.py
 libexec/netdata/python.d/nvidia_smi.chart.py
 libexec/netdata/python.d/openldap.chart.py
 libexec/netdata/python.d/oracledb.chart.py
 libexec/netdata/python.d/pandas.chart.py
 libexec/netdata/python.d/postfix.chart.py
-libexec/netdata/python.d/proxysql.chart.py
 libexec/netdata/python.d/puppet.chart.py
 libexec/netdata/python.d/python_modules/__init__.py
 libexec/netdata/python.d/python_modules/bases/FrameworkServices/ExecutableService.py
@@ -258,7 +258,6 @@ libexec/netdata/python.d/python_modules/third_party/lm_sensors.py
 libexec/netdata/python.d/python_modules/third_party/mcrcon.py
 libexec/netdata/python.d/python_modules/third_party/monotonic.py
 libexec/netdata/python.d/python_modules/third_party/ordereddict.py
-libexec/netdata/python.d/rabbitmq.chart.py
 libexec/netdata/python.d/rethinkdbs.chart.py
 libexec/netdata/python.d/retroshare.chart.py
 libexec/netdata/python.d/riakkv.chart.py
@@ -387,7 +386,7 @@ sbin/netdatacli
 %%DATADIR%%/web/netdata-swagger.json
 %%DATADIR%%/web/netdata-swagger.yaml
 %%DATADIR%%/web/old/index.html
-%%DATADIR%%/web/precache-manifest.5fec6109084644adf7bf854243e1a044.js
+%%DATADIR%%/web/precache-manifest.21dcd7c609bff6504512face054c360f.js
 %%DATADIR%%/web/refresh-badges.js
 %%DATADIR%%/web/robots.txt
 %%DATADIR%%/web/service-worker.js
@@ -401,9 +400,9 @@ sbin/netdatacli
 %%DATADIR%%/web/static/img/netdata-logomark.svg
 %%DATADIR%%/web/static/js/10.a5cd7d0e.chunk.js
 %%DATADIR%%/web/static/js/10.a5cd7d0e.chunk.js.map
-%%DATADIR%%/web/static/js/2.92ca8446.chunk.js
-%%DATADIR%%/web/static/js/2.92ca8446.chunk.js.LICENSE
-%%DATADIR%%/web/static/js/2.92ca8446.chunk.js.map
+%%DATADIR%%/web/static/js/2.ae48988e.chunk.js
+%%DATADIR%%/web/static/js/2.ae48988e.chunk.js.LICENSE
+%%DATADIR%%/web/static/js/2.ae48988e.chunk.js.map
 %%DATADIR%%/web/static/js/3.f137faca.chunk.js
 %%DATADIR%%/web/static/js/3.f137faca.chunk.js.map
 %%DATADIR%%/web/static/js/4.2dbcd906.chunk.js
@@ -419,9 +418,9 @@ sbin/netdatacli
 %%DATADIR%%/web/static/js/8.b4161ea2.chunk.js.map
 %%DATADIR%%/web/static/js/9.a4363968.chunk.js
 %%DATADIR%%/web/static/js/9.a4363968.chunk.js.map
-%%DATADIR%%/web/static/js/main.7d1bdca1.chunk.js
-%%DATADIR%%/web/static/js/main.7d1bdca1.chunk.js.LICENSE
-%%DATADIR%%/web/static/js/main.7d1bdca1.chunk.js.map
+%%DATADIR%%/web/static/js/main.76dfe4de.chunk.js
+%%DATADIR%%/web/static/js/main.76dfe4de.chunk.js.LICENSE
+%%DATADIR%%/web/static/js/main.76dfe4de.chunk.js.map
 %%DATADIR%%/web/static/js/runtime-main.08abed8f.js
 %%DATADIR%%/web/static/js/runtime-main.08abed8f.js.map
 %%DATADIR%%/web/static/media/ibm-plex-sans-latin-100.245539db.woff2