Attachment #252110 for bug #275792

Lines 1-7 Link Here

(-)b/net-mgmt/netdata/Makefile (-52 / +68 lines)
1	PORTNAME= netdata	1	PORTNAME= netdata
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.43.2	3	DISTVERSION= 1.46.2
4	PORTREVISION= 2
5	CATEGORIES= net-mgmt	4	CATEGORIES= net-mgmt
6	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/	5	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
7		6
Lines 12-59 WWW= https://github.com/netdata/netdata Link Here
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
15	LIB_DEPENDS= libjson-c.so:devel/json-c \	14	BUILD_DEPENDS= ${LOCALBASE}/bin/mmv:misc/mmv
16	libyaml.so:textproc/libyaml \	15	LIB_DEPENDS= libbrotlicommon.so:archivers/brotli \
		16	libjson-c.so:devel/json-c \
		17	libpcre2-8.so:devel/pcre2 \
17	libuuid.so:misc/e2fsprogs-libuuid \	18	libuuid.so:misc/e2fsprogs-libuuid \
18	libuv.so:devel/libuv	19	libuv.so:devel/libuv \
		20	libyaml.so:textproc/libyaml \
		21	libzstd.so:archivers/zstd
19	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \	22	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
21	bash:shells/bash \	24	bash:shells/bash \
22	curl:ftp/curl	25	curl:ftp/curl
23		26
24	USES= autoreconf compiler:c++17-lang cpe gmake localbase:ldflags pathfix \	27	USES= cmake cpe localbase:ldflags pathfix \
25	pkgconfig:both python shebangfix ssl	28	pkgconfig:both python shebangfix ssl
26	USE_RC_SUBR= ${PORTNAME}
27	SHEBANG_GLOB= *	29	SHEBANG_GLOB= *
28	BINARY_ALIAS= ar=llvm-ar ranlib=llvm-ranlib
29		30
30	# Libs that you can't unbundle...	31	# Libs that you can't unbundle...
31	# SQLite3, --exclude database/sqlite/sqlite3*	32	# SQLite3, --exclude database/sqlite/sqlite3*
32	# (lib)judy, --exclude libnetdata/libjudy	33	# (lib)judy, --exclude libnetdata/libjudy
33	EXTRACT_AFTER_ARGS= --exclude ml/dlib --exclude web/server/h2o	34	EXTRACT_AFTER_ARGS= --exclude ml/dlib \
		35	--exclude collectors/python.d.plugin/python_modules/pyyaml2 \
		36	--exclude collectors/python.d.plugin/python_modules/pyyaml3 \
		37	--exclude collectors/python.d.plugin/python_modules/urllib3
34		38
35	GNU_CONFIGURE= yes	39	CFLAGS+= -D_WANT_VMMETER
36	CONFIGURE_ARGS= --disable-h2o --disable-unit-tests --with-user=netdata
37		40
38	INSTALL_TARGET= install-strip	41	USE_RC_SUBR= ${PORTNAME}
39	CPPFLAGS+= -D_WANT_VMMETER	42	USERS= netdata
40	USE_CXXSTD= c++17	43	GROUPS= netdata
		44
		45	NETDATA_CACHE= /var/cache/${PORTNAME}
		46	NETDATA_LOG= /var/log/${PORTNAME}
		47	NETDATA_PERST= /var/db/${PORTNAME}
41		48
42	SUB_FILES= ${PORTNAME}.conf.sample	49	SUB_FILES= ${PORTNAME}.conf.sample
43	SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \	50	SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \
44	NETDATA_LOG=${NETDATA_LOG} \	51	NETDATA_LOG=${NETDATA_LOG} \
45	NETDATA_PERST=${NETDATA_PERST}	52	NETDATA_PERST=${NETDATA_PERST}
46		53
47	USERS= netdata
48	GROUPS= netdata
49
50	PLIST_SUB= NETDATA_CACHE=${NETDATA_CACHE} \	54	PLIST_SUB= NETDATA_CACHE=${NETDATA_CACHE} \
51	NETDATA_LOG=${NETDATA_LOG} \	55	NETDATA_LOG=${NETDATA_LOG} \
52	NETDATA_PERST=${NETDATA_PERST}	56	NETDATA_PERST=${NETDATA_PERST}
53		57
54	OPTIONS_DEFINE= CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO ML	58	# DebugFS and below are Linux exclusive
55	OPTIONS_DEFAULT= CLOUD DBENGINE LTO ML	59	CMAKE_OFF= ENABLE_PLUGIN_EBPF \
56	OPTIONS_EXCLUDE_riscv64= LTO	60	ENABLE_PLUGIN_NFACCT \
		61	ENABLE_PLUGIN_XENSTAT \
		62	ENABLE_PLUGIN_DEBUGFS \
		63	ENABLE_PLUGIN_PERF \
		64	ENABLE_PLUGIN_SLABINFO \
		65	ENABLE_PLUGIN_SYSTEMD_JOURNAL \
		66	ENABLE_PLUGIN_CGROUP_NETWORK \
		67	ENABLE_PLUGIN_LOCAL_LISTENERS \
		68	ENABLE_PLUGIN_NETWORK_VIEWER
		69	CMAKE_ON= DISABLE_HARDENING
		70
		71	OPTIONS_DEFINE= CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN ML PROMETHEUS
		72	OPTIONS_DEFAULT= CLOUD DBENGINE ML
57	OPTIONS_EXCLUDE_powerpc64le= ML	73	OPTIONS_EXCLUDE_powerpc64le= ML
58	OPTIONS_SUB= YES	74	OPTIONS_SUB= YES
59		75
Lines 62-100 CUPS_DESC= Enable support for cups Link Here
62	DBENGINE_DESC= Enable support for database engine	78	DBENGINE_DESC= Enable support for database engine
63	FREEIPMI_DESC= Enable support for freeipmi	79	FREEIPMI_DESC= Enable support for freeipmi
64	GOPLUGIN_DESC= Enable the go collector plugin	80	GOPLUGIN_DESC= Enable the go collector plugin
65	ML_DESC= Enable anomaly detection via dlib	81	ML_DESC= Enable anomaly detection via dlib
66		82	PROMETHEUS_DESC= Enable prometheus remote write exporter
67	CLOUD_LIB_DEPENDS= libprotobuf.so:devel/protobuf	83
68	CLOUD_CONFIGURE_OFF= --disable-cloud	84	CLOUD_USES= compiler:c++17-lang
69	CUPS_LIB_DEPENDS= libcups.so:print/cups	85	CLOUD_LIB_DEPENDS= libabsl_base.so:devel/abseil \
70	CUPS_CONFIGURE_ENABLE= plugin-cups	86	libprotobuf.so:devel/protobuf
71	DBENGINE_LIB_DEPENDS= liblz4.so:archivers/liblz4	87	CLOUD_CMAKE_BOOL= ENABLE_CLOUD ENABLE_ACLK
72	DBENGINE_CONFIGURE_ENABLE= dbengine	88	CUPS_LIB_DEPENDS= libcups.so:print/cups
73	FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi	89	CUPS_CMAKE_BOOL= ENABLE_PLUGIN_CUPS
74	FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi	90	DBENGINE_LIB_DEPENDS= liblz4.so:archivers/liblz4
75	GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go	91	DBENGINE_CMAKE_BOOL= ENABLE_PLUGIN_DBENGINE
76	LTO_USES= compiler:c11	92	FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
77	LTO_CONFIGURE_ENABLE= lto	93	FREEIPMI_CMAKE_BOOL= ENABLE_PLUGIN_FREEIPMI
78	ML_BUILD_DEPENDS= ${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp	94	GOPLUGIN_CMAKE_BOOL= ENABLE_PLUGIN_GO
79	ML_CONFIGURE_ENABLE= ml	95	GOPLUGIN_BUILD_DEPENDS= go122>=1.22:lang/go122
80		96	ML_BUILD_DEPENDS= ${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp
81	NETDATA_CACHE= /var/cache/${PORTNAME}	97	ML_CMAKE_BOOL= ENABLE_ML
82	NETDATA_LOG= /var/log/${PORTNAME}	98	PROMETHEUS_LIB_DEPENDS= libsnappy.so:archivers/snappy \
83	NETDATA_PERST= /var/db/${PORTNAME}	99	libabsl_base.so:devel/abseil \
		100	libprotobuf.so:devel/protobuf
		101	PROMETHEUS_CMAKE_BOOL= ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE
84		102
85	post-patch:	103	post-patch:
86	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION}\|g' \	104	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION}\|g' \
87	${PATCH_WRKSRC}/configure.ac	105	${PATCH_WRKSRC}/packaging/cmake/Modules/NetdataVersion.cmake
88	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \	106	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \
89	${PATCH_WRKSRC}/configure.ac	107	${PATCH_WRKSRC}/CMakeLists.txt
90	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \	108	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \
91	${PATCH_WRKSRC}/configure.ac	109	${PATCH_WRKSRC}/CMakeLists.txt
92	@${REINPLACE_CMD} -e 's\|%%NETDATA_PERST%%\|${NETDATA_PERST}\|g' \	110	@${REINPLACE_CMD} -e 's\|%%NETDATA_PERST%%\|${NETDATA_PERST}\|g' \
93	${PATCH_WRKSRC}/configure.ac	111	${PATCH_WRKSRC}/CMakeLists.txt
94	@${REINPLACE_CMD} -e 's\|%%ETCDIR%%\|${ETCDIR}\|g' \	112	@${REINPLACE_CMD} -e 's\|%%ETCDIR%%\|${ETCDIR}\|g' \
95	${PATCH_WRKSRC}/configure.ac	113	${PATCH_WRKSRC}/CMakeLists.txt
96	@${REINPLACE_CMD} -e 's\|%%PYTHON%%\|${PYTHON_CMD}\|g' \	114	@${REINPLACE_CMD} -e 's\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|g' \
97	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in	115	${PATCH_WRKSRC}/src/collectors/python.d.plugin/python.d.plugin.in
98		116
99	post-install:	117	post-install:
100	${MKDIR} ${STAGEDIR}${ETCDIR}	118	${MKDIR} ${STAGEDIR}${ETCDIR}
Lines 103-117 post-install: Link Here
103	${MKDIR} ${STAGEDIR}${NETDATA_CACHE}	121	${MKDIR} ${STAGEDIR}${NETDATA_CACHE}
104	${MKDIR} ${STAGEDIR}${NETDATA_LOG}	122	${MKDIR} ${STAGEDIR}${NETDATA_LOG}
105	${MKDIR} ${STAGEDIR}${NETDATA_PERST}	123	${MKDIR} ${STAGEDIR}${NETDATA_PERST}
106	(for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \	124	@cd ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME} && mmv ";*.conf" "#1#2.conf.sample"
107	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.conf \
108	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.txt ; do \
109	${MV} $$fi $$fi".sample"; \
110	done)
111	${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf	125	${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf
		126	${RM} ${STAGEDIR}${LOCALBASE}/libexec/netdata/netdata-updater.sh
112	${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system	127	${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system
113		128
114	post-install-CLOUD-off:	129	post-install-CLOUD-off:
115	rm ${STAGEDIR}${PREFIX}/sbin/netdata-claim.sh	130	${RM} ${STAGEDIR}${PREFIX}/sbin/netdata-claim.sh
		131	${RM} -d ${STAGEDIR}${NETDATA_PERST}/cloud.d
116		132
117	.include <bsd.port.mk>	133	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net-mgmt/netdata/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1698687088	1	TIMESTAMP = 1721066999
2	SHA256 (netdata-v1.43.2.tar.gz) = d4a7ea2717ac7c8f04865f18e13aeaa0a36784156059f1b5ced75a44f74afc4d	2	SHA256 (netdata-v1.46.2.tar.gz) = 5451bd19f044948ae568fa1e7283d54b41da796dc984999bcb9df25f1718e026
3	SIZE (netdata-v1.43.2.tar.gz) = 46462665	3	SIZE (netdata-v1.46.2.tar.gz) = 75133899

Lines 10-15 Link Here

(-)b/net-mgmt/netdata/files/netdata.conf.sample.in (+1 lines)
10		10
11	[plugins]	11	[plugins]
12	freebsd = yes	12	freebsd = yes
		13	statsd = no
13		14
14	[web]	15	[web]
15	respect do not track policy = yes	16	respect do not track policy = yes




--- CMakeLists.txt.orig	2024-07-15 12:12:23.497390000 -0600
+++ CMakeLists.txt	2024-07-15 12:16:17.040263000 -0600
@@ -31,7 +31,7 @@
 endif()
 
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "netdata")
 
 option(USE_CXX_11 "Use C++11 instead of C++14 (should only be used on legacy systems that cannot support C++14, may disable some features)" False)
@@ -997,7 +997,6 @@
                 src/ml/ad_charts.h
                 src/ml/ad_charts.cc
                 src/ml/Config.cc
-                src/ml/dlib/dlib/all/source.cpp
                 src/ml/ml.h
                 src/ml/ml.cc
                 src/ml/ml-private.h
@@ -1754,13 +1753,13 @@
 
     install(TARGETS debugfs.plugin
             COMPONENT plugin-debugfs
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-debugfs
-                DESTINATION usr/share/doc/netdata-plugin-debugfs)
+                DESTINATION share/doc/netdata-plugin-debugfs)
     endif()
 endif()
 
@@ -1792,17 +1791,17 @@
 
     install(TARGETS apps.plugin
             COMPONENT plugin-apps
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     install(FILES src/collectors/apps.plugin/apps_groups.conf
             COMPONENT plugin-apps
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-apps
-                DESTINATION usr/share/doc/netdata-plugin-apps)
+                DESTINATION share/doc/netdata-plugin-apps)
     endif()
 endif()
 
@@ -1822,13 +1821,13 @@
 
     install(TARGETS freeipmi.plugin
             COMPONENT plugin-freeipmi
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-freeipmi
-                DESTINATION usr/share/doc/netdata-plugin-freeipmi)
+                DESTINATION share/doc/netdata-plugin-freeipmi)
     endif()
 endif()
 
@@ -1848,13 +1847,13 @@
 
     install(TARGETS nfacct.plugin
             COMPONENT plugin-nfacct
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-nfacct
-                DESTINATION usr/share/doc/netdata-plugin-nfacct)
+                DESTINATION share/doc/netdata-plugin-nfacct)
     endif()
 endif()
 
@@ -1871,13 +1870,13 @@
 
     install(TARGETS xenstat.plugin
             COMPONENT plugin-xenstat
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-xenstat
-                DESTINATION usr/share/doc/netdata-plugin-xenstat)
+                DESTINATION share/doc/netdata-plugin-xenstat)
     endif()
 endif()
 
@@ -1889,13 +1888,13 @@
 
     install(TARGETS perf.plugin
             COMPONENT plugin-perf
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     if(BUILD_FOR_PACKAGING)
          install(FILES
                  ${PKG_FILES_PATH}/copyright
                  COMPONENT plugin-perf
-                 DESTINATION usr/share/doc/netdata-plugin-perf)
+                 DESTINATION share/doc/netdata-plugin-perf)
     endif()
 endif()
 
@@ -1907,13 +1906,13 @@
 
     install(TARGETS slabinfo.plugin
             COMPONENT plugin-slabinfo
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-slabinfo
-                DESTINATION usr/share/doc/netdata-plugin-slabinfo)
+                DESTINATION share/doc/netdata-plugin-slabinfo)
     endif()
 endif()
 
@@ -1931,11 +1930,11 @@
 
     install(TARGETS logs-management.plugin
             COMPONENT plugin-logs-management
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     install(DIRECTORY src/logsmanagement/stock_conf/logsmanagement.d
             COMPONENT plugin-logs-management
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     install(DIRECTORY
             COMPONENT plugin-logs-management
@@ -1947,13 +1946,13 @@
 
     install(FILES ${CMAKE_BINARY_DIR}/src/logsmanagement/stock_conf/logsmanagement.d.conf
             COMPONENT plugin-logs-management
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-logs-management
-                DESTINATION usr/share/doc/netdata-plugin-logs-management)
+                DESTINATION share/doc/netdata-plugin-logs-management)
     endif()
 endif()
 
@@ -1986,13 +1985,13 @@
 
         install(TARGETS cups.plugin
                 COMPONENT plugin-cups
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 
         if(BUILD_FOR_PACKAGING)
                 install(FILES
                         ${PKG_FILES_PATH}/copyright
                         COMPONENT plugin-cups
-                        DESTINATION usr/share/doc/netdata-plugin-cups)
+                        DESTINATION share/doc/netdata-plugin-cups)
         endif()
     endif()
 endif()
@@ -2003,7 +2002,7 @@
 
 install(TARGETS ndsudo
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 if(ENABLE_PLUGIN_CGROUP_NETWORK)
     set(CGROUP_NETWORK_FILES src/collectors/cgroups.plugin/cgroup-network.c)
@@ -2013,7 +2012,7 @@
 
     install(TARGETS cgroup-network
             COMPONENT netdata
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_SYSTEMD_JOURNAL)
@@ -2026,13 +2025,13 @@
 
         install(TARGETS systemd-journal.plugin
                 COMPONENT plugin-systemd-journal
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 
         if(BUILD_FOR_PACKAGING)
                 install(FILES
                         ${PKG_FILES_PATH}/copyright
                         COMPONENT plugin-systemd-journal
-                        DESTINATION usr/share/doc/netdata-plugin-systemd-journal)
+                        DESTINATION share/doc/netdata-plugin-systemd-journal)
         endif()
 endif()
 
@@ -2089,12 +2088,12 @@
 
     install(TARGETS ebpf.plugin
             COMPONENT plugin-ebpf
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     install(FILES
             src/collectors/ebpf.plugin/ebpf.d.conf
             COMPONENT plugin-ebpf
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     install(FILES
             src/collectors/ebpf.plugin/ebpf.d/cachestat.conf
@@ -2115,13 +2114,13 @@
             src/collectors/ebpf.plugin/ebpf.d/sync.conf
             src/collectors/ebpf.plugin/ebpf.d/vfs.conf
             COMPONENT plugin-ebpf
-            DESTINATION usr/lib/netdata/conf.d/ebpf.d)
+            DESTINATION lib/netdata/conf.d/ebpf.d)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-ebpf
-                DESTINATION usr/share/doc/netdata-plugin-ebpf)
+                DESTINATION share/doc/netdata-plugin-ebpf)
     endif()
 
     if(ENABLE_LEGACY_EBPF_PROGRAMS)
@@ -2146,7 +2145,7 @@
 
         install(TARGETS local-listeners
                 COMPONENT netdata
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_NETWORK_VIEWER)
@@ -2167,13 +2166,13 @@
 
         install(TARGETS network-viewer.plugin
                 COMPONENT plugin-network-viewer
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 
         if(BUILD_FOR_PACKAGING)
                 install(FILES
                         ${PKG_FILES_PATH}/copyright
                         COMPONENT plugin-network-viewer
-                        DESTINATION usr/share/doc/netdata-plugin-network-viewer)
+                        DESTINATION share/doc/netdata-plugin-network-viewer)
         endif()
 endif()
 
@@ -2231,10 +2230,6 @@
         "$<$<BOOL:${ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE}>:${PROMETHEUS_REMOTE_WRITE_EXPORTING_FILES}>"
 )
 
-target_compile_definitions(netdata PRIVATE
-        "$<$<BOOL:${ENABLE_ML}>:DLIB_NO_GUI_SUPPORT>"
-)
-
 target_compile_options(netdata PRIVATE
         "$<$<BOOL:${ENABLE_EXPORTER_MONGODB}>:${MONGOC_CFLAGS_OTHER}>"
         "$<$<BOOL:${ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE}>:${SNAPPY_CFLAGS_OTHER}>"
@@ -2274,7 +2269,7 @@
 
 install(TARGETS systemd-cat-native
         COMPONENT netdata
-        DESTINATION usr/sbin)
+        DESTINATION sbin)
 
 #
 # build log2journal
@@ -2309,11 +2304,11 @@
 
         install(TARGETS log2journal
                 COMPONENT netdata
-                DESTINATION usr/sbin)
+                DESTINATION sbin)
 
         install(DIRECTORY src/collectors/log2journal/log2journal.d
                 COMPONENT netdata
-                DESTINATION usr/lib/netdata/conf.d)
+                DESTINATION lib/netdata/conf.d)
 endif()
 
 #
@@ -2332,7 +2327,7 @@
 
 install(TARGETS netdatacli
         COMPONENT netdata
-        DESTINATION usr/sbin)
+        DESTINATION sbin)
 
 #
 # Build go.d.plugin
@@ -2343,7 +2338,7 @@
 
     install(PROGRAMS ${CMAKE_BINARY_DIR}/go.d.plugin
             COMPONENT plugin-go
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 #
@@ -2354,16 +2349,16 @@
   string(REGEX REPLACE "/$" "" CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
 endif()
 
-set(CACHE_DIR "${CMAKE_INSTALL_PREFIX}/var/cache/netdata")
-set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc/netdata")
-set(LIBCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")
-set(LOG_DIR "${CMAKE_INSTALL_PREFIX}/var/log/netdata")
-set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata/plugins.d")
-set(VARLIB_DIR "${CMAKE_INSTALL_PREFIX}/var/lib/netdata")
+set(CACHE_DIR "%%NETDATA_CACHE%%")
+set(CONFIG_DIR "%%ETCDIR%%")
+set(LIBCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/netdata/conf.d")
+set(LOG_DIR "%%NETDATA_LOG%%")
+set(PLUGINS_DIR "${CMAKE_INSTALL_PREFIX}/libexec/netdata/plugins.d")
+set(VARLIB_DIR "%%NETDATA_PERST%%")
 
 # A non-default value is only used when building Debian packages (/var/lib/netdata/www)
 if(NOT DEFINED WEB_DIR)
-  set(WEB_DIR "usr/share/netdata/web")
+  set(WEB_DIR "share/netdata/web")
 else()
   string(REGEX REPLACE "^/" "" WEB_DIR "${WEB_DIR}")
 endif()
@@ -2382,12 +2377,12 @@
 # install
 #
 
-install(TARGETS netdata COMPONENT netdata DESTINATION usr/sbin)
+install(TARGETS netdata COMPONENT netdata DESTINATION sbin)
 
-install(DIRECTORY COMPONENT netdata DESTINATION var/cache/netdata)
-install(DIRECTORY COMPONENT netdata DESTINATION var/log/netdata)
-install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/registry)
-install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/cloud.d)
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_CACHE%%)
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_LOG%%)
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/registery)
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/cloud.d)
 install(DIRECTORY COMPONENT netdata DESTINATION var/run/netdata)
 install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata)
 install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/custom-plugins.d)
@@ -2396,22 +2391,23 @@
 install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/python.d)
 install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/ssl)
 install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/statsd.d)
-install(DIRECTORY COMPONENT netdata DESTINATION usr/lib/netdata/conf.d)
-install(DIRECTORY COMPONENT netdata DESTINATION usr/lib/netdata/conf.d/schema.d)
-install(DIRECTORY COMPONENT netdata DESTINATION usr/libexec/netdata/plugins.d)
+install(DIRECTORY COMPONENT netdata DESTINATION lib/netdata/conf.d)
+install(DIRECTORY COMPONENT netdata DESTINATION lib/netdata/conf.d/schema.d)
+install(DIRECTORY COMPONENT netdata DESTINATION libexec/netdata/plugins.d)
 install(DIRECTORY COMPONENT netdata DESTINATION ${WEB_DEST})
 
-set(libsysdir_POST "${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/system")
-set(pkglibexecdir_POST "${CMAKE_INSTALL_PREFIX}/usr/libexec/netdata")
+set(libsysdir_POST "${CMAKE_INSTALL_PREFIX}/lib/netdata/system")
+set(pkglibexecdir_POST "${CMAKE_INSTALL_PREFIX}/libexec/netdata")
 set(localstatedir_POST "${CMAKE_INSTALL_PREFIX}/var")
-set(sbindir_POST "${CMAKE_INSTALL_PREFIX}/usr/sbin")
-set(configdir_POST "${CMAKE_INSTALL_PREFIX}/etc/netdata")
-set(libconfigdir_POST "${CMAKE_INSTALL_PREFIX}/usr/lib/netdata/conf.d")
-set(cachedir_POST "${CMAKE_INSTALL_PREFIX}/var/cache/netdata")
-set(registrydir_POST "${CMAKE_INSTALL_PREFIX}/var/lib/netdata/registry")
-set(varlibdir_POST "${CMAKE_INSTALL_PREFIX}/var/lib/netdata")
+set(sbindir_POST "${CMAKE_INSTALL_PREFIX}/sbin")
+set(configdir_POST "%%ETCDIR%%")
+set(libconfigdir_POST "${CMAKE_INSTALL_PREFIX}/lib/netdata/conf.d")
+set(cachedir_POST "%%NETDATA_CACHE%%")
+set(registrydir_POST "%%NETDATA_PERST%%/registery")
+set(varlibdir_POST "%%NETDATA_PERST%%")
 set(netdata_user_POST "${NETDATA_USER}")
 
+
 # netdata-claim.sh
 if(ENABLE_CLOUD)
         set(enable_cloud_POST "yes")
@@ -2429,7 +2425,7 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/claim/netdata-claim.sh
         COMPONENT netdata
-        DESTINATION usr/sbin)
+        DESTINATION sbin)
 
 #
 # We don't check ENABLE_PLUGIN_CGROUP_NETWORK because rpm builds assume
@@ -2440,14 +2436,14 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/cgroups.plugin/cgroup-network-helper.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 configure_file(src/collectors/cgroups.plugin/cgroup-name.sh.in
                src/collectors/cgroups.plugin/cgroup-name.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/cgroups.plugin/cgroup-name.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 #
 # statsd
@@ -2457,7 +2453,7 @@
         src/collectors/statsd.plugin/example.conf
         src/collectors/statsd.plugin/k6.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d/statsd.d)
+        DESTINATION lib/netdata/conf.d/statsd.d)
 
 #
 # exporting
@@ -2465,7 +2461,7 @@
 install(FILES
         src/exporting/exporting.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # ioping.plugin
@@ -2473,7 +2469,7 @@
 install(FILES
         src/collectors/ioping.plugin/ioping.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # streaming
@@ -2481,7 +2477,7 @@
 install(FILES
         src/streaming/stream.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # swagger
@@ -2500,37 +2496,37 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/install-service.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata)
+        DESTINATION libexec/netdata)
 
 configure_file(system/cron/netdata-updater-daily.in system/cron/netdata-updater-daily @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/cron/netdata-updater-daily
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/cron)
+        DESTINATION lib/netdata/system/cron)
 
 configure_file(system/launchd/netdata.plist.in system/launchd/netdata.plist @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/launchd/netdata.plist
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/launchd)
+        DESTINATION lib/netdata/system/launchd)
 
 configure_file(system/freebsd/rc.d/netdata.in system/freebsd/rc.d/netdata @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/freebsd/rc.d/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/freebsd/rc.d)
+        DESTINATION lib/netdata/system/freebsd/rc.d)
 
 configure_file(system/initd/init.d/netdata.in system/initd/init.d/netdata @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/initd/init.d/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/initd/init.d)
+        DESTINATION lib/netdata/system/initd/init.d)
 
 configure_file(system/logrotate/netdata.in system/logrotate/netdata @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/logrotate/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/logrotate)
+        DESTINATION lib/netdata/system/logrotate)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/logrotate/netdata
         COMPONENT netdata
@@ -2540,59 +2536,59 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/lsb/init.d/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/lsb/init.d)
+        DESTINATION lib/netdata/system/lsb/init.d)
 
 configure_file(system/openrc/conf.d/netdata.in system/openrc/conf.d/netdata @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/openrc/conf.d/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/openrc/conf.d)
+        DESTINATION lib/netdata/system/openrc/conf.d)
 
 configure_file(system/openrc/init.d/netdata.in system/openrc/init.d/netdata @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/openrc/init.d/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/openrc/init.d)
+        DESTINATION lib/netdata/system/openrc/init.d)
 
 configure_file(system/runit/run.in system/runit/run @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/runit/run
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/runit)
+        DESTINATION lib/netdata/system/runit)
 
 configure_file(system/dinit/netdata.in system/dinit/netdata @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/dinit/netdata
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/dinit)
+        DESTINATION lib/netdata/system/dinit)
 
 configure_file(system/systemd/netdata.service.in system/systemd/netdata.service @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/systemd/netdata.service
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 install(FILES
         system/systemd/journald@netdata.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 configure_file(system/systemd/netdata.service.v235.in system/systemd/netdata.service.v235 @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/systemd/netdata.service.v235
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 configure_file(system/systemd/netdata-updater.service.in system/systemd/netdata-updater.service @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/systemd/netdata-updater.service
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 install(FILES
         system/systemd/netdata-updater.timer
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 if(BUILD_FOR_PACKAGING)
         install(FILES
@@ -2609,23 +2605,23 @@
                 DESTINATION lib/systemd/system)
         install(DIRECTORY
                 COMPONENT netdata
-                DESTINATION usr/lib/systemd/journald@netdata.conf.d)
+                DESTINATION lib/systemd/journald@netdata.conf.d)
         install(FILES
                 system/systemd/journald@netdata.conf
                 COMPONENT netdata
-                DESTINATION usr/lib/systemd/journald@netdata.conf.d
+                DESTINATION lib/systemd/journald@netdata.conf.d
                 RENAME netdata.conf)
 endif()
 
 install(FILES
         system/systemd/50-netdata.preset
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 install(FILES
         system/vnodes/vnodes.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d/vnodes)
+        DESTINATION lib/netdata/conf.d/vnodes)
 
 install(FILES
         system/.install-type
@@ -2640,7 +2636,7 @@
 if(BUILD_FOR_PACKAGING)
         set(NETDATA_CONF_DEST "etc/netdata")
 else()
-        set(NETDATA_CONF_DEST "usr/lib/netdata/conf.d")
+        set(NETDATA_CONF_DEST "lib/netdata/conf.d")
 endif()
 
 install(FILES
@@ -2667,7 +2663,7 @@
 install(PROGRAMS
         packaging/installer/netdata-updater.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata)
+        DESTINATION libexec/netdata)
 
 #
 # TODO: check the following files for correct substitutions
@@ -2676,18 +2672,18 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/daemon/anonymous-statistics.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 configure_file(src/daemon/get-kubernetes-labels.sh.in src/daemon/get-kubernetes-labels.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/daemon/get-kubernetes-labels.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(PROGRAMS
         src/daemon/system-info.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 #
 # health files
@@ -2697,25 +2693,25 @@
 install(FILES
         ${HEALTH_CONF_FILES}
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d/health.d)
+        DESTINATION lib/netdata/conf.d/health.d)
 
 configure_file(src/health/notifications/alarm-notify.sh.in src/health/notifications/alarm-notify.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/health/notifications/alarm-notify.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(PROGRAMS
         src/health/notifications/alarm-email.sh
         src/health/notifications/alarm-test.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(FILES
         src/health/notifications/health_alarm_notify.conf
         src/health/notifications/health_email_recipients.conf
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 #
 # test/ files
 #
@@ -2734,7 +2730,7 @@
         ${CMAKE_BINARY_DIR}/tests/alarm_repetition/alarm.sh
         ${CMAKE_BINARY_DIR}/tests/template_dimension/template_dim.sh
         ${CMAKE_BINARY_DIR}/tests/ebpf/ebpf_thread_function.sh
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 #
 # charts.d plugin
@@ -2746,23 +2742,23 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/charts.d.plugin/charts.d.plugin
         COMPONENT plugin-chartsd
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(PROGRAMS
         src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
         COMPONENT plugin-chartsd
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 # loopsleepms is used by the tc.plugin -> ship it in the netdata component
 install(FILES
         src/collectors/charts.d.plugin/loopsleepms.sh.inc
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(FILES
         src/collectors/charts.d.plugin/charts.d.conf
         COMPONENT plugin-chartsd
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 install(PROGRAMS
         src/collectors/charts.d.plugin/ap/ap.chart.sh
@@ -2772,7 +2768,7 @@
         src/collectors/charts.d.plugin/opensips/opensips.chart.sh
         src/collectors/charts.d.plugin/sensors/sensors.chart.sh
         COMPONENT plugin-chartsd
-        DESTINATION usr/libexec/netdata/charts.d)
+        DESTINATION libexec/netdata/charts.d)
 
 install(FILES
         src/collectors/charts.d.plugin/ap/ap.conf
@@ -2782,13 +2778,13 @@
         src/collectors/charts.d.plugin/opensips/opensips.conf
         src/collectors/charts.d.plugin/sensors/sensors.conf
         COMPONENT plugin-chartsd
-        DESTINATION usr/lib/netdata/conf.d/charts.d)
+        DESTINATION lib/netdata/conf.d/charts.d)
 
 if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-chartsd
-                DESTINATION usr/share/doc/netdata-plugin-chartsd)
+                DESTINATION share/doc/netdata-plugin-chartsd)
 endif()
 
 #
@@ -2799,14 +2795,14 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/tc.plugin/tc-qos-helper.sh
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 # confs
 install(FILES
         src/collectors/systemd-journal.plugin/schema.d/systemd-journal%3Amonitored-directories.json
         src/health/schema.d/health%3Aalert%3Aprototype.json
         COMPONENT netdata
-        DESTINATION usr/lib/netdata/conf.d/schema.d)
+        DESTINATION lib/netdata/conf.d/schema.d)
 
 #
 # python.d plugin
@@ -2815,15 +2811,15 @@
 configure_file(src/collectors/python.d.plugin/python.d.plugin.in src/collectors/python.d.plugin/python.d.plugin @ONLY)
 install(PROGRAMS ${CMAKE_BINARY_DIR}/src/collectors/python.d.plugin/python.d.plugin
         COMPONENT plugin-pythond
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(DIRECTORY src/collectors/python.d.plugin/python_modules
         COMPONENT plugin-pythond
-        DESTINATION usr/libexec/netdata/python.d)
+        DESTINATION libexec/netdata/python.d)
 
 install(FILES src/collectors/python.d.plugin/python.d.conf
         COMPONENT plugin-pythond
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 install(FILES
         src/collectors/python.d.plugin/alarms/alarms.conf
@@ -2864,7 +2860,7 @@
         src/collectors/python.d.plugin/w1sensor/w1sensor.conf
         src/collectors/python.d.plugin/zscores/zscores.conf
         COMPONENT plugin-pythond
-        DESTINATION usr/lib/netdata/conf.d/python.d)
+        DESTINATION lib/netdata/conf.d/python.d)
 
 install(FILES
         src/collectors/python.d.plugin/alarms/alarms.chart.py
@@ -2905,13 +2901,13 @@
         src/collectors/python.d.plugin/w1sensor/w1sensor.chart.py
         src/collectors/python.d.plugin/zscores/zscores.chart.py
         COMPONENT plugin-pythond
-        DESTINATION usr/libexec/netdata/python.d)
+        DESTINATION libexec/netdata/python.d)
 
 if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-pythond
-                DESTINATION usr/share/doc/netdata-plugin-pythond)
+                DESTINATION share/doc/netdata-plugin-pythond)
 endif()
 
 #
@@ -2921,7 +2917,7 @@
 configure_file(src/collectors/ioping.plugin/ioping.plugin.in src/collectors/ioping.plugin/ioping.plugin @ONLY)
 install(PROGRAMS ${CMAKE_BINARY_DIR}/src/collectors/ioping.plugin/ioping.plugin
         COMPONENT netdata
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 #
 # go.d.plugin
@@ -2929,29 +2925,29 @@
 if(ENABLE_PLUGIN_GO)
     install(FILES src/go/collectors/go.d.plugin/config/go.d.conf
             COMPONENT plugin-go
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     install(DIRECTORY
             COMPONENT plugin-go
-            DESTINATION usr/lib/netdata/conf.d/go.d)
+            DESTINATION lib/netdata/conf.d/go.d)
     file(GLOB GO_CONF_FILES src/go/collectors/go.d.plugin/config/go.d/*.conf)
     install(FILES ${GO_CONF_FILES}
             COMPONENT plugin-go
-            DESTINATION usr/lib/netdata/conf.d/go.d)
+            DESTINATION lib/netdata/conf.d/go.d)
 
     install(DIRECTORY
             COMPONENT plugin-go
-            DESTINATION usr/lib/netdata/conf.d/go.d/sd)
+            DESTINATION lib/netdata/conf.d/go.d/sd)
     file(GLOB GO_SD_CONF_FILES src/go/collectors/go.d.plugin/config/go.d/sd/*.conf)
     install(FILES ${GO_SD_CONF_FILES}
             COMPONENT plugin-go
-            DESTINATION usr/lib/netdata/conf.d/go.d/sd)
+            DESTINATION lib/netdata/conf.d/go.d/sd)
 
     if(BUILD_FOR_PACKAGING)
         install(FILES
                 ${PKG_FILES_PATH}/copyright
                 COMPONENT plugin-go
-                DESTINATION usr/share/doc/netdata-plugin-go)
+                DESTINATION share/doc/netdata-plugin-go)
     endif()
 endif()
 




--- Makefile.am.orig	2023-07-23 18:43:42.030677684 -0600
+++ Makefile.am	2023-07-23 18:44:09.820603732 -0600
@@ -39,7 +39,6 @@
     build/m4/ax_c__generic.m4 \
     build/m4/ax_compiler_vendor.m4 \
     build/m4/ax_cxx_compile_stdcxx.m4 \
-    ml/dlib \
     README.md \
     LICENSE \
     REDISTRIBUTED.md \
@@ -254,16 +253,15 @@
     ml/ad_charts.h \
     ml/ad_charts.cc \
     ml/Config.cc \
-    ml/dlib/dlib/all/source.cpp \
     ml/ml-private.h \
     ml/ml.cc \
     $(NULL)
 
 # Disable warnings from dlib library
-ml/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow -Wno-psabi
+# ml/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow -Wno-psabi
 
 # Disable ml warnings
-ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi
+# ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi
 
 endif
 




--- collectors/python.d.plugin/Makefile.am.orig	2022-06-08 15:49:44 UTC
+++ collectors/python.d.plugin/Makefile.am
@@ -125,108 +125,3 @@ dist_third_party_DATA = \
     python_modules/third_party/filelock.py \
     $(NULL)
 
-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
-dist_pythonyaml2_DATA = \
-    python_modules/pyyaml2/__init__.py \
-    python_modules/pyyaml2/composer.py \
-    python_modules/pyyaml2/constructor.py \
-    python_modules/pyyaml2/cyaml.py \
-    python_modules/pyyaml2/dumper.py \
-    python_modules/pyyaml2/emitter.py \
-    python_modules/pyyaml2/error.py \
-    python_modules/pyyaml2/events.py \
-    python_modules/pyyaml2/loader.py \
-    python_modules/pyyaml2/nodes.py \
-    python_modules/pyyaml2/parser.py \
-    python_modules/pyyaml2/reader.py \
-    python_modules/pyyaml2/representer.py \
-    python_modules/pyyaml2/resolver.py \
-    python_modules/pyyaml2/scanner.py \
-    python_modules/pyyaml2/serializer.py \
-    python_modules/pyyaml2/tokens.py \
-    $(NULL)
-
-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
-dist_pythonyaml3_DATA = \
-    python_modules/pyyaml3/__init__.py \
-    python_modules/pyyaml3/composer.py \
-    python_modules/pyyaml3/constructor.py \
-    python_modules/pyyaml3/cyaml.py \
-    python_modules/pyyaml3/dumper.py \
-    python_modules/pyyaml3/emitter.py \
-    python_modules/pyyaml3/error.py \
-    python_modules/pyyaml3/events.py \
-    python_modules/pyyaml3/loader.py \
-    python_modules/pyyaml3/nodes.py \
-    python_modules/pyyaml3/parser.py \
-    python_modules/pyyaml3/reader.py \
-    python_modules/pyyaml3/representer.py \
-    python_modules/pyyaml3/resolver.py \
-    python_modules/pyyaml3/scanner.py \
-    python_modules/pyyaml3/serializer.py \
-    python_modules/pyyaml3/tokens.py \
-    $(NULL)
-
-python_urllib3dir=$(pythonmodulesdir)/urllib3
-dist_python_urllib3_DATA = \
-    python_modules/urllib3/__init__.py \
-    python_modules/urllib3/_collections.py \
-    python_modules/urllib3/connection.py \
-    python_modules/urllib3/connectionpool.py \
-    python_modules/urllib3/exceptions.py \
-    python_modules/urllib3/fields.py \
-    python_modules/urllib3/filepost.py \
-    python_modules/urllib3/response.py \
-    python_modules/urllib3/poolmanager.py \
-    python_modules/urllib3/request.py \
-    $(NULL)
-
-python_urllib3_utildir=$(python_urllib3dir)/util
-dist_python_urllib3_util_DATA = \
-    python_modules/urllib3/util/__init__.py \
-    python_modules/urllib3/util/connection.py \
-    python_modules/urllib3/util/request.py \
-    python_modules/urllib3/util/response.py \
-    python_modules/urllib3/util/retry.py \
-    python_modules/urllib3/util/selectors.py \
-    python_modules/urllib3/util/ssl_.py \
-    python_modules/urllib3/util/timeout.py \
-    python_modules/urllib3/util/url.py \
-    python_modules/urllib3/util/wait.py \
-    $(NULL)
-
-python_urllib3_packagesdir=$(python_urllib3dir)/packages
-dist_python_urllib3_packages_DATA = \
-    python_modules/urllib3/packages/__init__.py \
-    python_modules/urllib3/packages/ordered_dict.py \
-    python_modules/urllib3/packages/six.py \
-    $(NULL)
-
-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
-dist_python_urllib3_backports_DATA = \
-    python_modules/urllib3/packages/backports/__init__.py \
-    python_modules/urllib3/packages/backports/makefile.py \
-    $(NULL)
-
-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
-dist_python_urllib3_ssl_match_hostname_DATA = \
-    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
-    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
-    $(NULL)
-
-python_urllib3_contribdir=$(python_urllib3dir)/contrib
-dist_python_urllib3_contrib_DATA = \
-    python_modules/urllib3/contrib/__init__.py \
-    python_modules/urllib3/contrib/appengine.py \
-    python_modules/urllib3/contrib/ntlmpool.py \
-    python_modules/urllib3/contrib/pyopenssl.py \
-    python_modules/urllib3/contrib/securetransport.py \
-    python_modules/urllib3/contrib/socks.py \
-    $(NULL)
-
-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
-dist_python_urllib3_securetransport_DATA = \
-    python_modules/urllib3/contrib/_securetransport/__init__.py \
-    python_modules/urllib3/contrib/_securetransport/bindings.py \
-    python_modules/urllib3/contrib/_securetransport/low_level.py \
-    $(NULL)

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python.d.plugin.in (-10 lines)
1	--- collectors/python.d.plugin/python.d.plugin.in.orig 2022-02-03 22:42:27 UTC
2	+++ collectors/python.d.plugin/python.d.plugin.in
3	@@ -1,6 +1,6 @@
4	#!/usr/bin/env bash
5	'''':;
6	-pybinary=$(which python3 \|\| which python \|\| which python2)
7	+pybinary=%%PYTHON%%
8	filtered=()
9	for arg in "$@"
10	do




--- collectors/python.d.plugin/python_modules/bases/loaders.py.orig	2020-02-21 01:50:30 UTC
+++ collectors/python.d.plugin/python_modules/bases/loaders.py
@@ -10,9 +10,9 @@ PY_VERSION = version_info[:2]
 
 try:
     if PY_VERSION > (3, 1):
-        from pyyaml3 import SafeLoader as YamlSafeLoader
+        from yaml import SafeLoader as YamlSafeLoader
     else:
-        from pyyaml2 import SafeLoader as YamlSafeLoader
+        from yaml import SafeLoader as YamlSafeLoader
 except ImportError:
     from yaml import SafeLoader as YamlSafeLoader
 




--- configure.ac.orig	2023-10-30 12:43:22 UTC
+++ configure.ac
@@ -5,11 +5,11 @@
 AC_PREREQ(2.60)
 
 # We do not use m4_esyscmd_s to support older autoconf.
-define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n']))
-define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n']))
-m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
+# define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n']))
+# define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n']))
+# m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
 
-AC_INIT([netdata], VERSION_STRING[])
+AC_INIT([netdata], v%%DISTVERSION%%)
 
 AM_MAINTAINER_MODE([disable])
 if test x"$USE_MAINTAINER_MODE" = xyes; then
@@ -243,7 +243,7 @@ fi
 # C++ version check
 
 # Check for C++17 support (optional)
-# AX_CXX_COMPILE_STDCXX(17, noext, optional)
+AX_CXX_COMPILE_STDCXX(17, noext, optional)
 
 if test "x$HAVE_CXX17" != "x1"; then
   # Check for C++11 support (optional)
@@ -1416,15 +1416,15 @@ 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"
     AC_DEFINE([HAVE_DLIB], [1], [dlib availability])
-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.])
@@ -1444,8 +1444,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
 
 
@@ -1850,14 +1850,14 @@ AC_SUBST([OPTIONAL_DL_LIBS])
 
 AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
 
-varlibdir="${localstatedir}/lib/netdata"
-registrydir="${localstatedir}/lib/netdata/registry"
-cachedir="${localstatedir}/cache/netdata"
+varlibdir="%%NETDATA_PERST%%"
+registrydir="%%NETDATA_PERST%%/registry"
+cachedir="%%NETDATA_CACHE%%"
 chartsdir="${libexecdir}/netdata/charts.d"
 pythondir="${libexecdir}/netdata/python.d"
-configdir="${sysconfdir}/netdata"
+configdir="%%ETCDIR%%"
 libconfigdir="${libdir}/netdata/conf.d"
-logdir="${localstatedir}/log/netdata"
+logdir="%%NETDATA_LOG%%"
 pluginsdir="${libexecdir}/netdata/plugins.d"
 netdata_user="${with_user}"
 libsysdir="${libdir}/netdata/system"




--- daemon/analytics.c.orig	2023-08-09 18:44:44.805963000 +0000
+++ daemon/analytics.c	2023-08-09 19:09:09.490652000 +0000
@@ -831,6 +831,12 @@
         setenv("NETDATA_UPDATE_EVERY", b, 1);
     }
 
+    netdata_log_error("NETDATA_CACHE_DIR: %s", netdata_configured_cache_dir);
+    netdata_log_error("NETDATA_LIB_DIR: %s", netdata_configured_varlib_dir);
+    netdata_log_error("NETDATA_LOCK_DIR: %s", netdata_configured_lock_dir);
+    netdata_log_error("NETDATA_LOG_DIR: %s", netdata_configured_log_dir);
+    netdata_log_error("HOME: %s", netdata_configured_home_dir);
+
     setenv("NETDATA_VERSION", program_version, 1);
     setenv("NETDATA_HOSTNAME", netdata_configured_hostname, 1);
     setenv("NETDATA_CONFIG_DIR", verify_required_directory(netdata_configured_user_config_dir), 1);




--- daemon/main.c.orig	2023-08-09 19:47:06.833144000 +0000
+++ daemon/main.c	2023-08-09 19:47:43.035728000 +0000
@@ -1108,8 +1108,7 @@
     netdata_configured_web_dir          = config_get(CONFIG_SECTION_DIRECTORIES, "web",          netdata_configured_web_dir);
     netdata_configured_cache_dir        = config_get(CONFIG_SECTION_DIRECTORIES, "cache",        netdata_configured_cache_dir);
     netdata_configured_varlib_dir       = config_get(CONFIG_SECTION_DIRECTORIES, "lib",          netdata_configured_varlib_dir);
-    char *env_home=getenv("HOME");
-    netdata_configured_home_dir         = config_get(CONFIG_SECTION_DIRECTORIES, "home",         env_home?env_home:netdata_configured_home_dir);
+    netdata_configured_home_dir         = config_get(CONFIG_SECTION_DIRECTORIES, "home",         netdata_configured_home_dir);
 
     netdata_configured_lock_dir = initialize_lock_directory_path(netdata_configured_varlib_dir);
 




--- packaging/cmake/Modules/FindGo.cmake.orig	2024-06-21 12:43:20.993717000 -0600
+++ packaging/cmake/Modules/FindGo.cmake	2024-06-21 12:43:31.299336000 -0600
@@ -16,8 +16,8 @@
 endif()
 
 # Two passes are needed here so that we prefer a copy in `/usr/local/go/bin` over a system copy.
-find_program(GO_EXECUTABLE go PATHS /usr/local/go/bin DOC "Go toolchain" NO_DEFAULT_PATH)
-find_program(GO_EXECUTABLE go DOC "Go toolchain")
+find_program(GO_EXECUTABLE go122 PATHS /usr/local/go/bin DOC "Go toolchain" NO_DEFAULT_PATH)
+find_program(GO_EXECUTABLE go122 DOC "Go toolchain")
 
 if (GO_EXECUTABLE)
   execute_process(




--- packaging/cmake/Modules/NetdataVersion.cmake.orig	2024-06-19 12:02:27.648018000 -0600
+++ packaging/cmake/Modules/NetdataVersion.cmake	2024-06-19 12:04:00.808981000 -0600
@@ -7,24 +7,25 @@
 # packaging/version. This version field are used for cmake's project,
 # cpack's packaging, and the agent's functionality.
 function(netdata_version)
-        find_package(Git)
+        #find_package(Git)
 
-        if(GIT_EXECUTABLE)
-                execute_process(COMMAND ${GIT_EXECUTABLE} describe
-                                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                                RESULT_VARIABLE GIT_DESCRIBE_RESULT
-                                OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT)
-                if(GIT_DESCRIBE_RESULT)
-                        file(STRINGS "${CMAKE_SOURCE_DIR}/packaging/version" GIT_DESCRIBE_OUTPUT)
-                        message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
-                endif()
-        else()
-                file(STRINGS packaging/version GIT_DESCRIBE_OUTPUT)
-                message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
-        endif()
+        #if(GIT_EXECUTABLE)
+        #        execute_process(COMMAND ${GIT_EXECUTABLE} describe
+        #                        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        #                        RESULT_VARIABLE GIT_DESCRIBE_RESULT
+        #                        OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT)
+        #        if(GIT_DESCRIBE_RESULT)
+        #                file(STRINGS "${CMAKE_SOURCE_DIR}/packaging/version" GIT_DESCRIBE_OUTPUT)
+        #                message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
+        #        endif()
+        #else()
+        #        file(STRINGS packaging/version GIT_DESCRIBE_OUTPUT)
+        #        message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
+        #endif()
 
+        set(GIT_DESCRIBE_OUTPUT "v%%DISTVERSION%%")
         string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
         set(NETDATA_VERSION_STRING "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE)
 
         string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}")
         if(CMAKE_MATCH_COUNT EQUAL 3)




--- src/collectors/freebsd.plugin/freebsd_kstat_zfs.c.orig	2024-03-31 10:39:09.673965000 -0600
+++ src/collectors/freebsd.plugin/freebsd_kstat_zfs.c	2024-03-31 10:42:06.464560000 -0600
@@ -46,7 +46,9 @@
         int hash_collisions[5];
         int hash_chains[5];
         int hash_chain_max[5];
-        int p[5];
+        int meta[5];
+        int pd[5];
+        int pm[5];
         int c[5];
         int c_min[5];
         int c_max[5];
@@ -149,7 +151,9 @@
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hash_collisions", mibs.hash_collisions, arcstats.hash_collisions);
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hash_chains", mibs.hash_chains, arcstats.hash_chains);
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hash_chain_max", mibs.hash_chain_max, arcstats.hash_chain_max);
-    GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.p", mibs.p, arcstats.p);
+    GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.meta", mibs.meta, arcstats.meta);
+    GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.pd", mibs.pd, arcstats.pd);
+    GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.pm", mibs.pm, arcstats.pm);
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.c", mibs.c, arcstats.c);
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.c_min", mibs.c_min, arcstats.c_min);
     GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.c_max", mibs.c_max, arcstats.c_max);

Added Link Here

(-)b/net-mgmt/netdata/files/patch-src_collectors_proc.plugin_zfs_common.c (+11 lines)
1	--- src/collectors/proc.plugin/zfs_common.c.orig 2024-03-31 10:56:52.940538000 -0600
2	+++ src/collectors/proc.plugin/zfs_common.c 2024-03-31 10:57:14.548585000 -0600
3	@@ -560,7 +560,7 @@
4	//unsigned long long anon_hits = arcstats.hits - (arcstats.mfu_hits + arcstats.mru_hits + arcstats.mfu_ghost_hits + arcstats.mru_ghost_hits);
5
6	unsigned long long arc_size = arcstats.size;
7	- unsigned long long mru_size = arcstats.p;
8	+ unsigned long long mru_size = arcstats.mru_size;
9	//unsigned long long target_min_size = arcstats.c_min;
10	//unsigned long long target_max_size = arcstats.c_max;
11	unsigned long long target_size = arcstats.c;




--- src/collectors/proc.plugin/zfs_common.h.orig	2024-03-31 10:48:44.195193000 -0600
+++ src/collectors/proc.plugin/zfs_common.h	2024-03-31 10:49:05.669412000 -0600
@@ -40,7 +40,9 @@
     unsigned long long hash_collisions;
     unsigned long long hash_chains;
     unsigned long long hash_chain_max;
-    unsigned long long p;
+    unsigned long long meta;
+    unsigned long long pd;
+    unsigned long long pm;
     unsigned long long c;
     unsigned long long c_min;
     unsigned long long c_max;

Added Link Here

(-)b/net-mgmt/netdata/files/patch-src_collectors_python.d.plugin_python.d.plugin.in (+10 lines)
1	--- src/collectors/python.d.plugin/python.d.plugin.in.orig 2024-03-30 12:40:40 UTC
2	+++ src/collectors/python.d.plugin/python.d.plugin.in
3	@@ -1,6 +1,6 @@
4	#!/usr/bin/env bash
5	'''':;
6	-pybinary=$(which python3 \|\| which python \|\| which python2)
7	+pybinary=$(which %%PYTHON_VERSION%% \|\| which python \|\| which python2)
8	filtered=()
9	for arg in "$@"
10	do

Added Link Here

(-)b/net-mgmt/netdata/files/patch-src_ml_ml-private.h (+11 lines)
1	--- src/ml/ml-private.h.orig 2024-05-24 20:20:34.243791000 -0600
2	+++ src/ml/ml-private.h 2024-05-24 20:21:41.401584000 -0600
3	@@ -3,7 +3,7 @@
4	#ifndef NETDATA_ML_PRIVATE_H
5	#define NETDATA_ML_PRIVATE_H
6
7	-#include "dlib/dlib/matrix.h"
8	+#include "dlib/matrix.h"
9
10	// CentOS 7 shenanigans
11	#include <cmath>

Added Link Here

(-)b/net-mgmt/netdata/files/patch-src_ml_ml.cc (+10 lines)
1	--- src/ml/ml.cc.orig 2024-03-30 08:07:26 UTC
2	+++ src/ml/ml.cc
3	@@ -1,6 +1,6 @@
4	// SPDX-License-Identifier: GPL-3.0-or-later
5
6	-#include "dlib/dlib/clustering.h"
7	+#include "dlib/clustering.h"
8
9	#include "ml-private.h"
10




%%ETCDIR%%/.install-type
%%ETCDIR%%/.opt-out-from-anonymous-statistics
%%ETCDIR%%/edit-config
etc/logrotate.d/netdata
@sample(netdata,netdata,0640) %%ETCDIR%%/netdata.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/apps_groups.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/netdata-updater.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/netdata.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/ap.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/apcupsd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/example.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/libreswan.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/nut.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/opensips.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/charts.d/sensors.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/cachestat.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/dcstat.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/disk.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/ebpf_kernel_reject_list.txt.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/fd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/filesystem.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/hardirq.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/mdflush.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/mount.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/network.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/oomkill.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/process.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/shm.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/softirq.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/swap.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/sync.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ebpf.d/vfs.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/exporting.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/adaptec_raid.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/anomalies.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/apcupsd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/bcache.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/beanstalkd.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/bind_rndc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/boinc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/btrfs.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ceph.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cgroups.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/clickhouse.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cockroachdb.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/consul.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cpu.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/kubelet.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/linux_power_supply.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/load.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/lvm.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/megacli.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/mdstat.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/memcached.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/memory.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ml.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/mysql.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/net.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/netfilter.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/nut.conf.sample
@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/riakkv.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/scaleio.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/softnet.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/storcli.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/swap.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/synchronization.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/systemdunits.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/health_alarm_notify.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/health_email_recipients.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/ioping.conf.sample
lib/netdata/conf.d/log2journal.d/default.yaml
lib/netdata/conf.d/log2journal.d/nginx-combined.yaml
lib/netdata/conf.d/log2journal.d/nginx-json.yaml
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/activemq.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/adaptec_raid.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/apache.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/bind.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/cassandra.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/chrony.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/clickhouse.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/cockroachdb.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/consul.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/coredns.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/couchbase.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/couchdb.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dns_query.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsdist.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsmasq.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dnsmasq_dhcp.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dmcache.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/docker.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/docker_engine.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/dockerhub.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/elasticsearch.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/envoy.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/example.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/fail2ban.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/filecheck.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/fluentd.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/freeradius.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/geth.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/haproxy.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/hddtemp.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/hdfs.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/hpssa.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/httpcheck.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/intelgpu.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/isc_dhcpd.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_kubelet.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_kubeproxy.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/k8s_state.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/lighttpd.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/litespeed.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/logind.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/logstash.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/lvm.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/megacli.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/mongodb.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/mysql.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginx.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginxplus.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nginxvts.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/ntpd.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nvidia_smi.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/nvme.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/openvpn.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/openvpn_status_log.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pgbouncer.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/phpdaemon.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/phpfpm.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pihole.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pika.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/ping.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/portcheck.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/postgres.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/powerdns.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/powerdns_recursor.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/prometheus.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/proxysql.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/pulsar.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/rabbitmq.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/redis.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/rspamd.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/scaleio.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/sd/docker.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/sd/net_listeners.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/sensors.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/smartctl.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/snmp.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/squidlog.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/storcli.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/supervisord.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/systemdunits.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/tengine.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/traefik.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/unbound.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/upsd.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vcsa.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vernemq.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/vsphere.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/web_log.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/whoisquery.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/windows.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/wireguard.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/x509check.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/zfspool.conf.sample
%%GOPLUGIN%%@sample(netdata,netdata,0640) lib/netdata/conf.d/go.d/zookeeper.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/adaptec_raid.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/alarms.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/am2320.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/anomalies.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/beanstalk.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/bind_rndc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/boinc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ceph.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/changefinder.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/dovecot.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/example.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/exim.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/fail2ban.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/gearman.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/go_expvar.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/haproxy.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/hddtemp.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/hpssa.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/icecast.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/ipfs.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/litespeed.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/megacli.conf.sample
@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/retroshare.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/riakkv.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/samba.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/sensors.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/smartd_log.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/spigotmc.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/squid.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/tomcat.conf.sample

@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/varnish.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/w1sensor.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/zscores.conf.sample
lib/netdata/conf.d/schema.d/health%3Aalert%3Aprototype.json
lib/netdata/conf.d/schema.d/systemd-journal%3Amonitored-directories.json
@sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/asterisk.conf.sample
@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

libexec/netdata/charts.d/apcupsd.chart.sh
libexec/netdata/charts.d/example.chart.sh
libexec/netdata/charts.d/libreswan.chart.sh
libexec/netdata/charts.d/nut.chart.sh
libexec/netdata/charts.d/opensips.chart.sh
libexec/netdata/charts.d/sensors.chart.sh
libexec/netdata/install-service.sh

libexec/netdata/plugins.d/health-cmdapi-test.sh
libexec/netdata/plugins.d/ioping.plugin
libexec/netdata/plugins.d/loopsleepms.sh.inc
libexec/netdata/plugins.d/ndsudo
%%GOPLUGIN%%libexec/netdata/plugins.d/go.d.plugin
libexec/netdata/plugins.d/python.d.plugin
libexec/netdata/plugins.d/request.sh
libexec/netdata/plugins.d/system-info.sh
libexec/netdata/plugins.d/tc-qos-helper.sh
libexec/netdata/plugins.d/template_dim.sh
libexec/netdata/python.d/adaptec_raid.chart.py
libexec/netdata/python.d/alarms.chart.py
libexec/netdata/python.d/am2320.chart.py
libexec/netdata/python.d/anomalies.chart.py
libexec/netdata/python.d/beanstalk.chart.py
libexec/netdata/python.d/bind_rndc.chart.py
libexec/netdata/python.d/boinc.chart.py
libexec/netdata/python.d/ceph.chart.py
libexec/netdata/python.d/changefinder.chart.py
libexec/netdata/python.d/dovecot.chart.py
libexec/netdata/python.d/example.chart.py
libexec/netdata/python.d/exim.chart.py
libexec/netdata/python.d/fail2ban.chart.py
libexec/netdata/python.d/gearman.chart.py
libexec/netdata/python.d/go_expvar.chart.py
libexec/netdata/python.d/haproxy.chart.py
libexec/netdata/python.d/hddtemp.chart.py
libexec/netdata/python.d/hpssa.chart.py
libexec/netdata/python.d/icecast.chart.py
libexec/netdata/python.d/ipfs.chart.py
libexec/netdata/python.d/litespeed.chart.py
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/retroshare.chart.py
libexec/netdata/python.d/riakkv.chart.py
libexec/netdata/python.d/samba.chart.py
libexec/netdata/python.d/sensors.chart.py
libexec/netdata/python.d/smartd_log.chart.py
libexec/netdata/python.d/spigotmc.chart.py
libexec/netdata/python.d/squid.chart.py
libexec/netdata/python.d/tomcat.chart.py

libexec/netdata/python.d/varnish.chart.py
libexec/netdata/python.d/w1sensor.chart.py
libexec/netdata/python.d/zscores.chart.py
sbin/log2journal
sbin/netdata
%%CLOUD%%sbin/netdata-claim.sh
sbin/netdatacli
sbin/systemd-cat-native
%%DATADIR%%/web/.well-known/dnt/cookies
%%DATADIR%%/web/asset-manifest.json
%%DATADIR%%/web/console.html

%%DATADIR%%/web/tv.html
%%DATADIR%%/web/v0/index.html
%%DATADIR%%/web/v1/index.html
%%DATADIR%%/web/v2/1220.01d6bbaab869c74f4437.chunk.js
%%DATADIR%%/web/v2/1396.56f70d7c659ac0b694cd.chunk.js
%%DATADIR%%/web/v2/1396.56f70d7c659ac0b694cd.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/1418.16d53ba5cce2c6a8143a.chunk.js
%%DATADIR%%/web/v2/1782.d82eb301aa81b380dd0c.chunk.js
%%DATADIR%%/web/v2/1839.a4196d2a87ac0fdd9f34.chunk.js
%%DATADIR%%/web/v2/185.42bab351ba68de7ca4aa.chunk.js
%%DATADIR%%/web/v2/1876.e610906417b961290730.chunk.js
%%DATADIR%%/web/v2/195.4cdbea6af54d14a95949.chunk.js
%%DATADIR%%/web/v2/2007.b33ce2b4b736228fd681.chunk.js
%%DATADIR%%/web/v2/252.40edc9b0f6da1422f40b.chunk.js
%%DATADIR%%/web/v2/3104.3b70865e21a81a616af3.chunk.js
%%DATADIR%%/web/v2/3350.ae7151980981854dc3d1.chunk.js
%%DATADIR%%/web/v2/3455.f9ca876de57244386773.chunk.js
%%DATADIR%%/web/v2/3455.f9ca876de57244386773.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/3624.bfeb1fdc3057ba82ddac.chunk.js
%%DATADIR%%/web/v2/3736.e572adfdf7951f74a741.chunk.js
%%DATADIR%%/web/v2/3750.4ad02f036f2a7c520b1c.chunk.js
%%DATADIR%%/web/v2/3843.89070793921be1288bb5.css
%%DATADIR%%/web/v2/3843.ffbb6f614ba4f7b77570.chunk.js
%%DATADIR%%/web/v2/3968.483ca2ad3b300293e655.chunk.js
%%DATADIR%%/web/v2/3621.01ee70ee9c311ac163d9.chunk.js
%%DATADIR%%/web/v2/3D_PARTY_LICENSES.txt
%%DATADIR%%/web/v2/4034.35199d2809d318eed690.chunk.js
%%DATADIR%%/web/v2/4140.46221d08bcda08826c78.chunk.js
%%DATADIR%%/web/v2/4140.89070793921be1288bb5.css
%%DATADIR%%/web/v2/4414.590ba07d470ba2ce7dd0.chunk.js
%%DATADIR%%/web/v2/4631.158982e127e11bdc6a45.chunk.js
%%DATADIR%%/web/v2/4680.7d8122d91e9d4582836a.chunk.js
%%DATADIR%%/web/v2/4958.5969fedc1ff7dc82775e.chunk.js
%%DATADIR%%/web/v2/5246.07c5a1649f0805c140fe.chunk.js
%%DATADIR%%/web/v2/5304.cc797fdd343c7e873b2f.chunk.js
%%DATADIR%%/web/v2/5426.254557ad3e1f2d14ad29.chunk.js
%%DATADIR%%/web/v2/5596.2036706750ff4028cff2.chunk.js
%%DATADIR%%/web/v2/5598.07ff43a6b96bd41e8637.chunk.js
%%DATADIR%%/web/v2/5700.b7c9908dc7f30a5a57e7.chunk.js
%%DATADIR%%/web/v2/5709.c494eb62187917e2f2f6.chunk.js
%%DATADIR%%/web/v2/5709.c494eb62187917e2f2f6.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/5794.252ff787d58d64eb4988.chunk.js
%%DATADIR%%/web/v2/6008.3d0636fe17f4f6274485.chunk.js
%%DATADIR%%/web/v2/6121.f7286809e53e1c6d655a.chunk.js
%%DATADIR%%/web/v2/6121.f7286809e53e1c6d655a.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/6323.26d4d949c9b6f8674c2e.chunk.js
%%DATADIR%%/web/v2/6331.89070793921be1288bb5.css
%%DATADIR%%/web/v2/6331.c91b5d104cdff1be3b80.chunk.js
%%DATADIR%%/web/v2/6384.0fad56b0bc902f186c98.chunk.js
%%DATADIR%%/web/v2/6469.47926fa38028dc7d0d41.chunk.js
%%DATADIR%%/web/v2/6469.89070793921be1288bb5.css
%%DATADIR%%/web/v2/6661.72f782bd78fea8c2d836.chunk.js
%%DATADIR%%/web/v2/6760.370b9780120c145da28f.chunk.js
%%DATADIR%%/web/v2/683.02c173493ef257c210fa.chunk.js
%%DATADIR%%/web/v2/683.cc9fa5f3bdc0bf3ab2fc.css
%%DATADIR%%/web/v2/6944.ab3e70c9ac0f05013b5f.chunk.js
%%DATADIR%%/web/v2/7144.382c341e09540fdebaa6.chunk.js
%%DATADIR%%/web/v2/7144.382c341e09540fdebaa6.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/7146.79304e386ac9238b7cf1.chunk.js
%%DATADIR%%/web/v2/7170.5d6047bb6ce9d77d53db.chunk.js
%%DATADIR%%/web/v2/7208.1d75cf5d007de32e403b.chunk.js
%%DATADIR%%/web/v2/7304.ed4690ec296b59fbe7fd.chunk.js
%%DATADIR%%/web/v2/7332.3acf93dcfa52c7f1bc18.chunk.js
%%DATADIR%%/web/v2/7340.25dce1c5cc66b613700f.chunk.js
%%DATADIR%%/web/v2/7436.1ebd371d70e6a87c5499.chunk.js
%%DATADIR%%/web/v2/7471.f96c4d04a73fb7551c03.chunk.js
%%DATADIR%%/web/v2/7487.89070793921be1288bb5.css
%%DATADIR%%/web/v2/7487.db63c95c27d973a07d9b.chunk.js
%%DATADIR%%/web/v2/749.e44087ac3a2e3a994318.chunk.js
%%DATADIR%%/web/v2/749.e44087ac3a2e3a994318.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/7519.7982a2e0fcdf82ba78dd.chunk.js
%%DATADIR%%/web/v2/7529.658d363e12e73df83b60.chunk.js
%%DATADIR%%/web/v2/7840.2f2023f2eb1dcc943d94.chunk.js
%%DATADIR%%/web/v2/785.d016913841bcc0209d5b.chunk.js
%%DATADIR%%/web/v2/7857.813ae058cca579e05462.chunk.js
%%DATADIR%%/web/v2/7959.4f20f4b203e2bad8af39.chunk.js
%%DATADIR%%/web/v2/8059.4fdc76bb2cac1f74b41b.chunk.js
%%DATADIR%%/web/v2/8239.c85fc9f3599f198a9efb.chunk.js
%%DATADIR%%/web/v2/8323.437406936b642e8f6cb3.chunk.js
%%DATADIR%%/web/v2/8323.437406936b642e8f6cb3.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/8323.e22de33686bb2f34063c.css
%%DATADIR%%/web/v2/8505.c330f2104fefd71717da.chunk.js
%%DATADIR%%/web/v2/86.2c88d4d37b88e2620051.chunk.js
%%DATADIR%%/web/v2/8637.0958494526e838a60d2b.js
%%DATADIR%%/web/v2/8637.0958494526e838a60d2b.js.LICENSE.txt
%%DATADIR%%/web/v2/8784.a04e9c07186e1f057f56.chunk.js
%%DATADIR%%/web/v2/8842.406028f523a00acb97bd.chunk.js
%%DATADIR%%/web/v2/8910.019974f8675d8834dd07.chunk.js
%%DATADIR%%/web/v2/8938.5116982f737a2ef85330.chunk.js
%%DATADIR%%/web/v2/9292.cc5055091db9a0826933.chunk.js
%%DATADIR%%/web/v2/934.24d6fdc5f60aa6493962.chunk.js
%%DATADIR%%/web/v2/9400.6250bbf86c4fd3173de2.chunk.js
%%DATADIR%%/web/v2/9473.4fd4742ffb6b5348bea8.chunk.js
%%DATADIR%%/web/v2/963.35da4a3c4e49aac29dae.chunk.js
%%DATADIR%%/web/v2/979.3e5fddf93c977e6c71c3.chunk.js
%%DATADIR%%/web/v2/9818.3ce64e0b472412bfbc97.chunk.js
%%DATADIR%%/web/v2/9843.93f8c71c64ef97b9905e.chunk.js
%%DATADIR%%/web/v2/9912.702300c2dd9616289606.chunk.js
%%DATADIR%%/web/v2/LICENSE.md
%%DATADIR%%/web/v2/agent.html
%%DATADIR%%/web/v2/allFiles.6.138.3.json
%%DATADIR%%/web/v2/allFiles.6.json
%%DATADIR%%/web/v2/app.08c9fe3ead1d43ff769b.js
%%DATADIR%%/web/v2/app.cb2e9f9a81cf9533384e.css
%%DATADIR%%/web/v2/apple-app-site-association
%%DATADIR%%/web/v2/bundlesManifest.6.json
%%DATADIR%%/web/v2/editor.cb9de08df72d187d1c0f.chunk.js
%%DATADIR%%/web/v2/favicon.ico
%%DATADIR%%/web/v2/index.html
%%DATADIR%%/web/v2/local-agent.html
%%DATADIR%%/web/v2/netdata.charts.fdfd27674ac5533bbcc2.js
%%DATADIR%%/web/v2/netdata.ui.647a4c3303ee8ec0da64.js
%%DATADIR%%/web/v2/netdata.ui.647a4c3303ee8ec0da64.js.LICENSE.txt
%%DATADIR%%/web/v2/npm.react.dom.2994f1b4604bd8ce80f6.js
%%DATADIR%%/web/v2/npm.react.dom.2994f1b4604bd8ce80f6.js.LICENSE.txt
%%DATADIR%%/web/v2/registry-access.html
%%DATADIR%%/web/v2/registry-alert-redirect.html
%%DATADIR%%/web/v2/registry-hello.html
%%DATADIR%%/web/v2/runtime.ceccffb089cc539b1c1f.js
%%DATADIR%%/web/v2/static/apple-app-site-association
%%DATADIR%%/web/v2/static/email/img/clea_badge.png
%%DATADIR%%/web/v2/static/email/img/clea_siren.png

%%DATADIR%%/web/v2/static/img/mail/isotype.svg
%%DATADIR%%/web/v2/static/img/mail/logotype.png
%%DATADIR%%/web/v2/static/img/mail/logotype.svg
%%DATADIR%%/web/v2/static/img/new-dashboard.svg
%%DATADIR%%/web/v2/static/img/no-filter-results.png
%%DATADIR%%/web/v2/static/img/no-nodes-room.svg
%%DATADIR%%/web/v2/static/img/rack.png

%%DATADIR%%/web/v2/static/site/pages/holding-page-503/reset.svg
%%DATADIR%%/web/v2/static/splash.css
%%DATADIR%%/web/v2/sw.js
%%DATADIR%%/web/version.txt
@mode
@owner
@group
@dir(netdata,netdata,0750) %%ETCDIR%%/charts.d
@dir(netdata,netdata,0750) %%ETCDIR%%/custom-plugins.d
@dir(netdata,netdata,0750) %%ETCDIR%%/ebpf.d
@dir(netdata,netdata,0750) %%ETCDIR%%/go.d
@dir(netdata,netdata,0750) %%ETCDIR%%/health.d
@dir(netdata,netdata,0750) %%ETCDIR%%/python.d

@dir(netdata,netdata,0750) %%ETCDIR%%/statsd.d
@dir(netdata,netdata,0750) %%NETDATA_CACHE%%
@dir(netdata,netdata,0750) %%NETDATA_PERST%%
@dir(netdata,netdata,0750) %%NETDATA_PERST%%/registery
@dir(netdata,netdata,0750) var/run/netdata
%%CLOUD%%@dir(netdata,netdata,0750) %%NETDATA_PERST%%/cloud.d
@dir(netdata,netdata,0750) %%NETDATA_LOG%%
- 

Return to bug 275792

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-Makefile.am (-29 lines)
1	--- Makefile.am.orig 2023-07-23 18:43:42.030677684 -0600
2	+++ Makefile.am 2023-07-23 18:44:09.820603732 -0600
3	@@ -39,7 +39,6 @@
4	build/m4/ax_c__generic.m4 \
5	build/m4/ax_compiler_vendor.m4 \
6	build/m4/ax_cxx_compile_stdcxx.m4 \
7	- ml/dlib \
8	README.md \
9	LICENSE \
10	REDISTRIBUTED.md \
11	@@ -254,16 +253,15 @@
12	ml/ad_charts.h \
13	ml/ad_charts.cc \
14	ml/Config.cc \
15	- ml/dlib/dlib/all/source.cpp \
16	ml/ml-private.h \
17	ml/ml.cc \
18	$(NULL)
19
20	# Disable warnings from dlib library
21	-ml/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow -Wno-psabi
22	+# ml/dlib/dlib/all/source.$(OBJEXT) : CXXFLAGS += -Wno-sign-compare -Wno-type-limits -Wno-aggressive-loop-optimizations -Wno-stringop-overflow -Wno-psabi
23
24	# Disable ml warnings
25	-ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi
26	+# ml/ml.$(OBJEXT) : CXXFLAGS += -Wno-psabi
27
28	endif
29

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-collectors_python.d.plugin_Makefile.am (-111 lines)
1	--- collectors/python.d.plugin/Makefile.am.orig 2022-06-08 15:49:44 UTC
2	+++ collectors/python.d.plugin/Makefile.am
3	@@ -125,108 +125,3 @@ dist_third_party_DATA = \
4	python_modules/third_party/filelock.py \
5	$(NULL)
6
7	-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
8	-dist_pythonyaml2_DATA = \
9	- python_modules/pyyaml2/__init__.py \
10	- python_modules/pyyaml2/composer.py \
11	- python_modules/pyyaml2/constructor.py \
12	- python_modules/pyyaml2/cyaml.py \
13	- python_modules/pyyaml2/dumper.py \
14	- python_modules/pyyaml2/emitter.py \
15	- python_modules/pyyaml2/error.py \
16	- python_modules/pyyaml2/events.py \
17	- python_modules/pyyaml2/loader.py \
18	- python_modules/pyyaml2/nodes.py \
19	- python_modules/pyyaml2/parser.py \
20	- python_modules/pyyaml2/reader.py \
21	- python_modules/pyyaml2/representer.py \
22	- python_modules/pyyaml2/resolver.py \
23	- python_modules/pyyaml2/scanner.py \
24	- python_modules/pyyaml2/serializer.py \
25	- python_modules/pyyaml2/tokens.py \
26	- $(NULL)
27	-
28	-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
29	-dist_pythonyaml3_DATA = \
30	- python_modules/pyyaml3/__init__.py \
31	- python_modules/pyyaml3/composer.py \
32	- python_modules/pyyaml3/constructor.py \
33	- python_modules/pyyaml3/cyaml.py \
34	- python_modules/pyyaml3/dumper.py \
35	- python_modules/pyyaml3/emitter.py \
36	- python_modules/pyyaml3/error.py \
37	- python_modules/pyyaml3/events.py \
38	- python_modules/pyyaml3/loader.py \
39	- python_modules/pyyaml3/nodes.py \
40	- python_modules/pyyaml3/parser.py \
41	- python_modules/pyyaml3/reader.py \
42	- python_modules/pyyaml3/representer.py \
43	- python_modules/pyyaml3/resolver.py \
44	- python_modules/pyyaml3/scanner.py \
45	- python_modules/pyyaml3/serializer.py \
46	- python_modules/pyyaml3/tokens.py \
47	- $(NULL)
48	-
49	-python_urllib3dir=$(pythonmodulesdir)/urllib3
50	-dist_python_urllib3_DATA = \
51	- python_modules/urllib3/__init__.py \
52	- python_modules/urllib3/_collections.py \
53	- python_modules/urllib3/connection.py \
54	- python_modules/urllib3/connectionpool.py \
55	- python_modules/urllib3/exceptions.py \
56	- python_modules/urllib3/fields.py \
57	- python_modules/urllib3/filepost.py \
58	- python_modules/urllib3/response.py \
59	- python_modules/urllib3/poolmanager.py \
60	- python_modules/urllib3/request.py \
61	- $(NULL)
62	-
63	-python_urllib3_utildir=$(python_urllib3dir)/util
64	-dist_python_urllib3_util_DATA = \
65	- python_modules/urllib3/util/__init__.py \
66	- python_modules/urllib3/util/connection.py \
67	- python_modules/urllib3/util/request.py \
68	- python_modules/urllib3/util/response.py \
69	- python_modules/urllib3/util/retry.py \
70	- python_modules/urllib3/util/selectors.py \
71	- python_modules/urllib3/util/ssl_.py \
72	- python_modules/urllib3/util/timeout.py \
73	- python_modules/urllib3/util/url.py \
74	- python_modules/urllib3/util/wait.py \
75	- $(NULL)
76	-
77	-python_urllib3_packagesdir=$(python_urllib3dir)/packages
78	-dist_python_urllib3_packages_DATA = \
79	- python_modules/urllib3/packages/__init__.py \
80	- python_modules/urllib3/packages/ordered_dict.py \
81	- python_modules/urllib3/packages/six.py \
82	- $(NULL)
83	-
84	-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
85	-dist_python_urllib3_backports_DATA = \
86	- python_modules/urllib3/packages/backports/__init__.py \
87	- python_modules/urllib3/packages/backports/makefile.py \
88	- $(NULL)
89	-
90	-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
91	-dist_python_urllib3_ssl_match_hostname_DATA = \
92	- python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
93	- python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
94	- $(NULL)
95	-
96	-python_urllib3_contribdir=$(python_urllib3dir)/contrib
97	-dist_python_urllib3_contrib_DATA = \
98	- python_modules/urllib3/contrib/__init__.py \
99	- python_modules/urllib3/contrib/appengine.py \
100	- python_modules/urllib3/contrib/ntlmpool.py \
101	- python_modules/urllib3/contrib/pyopenssl.py \
102	- python_modules/urllib3/contrib/securetransport.py \
103	- python_modules/urllib3/contrib/socks.py \
104	- $(NULL)
105	-
106	-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
107	-dist_python_urllib3_securetransport_DATA = \
108	- python_modules/urllib3/contrib/_securetransport/__init__.py \
109	- python_modules/urllib3/contrib/_securetransport/bindings.py \
110	- python_modules/urllib3/contrib/_securetransport/low_level.py \
111	- $(NULL)

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-collectors_python.d.plugin_python__modules_bases_loaders.py (-14 lines)
1	--- collectors/python.d.plugin/python_modules/bases/loaders.py.orig 2020-02-21 01:50:30 UTC
2	+++ collectors/python.d.plugin/python_modules/bases/loaders.py
3	@@ -10,9 +10,9 @@ PY_VERSION = version_info[:2]
4
5	try:
6	if PY_VERSION > (3, 1):
7	- from pyyaml3 import SafeLoader as YamlSafeLoader
8	+ from yaml import SafeLoader as YamlSafeLoader
9	else:
10	- from pyyaml2 import SafeLoader as YamlSafeLoader
11	+ from yaml import SafeLoader as YamlSafeLoader
12	except ImportError:
13	from yaml import SafeLoader as YamlSafeLoader
14

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-configure.ac (-81 lines)
1	--- configure.ac.orig 2023-10-30 12:43:22 UTC
2	+++ configure.ac
3	@@ -5,11 +5,11 @@
4	AC_PREREQ(2.60)
5
6	# We do not use m4_esyscmd_s to support older autoconf.
7	-define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null \| tr -d '\n']))
8	-define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version \| tr -d '\n']))
9	-m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
10	+# define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null \| tr -d '\n']))
11	+# define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version \| tr -d '\n']))
12	+# m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
13
14	-AC_INIT([netdata], VERSION_STRING[])
15	+AC_INIT([netdata], v%%DISTVERSION%%)
16
17	AM_MAINTAINER_MODE([disable])
18	if test x"$USE_MAINTAINER_MODE" = xyes; then
19	@@ -243,7 +243,7 @@ fi
20	# C++ version check
21
22	# Check for C++17 support (optional)
23	-# AX_CXX_COMPILE_STDCXX(17, noext, optional)
24	+AX_CXX_COMPILE_STDCXX(17, noext, optional)
25
26	if test "x$HAVE_CXX17" != "x1"; then
27	# Check for C++11 support (optional)
28	@@ -1416,15 +1416,15 @@ if test "${enable_ml}" = "yes" -a "${have_uuid}" != "y
29	fi
30
31	# Check if submodules have not been fetched. Fail if ML was explicitly requested.
32	-AC_MSG_CHECKING([if git submodules are present for machine learning functionality])
33	-if test -f "ml/dlib/dlib/all/source.cpp"; then
34	- AC_MSG_RESULT([yes])
35	+# AC_MSG_CHECKING([if git submodules are present for machine learning functionality])
36	+# if test -f "ml/dlib/dlib/all/source.cpp"; then
37	+# AC_MSG_RESULT([yes])
38	have_ml_submodules="yes"
39	AC_DEFINE([HAVE_DLIB], [1], [dlib availability])
40	-else
41	- AC_MSG_RESULT([no])
42	- have_ml_submodules="no"
43	-fi
44	+# else
45	+# AC_MSG_RESULT([no])
46	+# have_ml_submodules="no"
47	+# fi
48
49	if test "${enable_ml}" = "yes" -a "${have_ml_submodules}" = "no"; then
50	AC_MSG_ERROR([You have explicitly requested --enable-ml functionality but it cannot be built because the required git submodules are missing.])
51	@@ -1444,8 +1444,8 @@ fi
52	AM_CONDITIONAL([ENABLE_ML], [test "${build_ml}" = "yes"])
53	if test "${build_ml}" = "yes"; then
54	AC_DEFINE([ENABLE_ML], [1], [anomaly detection usability])
55	- OPTIONAL_ML_CFLAGS="-DDLIB_NO_GUI_SUPPORT -I \$(abs_top_srcdir)/ml/dlib"
56	- OPTIONAL_ML_LIBS=""
57	+# OPTIONAL_ML_CFLAGS="-DDLIB_NO_GUI_SUPPORT -I \$(abs_top_srcdir)/ml/dlib"
58	+# OPTIONAL_ML_LIBS=""
59	fi
60
61
62	@@ -1850,14 +1850,14 @@ AC_SUBST([OPTIONAL_DL_LIBS])
63
64	AC_DEFINE_UNQUOTED([NETDATA_USER], ["${with_user}"], [use this user to drop privileged])
65
66	-varlibdir="${localstatedir}/lib/netdata"
67	-registrydir="${localstatedir}/lib/netdata/registry"
68	-cachedir="${localstatedir}/cache/netdata"
69	+varlibdir="%%NETDATA_PERST%%"
70	+registrydir="%%NETDATA_PERST%%/registry"
71	+cachedir="%%NETDATA_CACHE%%"
72	chartsdir="${libexecdir}/netdata/charts.d"
73	pythondir="${libexecdir}/netdata/python.d"
74	-configdir="${sysconfdir}/netdata"
75	+configdir="%%ETCDIR%%"
76	libconfigdir="${libdir}/netdata/conf.d"
77	-logdir="${localstatedir}/log/netdata"
78	+logdir="%%NETDATA_LOG%%"
79	pluginsdir="${libexecdir}/netdata/plugins.d"
80	netdata_user="${with_user}"
81	libsysdir="${libdir}/netdata/system"

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-daemon_analytics.c (-15 lines)
1	--- daemon/analytics.c.orig 2023-08-09 18:44:44.805963000 +0000
2	+++ daemon/analytics.c 2023-08-09 19:09:09.490652000 +0000
3	@@ -831,6 +831,12 @@
4	setenv("NETDATA_UPDATE_EVERY", b, 1);
5	}
6
7	+ netdata_log_error("NETDATA_CACHE_DIR: %s", netdata_configured_cache_dir);
8	+ netdata_log_error("NETDATA_LIB_DIR: %s", netdata_configured_varlib_dir);
9	+ netdata_log_error("NETDATA_LOCK_DIR: %s", netdata_configured_lock_dir);
10	+ netdata_log_error("NETDATA_LOG_DIR: %s", netdata_configured_log_dir);
11	+ netdata_log_error("HOME: %s", netdata_configured_home_dir);
12	+
13	setenv("NETDATA_VERSION", program_version, 1);
14	setenv("NETDATA_HOSTNAME", netdata_configured_hostname, 1);
15	setenv("NETDATA_CONFIG_DIR", verify_required_directory(netdata_configured_user_config_dir), 1);

Removed Link Here

(-)a/net-mgmt/netdata/files/patch-daemon_main.c (-12 lines)
1	--- daemon/main.c.orig 2023-08-09 19:47:06.833144000 +0000
2	+++ daemon/main.c 2023-08-09 19:47:43.035728000 +0000
3	@@ -1108,8 +1108,7 @@
4	netdata_configured_web_dir = config_get(CONFIG_SECTION_DIRECTORIES, "web", netdata_configured_web_dir);
5	netdata_configured_cache_dir = config_get(CONFIG_SECTION_DIRECTORIES, "cache", netdata_configured_cache_dir);
6	netdata_configured_varlib_dir = config_get(CONFIG_SECTION_DIRECTORIES, "lib", netdata_configured_varlib_dir);
7	- char *env_home=getenv("HOME");
8	- netdata_configured_home_dir = config_get(CONFIG_SECTION_DIRECTORIES, "home", env_home?env_home:netdata_configured_home_dir);
9	+ netdata_configured_home_dir = config_get(CONFIG_SECTION_DIRECTORIES, "home", netdata_configured_home_dir);
10
11	netdata_configured_lock_dir = initialize_lock_directory_path(netdata_configured_varlib_dir);
12

Added Link Here

(-)b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_FindGo.cmake (+13 lines)
1	--- packaging/cmake/Modules/FindGo.cmake.orig 2024-06-21 12:43:20.993717000 -0600
2	+++ packaging/cmake/Modules/FindGo.cmake 2024-06-21 12:43:31.299336000 -0600
3	@@ -16,8 +16,8 @@
4	endif()
5
6	# Two passes are needed here so that we prefer a copy in `/usr/local/go/bin` over a system copy.
7	-find_program(GO_EXECUTABLE go PATHS /usr/local/go/bin DOC "Go toolchain" NO_DEFAULT_PATH)
8	-find_program(GO_EXECUTABLE go DOC "Go toolchain")
9	+find_program(GO_EXECUTABLE go122 PATHS /usr/local/go/bin DOC "Go toolchain" NO_DEFAULT_PATH)
10	+find_program(GO_EXECUTABLE go122 DOC "Go toolchain")
11
12	if (GO_EXECUTABLE)
13	execute_process(

Added Link Here

(-)b/net-mgmt/netdata/files/patch-packaging_cmake_Modules_NetdataVersion.cmake (+42 lines)
1	--- packaging/cmake/Modules/NetdataVersion.cmake.orig 2024-06-19 12:02:27.648018000 -0600
2	+++ packaging/cmake/Modules/NetdataVersion.cmake 2024-06-19 12:04:00.808981000 -0600
3	@@ -7,24 +7,25 @@
4	# packaging/version. This version field are used for cmake's project,
5	# cpack's packaging, and the agent's functionality.
6	function(netdata_version)
7	- find_package(Git)
8	+ #find_package(Git)
9
10	- if(GIT_EXECUTABLE)
11	- execute_process(COMMAND ${GIT_EXECUTABLE} describe
12	- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
13	- RESULT_VARIABLE GIT_DESCRIBE_RESULT
14	- OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT)
15	- if(GIT_DESCRIBE_RESULT)
16	- file(STRINGS "${CMAKE_SOURCE_DIR}/packaging/version" GIT_DESCRIBE_OUTPUT)
17	- message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
18	- endif()
19	- else()
20	- file(STRINGS packaging/version GIT_DESCRIBE_OUTPUT)
21	- message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
22	- endif()
23	+ #if(GIT_EXECUTABLE)
24	+ # execute_process(COMMAND ${GIT_EXECUTABLE} describe
25	+ # WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
26	+ # RESULT_VARIABLE GIT_DESCRIBE_RESULT
27	+ # OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT)
28	+ # if(GIT_DESCRIBE_RESULT)
29	+ # file(STRINGS "${CMAKE_SOURCE_DIR}/packaging/version" GIT_DESCRIBE_OUTPUT)
30	+ # message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
31	+ # endif()
32	+ #else()
33	+ # file(STRINGS packaging/version GIT_DESCRIBE_OUTPUT)
34	+ # message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
35	+ #endif()
36
37	+ set(GIT_DESCRIBE_OUTPUT "v%%DISTVERSION%%")
38	string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
39	set(NETDATA_VERSION_STRING "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE)
40
41	string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}")
42	if(CMAKE_MATCH_COUNT EQUAL 3)

Added Link Here

(-)b/net-mgmt/netdata/files/patch-src_collectors_freebsd.plugin_freebsd_kstat_zfs.c (+24 lines)
1	--- src/collectors/freebsd.plugin/freebsd_kstat_zfs.c.orig 2024-03-31 10:39:09.673965000 -0600
2	+++ src/collectors/freebsd.plugin/freebsd_kstat_zfs.c 2024-03-31 10:42:06.464560000 -0600
3	@@ -46,7 +46,9 @@
4	int hash_collisions[5];
5	int hash_chains[5];
6	int hash_chain_max[5];
7	- int p[5];
8	+ int meta[5];
9	+ int pd[5];
10	+ int pm[5];
11	int c[5];
12	int c_min[5];
13	int c_max[5];
14	@@ -149,7 +151,9 @@
15	GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hash_collisions", mibs.hash_collisions, arcstats.hash_collisions);
16	GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hash_chains", mibs.hash_chains, arcstats.hash_chains);
17	GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.hash_chain_max", mibs.hash_chain_max, arcstats.hash_chain_max);
18	- GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.p", mibs.p, arcstats.p);
19	+ GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.meta", mibs.meta, arcstats.meta);
20	+ GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.pd", mibs.pd, arcstats.pd);
21	+ GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.pm", mibs.pm, arcstats.pm);
22	GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.c", mibs.c, arcstats.c);
23	GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.c_min", mibs.c_min, arcstats.c_min);
24	GETSYSCTL_SIMPLE("kstat.zfs.misc.arcstats.c_max", mibs.c_max, arcstats.c_max);