Attachment #250991 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.45.5
4	PORTREVISION= 1
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}yaml>0:devel/py-yaml@${PY_FLAVOR} \	23	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${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_SUB= YES	73	OPTIONS_SUB= YES
58		74
59	CLOUD_DESC= Enable cloud functionality	75	CLOUD_DESC= Enable cloud functionality
Lines 61-99 CUPS_DESC= Enable support for cups Link Here
61	DBENGINE_DESC= Enable support for database engine	77	DBENGINE_DESC= Enable support for database engine
62	FREEIPMI_DESC= Enable support for freeipmi	78	FREEIPMI_DESC= Enable support for freeipmi
63	GOPLUGIN_DESC= Enable the go collector plugin	79	GOPLUGIN_DESC= Enable the go collector plugin
64	ML_DESC= Enable anomaly detection via dlib	80	ML_DESC= Enable anomaly detection via dlib
65		81	PROMETHEUS_DESC= Enable prometheus remote write exporter
66	CLOUD_LIB_DEPENDS= libprotobuf.so:devel/protobuf	82
67	CLOUD_CONFIGURE_OFF= --disable-cloud	83	CLOUD_USES= compiler:c++17-lang
68	CUPS_LIB_DEPENDS= libcups.so:print/cups	84	CLOUD_LIB_DEPENDS= libabsl_base.so:devel/abseil \
69	CUPS_CONFIGURE_ENABLE= plugin-cups	85	libprotobuf.so:devel/protobuf
70	DBENGINE_LIB_DEPENDS= liblz4.so:archivers/liblz4	86	CLOUD_CMAKE_BOOL= ENABLE_CLOUD ENABLE_ACLK
71	DBENGINE_CONFIGURE_ENABLE= dbengine	87	CUPS_LIB_DEPENDS= libcups.so:print/cups
72	FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi	88	CUPS_CMAKE_BOOL= ENABLE_PLUGIN_CUPS
73	FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi	89	DBENGINE_LIB_DEPENDS= liblz4.so:archivers/liblz4
74	GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go	90	DBENGINE_CMAKE_BOOL= ENABLE_PLUGIN_DBENGINE
75	LTO_USES= compiler:c11	91	FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
76	LTO_CONFIGURE_ENABLE= lto	92	FREEIPMI_CMAKE_BOOL= ENABLE_PLUGIN_FREEIPMI
77	ML_BUILD_DEPENDS= ${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp	93	GOPLUGIN_CMAKE_BOOL= ENABLE_PLUGIN_GO
78	ML_CONFIGURE_ENABLE= ml	94	GOPLUGIN_BUILD_DEPENDS= go>1.21:lang/go
79		95	ML_BUILD_DEPENDS= ${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp
80	NETDATA_CACHE= /var/cache/${PORTNAME}	96	ML_CMAKE_BOOL= ENABLE_ML
81	NETDATA_LOG= /var/log/${PORTNAME}	97	PROMETHEUS_LIB_DEPENDS= libsnappy.so:archivers/snappy \
82	NETDATA_PERST= /var/db/${PORTNAME}	98	libabsl_base.so:devel/abseil \
		99	libprotobuf.so:devel/protobuf
		100	PROMETHEUS_CMAKE_BOOL= ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE
83		101
84	post-patch:	102	post-patch:
85	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION}\|g' \	103	@${REINPLACE_CMD} -e 's\|%%DISTVERSION%%\|${DISTVERSION}\|g' \
86	${PATCH_WRKSRC}/configure.ac	104	${PATCH_WRKSRC}/CMakeLists.txt
87	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \	105	@${REINPLACE_CMD} -e 's\|%%NETDATA_CACHE%%\|${NETDATA_CACHE}\|g' \
88	${PATCH_WRKSRC}/configure.ac	106	${PATCH_WRKSRC}/CMakeLists.txt
89	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \	107	@${REINPLACE_CMD} -e 's\|%%NETDATA_LOG%%\|${NETDATA_LOG}\|g' \
90	${PATCH_WRKSRC}/configure.ac	108	${PATCH_WRKSRC}/CMakeLists.txt
91	@${REINPLACE_CMD} -e 's\|%%NETDATA_PERST%%\|${NETDATA_PERST}\|g' \	109	@${REINPLACE_CMD} -e 's\|%%NETDATA_PERST%%\|${NETDATA_PERST}\|g' \
92	${PATCH_WRKSRC}/configure.ac	110	${PATCH_WRKSRC}/CMakeLists.txt
93	@${REINPLACE_CMD} -e 's\|%%ETCDIR%%\|${ETCDIR}\|g' \	111	@${REINPLACE_CMD} -e 's\|%%ETCDIR%%\|${ETCDIR}\|g' \
94	${PATCH_WRKSRC}/configure.ac	112	${PATCH_WRKSRC}/CMakeLists.txt
95	@${REINPLACE_CMD} -e 's\|%%PYTHON%%\|${PYTHON_CMD}\|g' \	113	@${REINPLACE_CMD} -e 's\|%%PYTHON_VERSION%%\|${PYTHON_VERSION}\|g' \
96	${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in	114	${PATCH_WRKSRC}/src/collectors/python.d.plugin/python.d.plugin.in
97		115
98	post-install:	116	post-install:
99	${MKDIR} ${STAGEDIR}${ETCDIR}	117	${MKDIR} ${STAGEDIR}${ETCDIR}
Lines 102-116 post-install: Link Here
102	${MKDIR} ${STAGEDIR}${NETDATA_CACHE}	120	${MKDIR} ${STAGEDIR}${NETDATA_CACHE}
103	${MKDIR} ${STAGEDIR}${NETDATA_LOG}	121	${MKDIR} ${STAGEDIR}${NETDATA_LOG}
104	${MKDIR} ${STAGEDIR}${NETDATA_PERST}	122	${MKDIR} ${STAGEDIR}${NETDATA_PERST}
105	(for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \	123	@cd ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME} && mmv ";*.conf" "#1#2.conf.sample"
106	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.conf \
107	${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d//.txt ; do \
108	${MV} $$fi $$fi".sample"; \
109	done)
110	${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf	124	${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf
		125	${RM} ${STAGEDIR}${PREFIX}/sbin/systemd-cat-native
111	${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system	126	${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system
112		127
113	post-install-CLOUD-off:	128	post-install-CLOUD-off:
114	rm ${STAGEDIR}${PREFIX}/sbin/netdata-claim.sh	129	${RM} ${STAGEDIR}${PREFIX}/sbin/netdata-claim.sh
		130	${RM} -d ${STAGEDIR}${NETDATA_PERST}/cloud.d
115		131
116	.include <bsd.port.mk>	132	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/net-mgmt/netdata/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1698687088	1	TIMESTAMP = 1716603008
2	SHA256 (netdata-v1.43.2.tar.gz) = d4a7ea2717ac7c8f04865f18e13aeaa0a36784156059f1b5ced75a44f74afc4d	2	SHA256 (netdata-v1.45.5.tar.gz) = 8b2f24df06f4e90aa448d25348e0301a5c710f86e3e830f2ec6e8d74d766b0b1
3	SIZE (netdata-v1.43.2.tar.gz) = 46462665	3	SIZE (netdata-v1.45.5.tar.gz) = 74884666

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-05-24 20:16:31.748984000 -0600
+++ CMakeLists.txt	2024-05-24 20:20:00.721322000 -0600
@@ -6,48 +6,48 @@
 # version atrocities
 #
 
-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 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 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()
 
-string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
-string(REGEX MATCH "v?([0-9]+)\\.([0-9]+)\\.([0-9]+)-?([0-9]+)?-?([0-9a-zA-Z]+)?" MATCHES "${GIT_DESCRIBE_OUTPUT}")
+#string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
+#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)
-        set(FIELD_MAJOR ${CMAKE_MATCH_1})
-        set(FIELD_MINOR ${CMAKE_MATCH_2})
-        set(FIELD_PATCH ${CMAKE_MATCH_3})
-        set(FIELD_TWEAK 0)
-        set(FIELD_DESCR "N/A")
-elseif(CMAKE_MATCH_COUNT EQUAL 4)
-        set(FIELD_MAJOR ${CMAKE_MATCH_1})
-        set(FIELD_MINOR ${CMAKE_MATCH_2})
-        set(FIELD_PATCH ${CMAKE_MATCH_3})
-        set(FIELD_TWEAK ${CMAKE_MATCH_4})
-        set(FIELD_DESCR "N/A")
-elseif(CMAKE_MATCH_COUNT EQUAL 5)
-        set(FIELD_MAJOR ${CMAKE_MATCH_1})
-        set(FIELD_MINOR ${CMAKE_MATCH_2})
-        set(FIELD_PATCH ${CMAKE_MATCH_3})
-        set(FIELD_TWEAK ${CMAKE_MATCH_4})
-        set(FIELD_DESCR ${CMAKE_MATCH_5})
-else()
-        message(FATAL_ERROR "Wrong version regex match count ${CMAKE_MATCH_COUNT} (should be in 3, 4 or 5)")
-endif()
+#if(CMAKE_MATCH_COUNT EQUAL 3)
+#        set(FIELD_MAJOR ${CMAKE_MATCH_1})
+#        set(FIELD_MINOR ${CMAKE_MATCH_2})
+#        set(FIELD_PATCH ${CMAKE_MATCH_3})
+#        set(FIELD_TWEAK 0)
+#        set(FIELD_DESCR "N/A")
+#elseif(CMAKE_MATCH_COUNT EQUAL 4)
+#        set(FIELD_MAJOR ${CMAKE_MATCH_1})
+#        set(FIELD_MINOR ${CMAKE_MATCH_2})
+#        set(FIELD_PATCH ${CMAKE_MATCH_3})
+#        set(FIELD_TWEAK ${CMAKE_MATCH_4})
+#       set(FIELD_DESCR "N/A")
+#elseif(CMAKE_MATCH_COUNT EQUAL 5)
+#        set(FIELD_MAJOR ${CMAKE_MATCH_1})
+#        set(FIELD_MINOR ${CMAKE_MATCH_2})
+#        set(FIELD_PATCH ${CMAKE_MATCH_3})
+#        set(FIELD_TWEAK ${CMAKE_MATCH_4})
+#        set(FIELD_DESCR ${CMAKE_MATCH_5})
+#else()
+#        message(FATAL_ERROR "Wrong version regex match count ${CMAKE_MATCH_COUNT} (should be in 3, 4 or 5)")
+#endif()
 
-set(NETDATA_VERSION ${FIELD_MAJOR}.${FIELD_MINOR}.${FIELD_PATCH}.${FIELD_TWEAK})
+set(NETDATA_VERSION %%DISTVERSION%%)
 
 #
 # project
@@ -63,7 +63,7 @@
 find_package(PkgConfig REQUIRED)
 
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 option(USE_CXX_11 "use C++11 instead of C++14" False)
 
@@ -928,7 +928,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
@@ -1681,7 +1680,7 @@
 
     install(TARGETS debugfs.plugin
             COMPONENT debugfs_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_APPS)
@@ -1712,10 +1711,10 @@
 
     install(TARGETS apps.plugin
             COMPONENT apps_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
     install(FILES src/collectors/apps.plugin/apps_groups.conf
             COMPONENT apps_plugin
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 endif()
 
 if(CAP_FOUND)
@@ -1734,7 +1733,7 @@
 
     install(TARGETS freeipmi.plugin
             COMPONENT freeipmi_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_NFACCT)
@@ -1753,7 +1752,7 @@
 
     install(TARGETS nfacct.plugin
             COMPONENT nfacct_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_XENSTAT)
@@ -1769,7 +1768,7 @@
 
     install(TARGETS xenstat.plugin
             COMPONENT xenstat_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_PERF)
@@ -1780,7 +1779,7 @@
 
     install(TARGETS perf.plugin
             COMPONENT perf_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_SLABINFO)
@@ -1791,7 +1790,7 @@
 
     install(TARGETS slabinfo.plugin
             COMPONENT slabinfo_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_LOGS_MANAGEMENT)
@@ -1808,11 +1807,11 @@
 
     install(TARGETS logs-management.plugin
             COMPONENT logs_management_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 
     install(DIRECTORY src/logsmanagement/stock_conf/logsmanagement.d
             COMPONENT logs_management_plugin
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     install(DIRECTORY DESTINATION etc/netdata/logsmanagement.d)
 endif()
@@ -1846,7 +1845,7 @@
 
         install(TARGETS cups.plugin
                 COMPONENT cups_plugin
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
     endif()
 endif()
 
@@ -1856,7 +1855,7 @@
 
 install(TARGETS ndsudo
         COMPONENT ndsudo
-        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)
@@ -1866,7 +1865,7 @@
 
     install(TARGETS cgroup-network
             COMPONENT cgroup_network_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_SYSTEMD_JOURNAL)
@@ -1875,7 +1874,7 @@
 
         install(TARGETS systemd-journal.plugin
                 COMPONENT systemd_journal_plugin
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_EBPF)
@@ -1929,7 +1928,7 @@
 
     install(TARGETS ebpf.plugin
             COMPONENT ebpf_plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_LOCAL_LISTENERS)
@@ -1949,7 +1948,7 @@
 
         install(TARGETS local-listeners
                 COMPONENT local_listeners
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 endif()
 
 if(ENABLE_PLUGIN_NETWORK_VIEWER)
@@ -1971,7 +1970,7 @@
 
         install(TARGETS network-viewer.plugin
                 COMPONENT network_viewer_plugin
-                DESTINATION usr/libexec/netdata/plugins.d)
+                DESTINATION libexec/netdata/plugins.d)
 endif()
 
 #
@@ -2025,10 +2024,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}>"
@@ -2068,7 +2063,7 @@
 
 install(TARGETS systemd-cat-native
         COMPONENT systemd-cat-native
-        DESTINATION usr/sbin)
+        DESTINATION sbin)
 
 #
 # build log2journal
@@ -2103,11 +2098,11 @@
 
         install(TARGETS log2journal
                 COMPONENT log2journal
-                DESTINATION usr/sbin)
+                DESTINATION sbin)
 
         install(DIRECTORY src/collectors/log2journal/log2journal.d
                 COMPONENT log2journal
-                DESTINATION usr/lib/netdata/conf.d)
+                DESTINATION lib/netdata/conf.d)
 endif()
 
 #
@@ -2126,7 +2121,7 @@
 
 install(TARGETS netdatacli
         COMPONENT netdatacli
-        DESTINATION usr/sbin)
+        DESTINATION sbin)
 
 #
 # Build go.d.plugin
@@ -2137,7 +2132,7 @@
 
     install(PROGRAMS ${CMAKE_BINARY_DIR}/go.d.plugin
             COMPONENT go.d.plugin
-            DESTINATION usr/libexec/netdata/plugins.d)
+            DESTINATION libexec/netdata/plugins.d)
 endif()
 
 #
@@ -2148,16 +2143,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()
@@ -2169,7 +2164,7 @@
 if (NOT NETDATA_USER)
         set(NETDATA_USER "netdata")
 endif()
-set(VERSION "${GIT_DESCRIBE_OUTPUT}")
+set(VERSION "%%DISTVERSION%%")
 
 configure_file(packaging/cmake/config.cmake.h.in config.h)
 
@@ -2177,13 +2172,12 @@
 # install
 #
 
-install(TARGETS netdata DESTINATION usr/sbin)
+install(TARGETS netdata DESTINATION sbin)
 
-install(DIRECTORY DESTINATION var/cache/netdata)
-install(DIRECTORY DESTINATION var/log/netdata)
-install(DIRECTORY DESTINATION var/lib/netdata/registry)
-install(DIRECTORY DESTINATION var/lib/netdata/cloud.d)
-install(DIRECTORY DESTINATION var/run)
+install(DIRECTORY DESTINATION %%NETDATA_CACHE%%)
+install(DIRECTORY DESTINATION %%NETDATA_LOG%%)
+install(DIRECTORY DESTINATION %%NETDATA_PERST%%/registery)
+install(DIRECTORY DESTINATION %%NETDATA_PERST%%/cloud.d)
 install(DIRECTORY DESTINATION etc/netdata)
 install(DIRECTORY DESTINATION etc/netdata/charts.d)
 install(DIRECTORY DESTINATION etc/netdata/custom-plugins.d)
@@ -2193,20 +2187,20 @@
 install(DIRECTORY DESTINATION etc/netdata/python.d)
 install(DIRECTORY DESTINATION etc/netdata/ssl)
 install(DIRECTORY DESTINATION etc/netdata/statsd.d)
-install(DIRECTORY DESTINATION usr/lib/netdata/conf.d)
-install(DIRECTORY DESTINATION usr/lib/netdata/conf.d/schema.d)
-install(DIRECTORY DESTINATION usr/libexec/netdata/plugins.d)
+install(DIRECTORY DESTINATION lib/netdata/conf.d)
+install(DIRECTORY DESTINATION lib/netdata/conf.d/schema.d)
+install(DIRECTORY DESTINATION libexec/netdata/plugins.d)
 install(DIRECTORY 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
@@ -2225,7 +2219,7 @@
 configure_file(src/claim/netdata-claim.sh.in src/claim/netdata-claim.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/claim/netdata-claim.sh
-        DESTINATION usr/sbin)
+        DESTINATION sbin)
 
 #
 # We don't check ENABLE_PLUGIN_CGROUP_NETWORK because rpm builds assume
@@ -2236,13 +2230,13 @@
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/cgroups.plugin/cgroup-network-helper.sh
         COMPONENT cgroup_network_plugin
-        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
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 #
 # statsd
@@ -2251,28 +2245,28 @@
         src/collectors/statsd.plugin/asterisk.conf
         src/collectors/statsd.plugin/example.conf
         src/collectors/statsd.plugin/k6.conf
-        DESTINATION usr/lib/netdata/conf.d/statsd.d)
+        DESTINATION lib/netdata/conf.d/statsd.d)
 
 #
 # exporting
 #
 install(FILES
         src/exporting/exporting.conf
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # ioping.plugin
 #
 install(FILES
         src/collectors/ioping.plugin/ioping.conf
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # streaming
 #
 install(FILES
         src/streaming/stream.conf
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # swagger
@@ -2289,78 +2283,78 @@
 configure_file(system/install-service.sh.in system/install-service.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/install-service.sh
-        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
-        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
-        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
-        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
-        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
-        DESTINATION usr/lib/netdata/system/logrotate)
+        DESTINATION lib/netdata/system/logrotate)
 
 configure_file(system/lsb/init.d/netdata.in system/lsb/init.d/netdata @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/system/lsb/init.d/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
-        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
-        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
-        DESTINATION usr/lib/netdata/system/runit)
+        DESTINATION lib/netdata/system/runit)
 
 configure_file(system/systemd/netdata.service.in system/systemd/netdata.service @ONLY)
 install(FILES
         ${CMAKE_BINARY_DIR}/system/systemd/netdata.service
-        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
-        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
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 install(FILES
         system/systemd/netdata-updater.timer
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 install(FILES
         system/systemd/50-netdata.preset
-        DESTINATION usr/lib/netdata/system/systemd)
+        DESTINATION lib/netdata/system/systemd)
 
 install(FILES
         system/vnodes/vnodes.conf
-        DESTINATION usr/lib/netdata/conf.d/vnodes)
+        DESTINATION lib/netdata/conf.d/vnodes)
 
 install(FILES
         system/.install-type
@@ -2379,16 +2373,16 @@
 configure_file(src/daemon/anonymous-statistics.sh.in src/daemon/anonymous-statistics.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/daemon/anonymous-statistics.sh
-        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
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(PROGRAMS
         src/daemon/system-info.sh
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 #
 # health files
@@ -2397,22 +2391,22 @@
 file(GLOB_RECURSE HEALTH_CONF_FILES "src/health/health.d/*.conf")
 install(FILES
         ${HEALTH_CONF_FILES}
-        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
-        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
-        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
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 #
 # test/ files
 #
@@ -2431,7 +2425,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 files
@@ -2440,16 +2434,16 @@
 configure_file(src/collectors/charts.d.plugin/charts.d.plugin.in src/collectors/charts.d.plugin/charts.d.plugin @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/charts.d.plugin/charts.d.plugin
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(FILES
         src/collectors/charts.d.plugin/charts.d.dryrun-helper.sh
         src/collectors/charts.d.plugin/loopsleepms.sh.inc
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(FILES
         src/collectors/charts.d.plugin/charts.d.conf
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 #
 # tc-qos-helper
@@ -2458,7 +2452,7 @@
 configure_file(src/collectors/tc.plugin/tc-qos-helper.sh.in src/collectors/tc.plugin/tc-qos-helper.sh @ONLY)
 install(PROGRAMS
         ${CMAKE_BINARY_DIR}/src/collectors/tc.plugin/tc-qos-helper.sh
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 # scripts
 
@@ -2469,7 +2463,7 @@
         src/collectors/charts.d.plugin/libreswan/libreswan.chart.sh
         src/collectors/charts.d.plugin/opensips/opensips.chart.sh
         src/collectors/charts.d.plugin/sensors/sensors.chart.sh
-        DESTINATION usr/libexec/netdata/charts.d)
+        DESTINATION libexec/netdata/charts.d)
 
 # confs
 
@@ -2480,12 +2474,12 @@
         src/collectors/charts.d.plugin/libreswan/libreswan.conf
         src/collectors/charts.d.plugin/opensips/opensips.conf
         src/collectors/charts.d.plugin/sensors/sensors.conf
-        DESTINATION usr/lib/netdata/conf.d/charts.d)
+        DESTINATION lib/netdata/conf.d/charts.d)
 
 install(FILES
         src/collectors/systemd-journal.plugin/schema.d/systemd-journal:monitored-directories.json
         src/health/schema.d/health:alert:prototype.json
-        DESTINATION usr/lib/netdata/conf.d/schema.d)
+        DESTINATION lib/netdata/conf.d/schema.d)
 
 #
 # ebpf files
@@ -2494,7 +2488,7 @@
 if(ENABLE_PLUGIN_EBPF)
         install(FILES
                 src/collectors/ebpf.plugin/ebpf.d.conf
-                DESTINATION usr/lib/netdata/conf.d)
+                DESTINATION lib/netdata/conf.d)
 
         install(FILES
                 src/collectors/ebpf.plugin/ebpf.d/cachestat.conf
@@ -2514,7 +2508,7 @@
                 src/collectors/ebpf.plugin/ebpf.d/swap.conf
                 src/collectors/ebpf.plugin/ebpf.d/sync.conf
                 src/collectors/ebpf.plugin/ebpf.d/vfs.conf
-                DESTINATION usr/lib/netdata/conf.d/ebpf.d)
+                DESTINATION lib/netdata/conf.d/ebpf.d)
 endif()
 
 #
@@ -2523,13 +2517,13 @@
 
 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
-        DESTINATION usr/libexec/netdata/plugins.d)
+        DESTINATION libexec/netdata/plugins.d)
 
 install(DIRECTORY src/collectors/python.d.plugin/python_modules
-        DESTINATION usr/libexec/netdata/python.d)
+        DESTINATION libexec/netdata/python.d)
 
 install(FILES src/collectors/python.d.plugin/python.d.conf
-        DESTINATION usr/lib/netdata/conf.d)
+        DESTINATION lib/netdata/conf.d)
 
 # conf files
 
@@ -2580,7 +2574,7 @@
         src/collectors/python.d.plugin/varnish/varnish.conf
         src/collectors/python.d.plugin/w1sensor/w1sensor.conf
         src/collectors/python.d.plugin/zscores/zscores.conf
-        DESTINATION usr/lib/netdata/conf.d/python.d)
+        DESTINATION lib/netdata/conf.d/python.d)
 
 # scripts
 
@@ -2631,11 +2625,11 @@
         src/collectors/python.d.plugin/varnish/varnish.chart.py
         src/collectors/python.d.plugin/w1sensor/w1sensor.chart.py
         src/collectors/python.d.plugin/zscores/zscores.chart.py
-        DESTINATION usr/libexec/netdata/python.d)
+        DESTINATION libexec/netdata/python.d)
 
 # FIXME: don't install this unconditionally
 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 DESTINATION usr/libexec/netdata/plugins.d)
+install(PROGRAMS ${CMAKE_BINARY_DIR}/src/collectors/ioping.plugin/ioping.plugin DESTINATION libexec/netdata/plugins.d)
 
 #
 # logs management
@@ -2644,7 +2638,7 @@
         configure_file(src/logsmanagement/stock_conf/logsmanagement.d.conf.in src/logsmanagement/stock_conf/logsmanagement.d.conf @ONLY)
         install(FILES ${CMAKE_BINARY_DIR}/src/logsmanagement/stock_conf/logsmanagement.d.conf
                 COMPONENT logs_management_plugin
-                DESTINATION usr/lib/netdata/conf.d)
+                DESTINATION lib/netdata/conf.d)
 endif()
 
 #
@@ -2653,23 +2647,23 @@
 if(ENABLE_PLUGIN_GO)
     install(FILES src/go/collectors/go.d.plugin/config/go.d.conf
             COMPONENT go.d.plugin
-            DESTINATION usr/lib/netdata/conf.d)
+            DESTINATION lib/netdata/conf.d)
 
     install(DIRECTORY
             COMPONENT go.d.plugin
-            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 go.d.plugin
-            DESTINATION usr/lib/netdata/conf.d/go.d)
+            DESTINATION lib/netdata/conf.d/go.d)
 
     install(DIRECTORY
             COMPONENT go.d.plugin
-            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 go.d.plugin
-            DESTINATION usr/lib/netdata/conf.d/go.d/sd)
+            DESTINATION lib/netdata/conf.d/go.d/sd)
 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);
 




From 787cfeed1a54949e817b2a1250b640a4f5049a06 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Wed, 1 May 2024 07:04:28 -0400
Subject: [PATCH] Significantly simplify the protobuf handling in CMake.
 (#17533)

---
 packaging/cmake/Modules/NetdataProtobuf.cmake | 99 +++----------------
 1 file changed, 16 insertions(+), 83 deletions(-)

diff --git a/packaging/cmake/Modules/NetdataProtobuf.cmake b/packaging/cmake/Modules/NetdataProtobuf.cmake
index bc0ffc03bea961..271252fb5c1663 100644
--- packaging/cmake/Modules/NetdataProtobuf.cmake.orig
+++ packaging/cmake/Modules/NetdataProtobuf.cmake
@@ -3,47 +3,19 @@
 # Copyright (c) 2024 Netdata Inc.
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-macro(netdata_protobuf_21_tags)
-        set(PROTOBUF_TAG f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c) # v21.12
-        set(NEED_ABSL False)
-endmacro()
-
-macro(netdata_protobuf_25_tags)
-        set(PROTOBUF_TAG 4a2aef570deb2bfb8927426558701e8bfc26f2a4) # v25.3
-        set(NEED_ABSL True)
-        set(ABSL_TAG 2f9e432cce407ce0ae50676696666f33a77d42ac) # 20240116.1
-endmacro()
-
-# Determine what version of protobuf and abseil to bundle.
-#
-# This is unfortunately very complicated because we support systems
-# older than what Google officially supports for C++.
-macro(netdata_set_bundled_protobuf_tags)
-        netdata_protobuf_21_tags()
-
-        if(NOT USE_CXX_11)
-                if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
-                        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.3.1)
-                                netdata_protobuf_25_tags()
-                        endif()
-                elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-                        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0.0)
-                                netdata_protobuf_25_tags()
-                        endif()
-                elseif(CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
-                        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
-                                netdata_protobuf_25_tags()
-                        endif()
-                endif()
-        endif()
-endmacro()
-
 # Prepare a vendored copy of Protobuf for use with Netdata.
 function(netdata_bundle_protobuf)
         include(FetchContent)
         include(NetdataFetchContentExtra)
 
-        netdata_set_bundled_protobuf_tags()
+        set(PROTOBUF_TAG f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c) # v21.12
+        set(NEED_ABSL False)
+
+        if(CMAKE_CXX_STANDARD GREATER_EQUAL 14)
+                set(PROTOBUF_TAG 4a2aef570deb2bfb8927426558701e8bfc26f2a4) # v25.3
+                set(NEED_ABSL True)
+                set(ABSL_TAG 2f9e432cce407ce0ae50676696666f33a77d42ac) # 20240116.1
+        endif()
 
         set(FETCHCONTENT_TRY_FIND_PACKAGE_MODE NEVER)
 
@@ -115,27 +87,7 @@ macro(netdata_detect_protobuf)
 
         if(TARGET protobuf::libprotobuf)
                 if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET protobuf::protoc)
-                        get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-                                IMPORTED_LOCATION_RELEASE)
-                        if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-                                get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-                                        IMPORTED_LOCATION_RELWITHDEBINFO)
-                        endif()
-                        if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-                                get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-                                        IMPORTED_LOCATION_MINSIZEREL)
-                        endif()
-                        if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-                                get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-                                        IMPORTED_LOCATION_DEBUG)
-                        endif()
-                        if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-                                get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-                                        IMPORTED_LOCATION_NOCONFIG)
-                        endif()
-                        if(NOT Protobuf_PROTOC_EXECUTABLE)
-                                set(Protobuf_PROTOC_EXECUTABLE protobuf::protoc)
-                        endif()
+                        set(Protobuf_PROTOC_EXECUTABLE protobuf::protoc)
                 endif()
 
                 # It is technically possible that this may still not
@@ -146,27 +98,8 @@ macro(netdata_detect_protobuf)
                         message(FATAL_ERROR "Could not determine the location of the protobuf compiler for the detected version of protobuf.")
                 endif()
 
-                set(NETDATA_PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
-                set(NETDATA_PROTOBUF_LIBS protobuf::libprotobuf)
-                get_target_property(NETDATA_PROTOBUF_CFLAGS_OTHER
-                                    protobuf::libprotobuf
-                                    INTERFACE_COMPILE_DEFINITIONS)
-                get_target_property(NETDATA_PROTOBUF_INCLUDE_DIRS
-                                    protobuf::libprotobuf
-                                    INTERFACE_INCLUDE_DIRECTORIES)
-
-                if(NETDATA_PROTOBUF_CFLAGS_OTHER STREQUAL NETDATA_PROTOBUF_CFLAGS_OTHER-NOTFOUND)
-                        set(NETDATA_PROTOBUF_CFLAGS_OTHER "")
-                endif()
-
-                if(NETDATA_PROTOBUF_INCLUDE_DIRS STREQUAL NETDATA_PROTOBUF_INCLUDE_DIRS-NOTFOUND)
-                        set(NETDATA_PROTOBUF_INCLUDE_DIRS "")
-                endif()
-        else()
-                set(NETDATA_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
-                set(NETDATA_PROTOBUF_CFLAGS_OTHER ${PROTOBUF_CFLAGS_OTHER})
-                set(NETDATA_PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
-                set(NETDATA_PROTOBUF_LIBS ${PROTOBUF_LIBRARIES})
+                set(PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
+                set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
         endif()
 
         set(ENABLE_PROTOBUF True)
@@ -203,9 +136,9 @@ function(netdata_protoc_generate_cpp INC_DIR OUT_DIR SRCS HDRS)
                 endif()
 
                 add_custom_command(OUTPUT ${GENERATED_PB_CC} ${GENERATED_PB_H}
-                                   COMMAND ${NETDATA_PROTOBUF_PROTOC_EXECUTABLE}
+                                   COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
                                    ARGS "-I$<JOIN:${_PROTOC_INCLUDE_DIRS},;-I>" --cpp_out=${OUT_DIR} ${ABS_FIL}
-                                   DEPENDS ${ABS_FIL} ${NETDATA_PROTOBUF_PROTOC_EXECUTABLE}
+                                   DEPENDS ${ABS_FIL} ${PROTOBUF_PROTOC_EXECUTABLE}
                                    COMMENT "Running C++ protocol buffer compiler on ${FIL}"
                                    COMMAND_EXPAND_LISTS)
         endforeach()
@@ -219,7 +152,7 @@ endfunction()
 
 # Add protobuf to a specified target.
 function(netdata_add_protobuf _target)
-        target_compile_options(${_target} PRIVATE ${NETDATA_PROTOBUF_CFLAGS_OTHER})
-        target_include_directories(${_target} PRIVATE ${NETDATA_PROTOBUF_INCLUDE_DIRS})
-        target_link_libraries(${_target} PRIVATE ${NETDATA_PROTOBUF_LIBS})
+        target_compile_definitions(${_target} PRIVATE ${PROTOBUF_CFLAGS_OTHER})
+        target_include_directories(${_target} PRIVATE ${PROTOBUF_INCLUDE_DIRS})
+        target_link_libraries(${_target} PRIVATE ${PROTOBUF_LIBRARIES})
 endfunction()




--- 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




@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/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_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
@sample(netdata,netdata,0640) lib/netdata/conf.d/logsmanagement.d.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/logsmanagement.d/default.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/logsmanagement.d/example_forward.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/logsmanagement.d/example_mqtt.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/logsmanagement.d/example_serial.conf.sample
@sample(netdata,netdata,0640) lib/netdata/conf.d/logsmanagement.d/example_syslog.conf.sample
%%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/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/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/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/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/hdfs.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/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/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/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/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/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/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/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/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:alert:prototype.json
lib/netdata/conf.d/schema.d/systemd-journal:monitored-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/get-kubernetes-labels.sh
libexec/netdata/plugins.d/health-cmdapi-test.sh
libexec/netdata/plugins.d/ioping.plugin
libexec/netdata/plugins.d/logs-management.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/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

%%DATADIR%%/web/tv.html
%%DATADIR%%/web/v0/index.html
%%DATADIR%%/web/v1/index.html
%%DATADIR%%/web/v2/1220.866e5f8ef6dd53cc1146.chunk.js
%%DATADIR%%/web/v2/1396.3ea7b55a3bffeef95530.chunk.js
%%DATADIR%%/web/v2/1396.3ea7b55a3bffeef95530.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/1418.a399f41ec9789d008612.chunk.js
%%DATADIR%%/web/v2/1726.e4f235562d58cb4f4044.chunk.js
%%DATADIR%%/web/v2/1782.31d84c467a8446cb3c47.chunk.js
%%DATADIR%%/web/v2/1839.1dcd23c81c97fb79bfdb.chunk.js
%%DATADIR%%/web/v2/185.7461f65d16b20fe83fc1.chunk.js
%%DATADIR%%/web/v2/1875.e736e046980cb8eb4cda.chunk.js
%%DATADIR%%/web/v2/1876.ba66fdbcfb1b55334646.chunk.js
%%DATADIR%%/web/v2/195.3898e2d9ea61ff1d4a4f.chunk.js
%%DATADIR%%/web/v2/2007.3c73c91371062be4c05e.chunk.js
%%DATADIR%%/web/v2/2414.38b580f70a86a4f94b83.chunk.js
%%DATADIR%%/web/v2/3104.dfd9b1f79c9550ab8493.chunk.js
%%DATADIR%%/web/v2/3296.66994eada739315fc37e.chunk.js
%%DATADIR%%/web/v2/3350.24934ec57134cbef07bf.chunk.js
%%DATADIR%%/web/v2/3584.7b6df71f431fe58061ad.chunk.js
%%DATADIR%%/web/v2/3624.b8b5bc981ae890a8a5b8.chunk.js
%%DATADIR%%/web/v2/3705.38e023af816fb6ce8fc9.chunk.js
%%DATADIR%%/web/v2/3731.40bfabd5c5a12309b1a9.chunk.js
%%DATADIR%%/web/v2/3731.40bfabd5c5a12309b1a9.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/3736.b247e40ccbdc039b9877.chunk.js
%%DATADIR%%/web/v2/3750.6f01a0becb7db332b4ce.chunk.js
%%DATADIR%%/web/v2/3968.a5f7366160b7ac086dba.chunk.js
%%DATADIR%%/web/v2/3D_PARTY_LICENSES.txt
%%DATADIR%%/web/v2/4034.9c82e72b081978919942.chunk.js
%%DATADIR%%/web/v2/4414.60a74c3b7534b4a25469.chunk.js
%%DATADIR%%/web/v2/4680.0c75b44bbc80f4591fdd.chunk.js
%%DATADIR%%/web/v2/5171.2a848991a41e02f24c8d.js
%%DATADIR%%/web/v2/5171.2a848991a41e02f24c8d.js.LICENSE.txt
%%DATADIR%%/web/v2/5246.a7c78643acccf04d7268.chunk.js
%%DATADIR%%/web/v2/5304.dcb81c99fcb90f8ee8cc.chunk.js
%%DATADIR%%/web/v2/5426.1235a7a39c1b0923b071.chunk.js
%%DATADIR%%/web/v2/5596.8280cb325a103342aa30.chunk.js
%%DATADIR%%/web/v2/5598.99e492f7ae4d391df96f.chunk.js
%%DATADIR%%/web/v2/5700.313f7b9c7005d2022b03.chunk.js
%%DATADIR%%/web/v2/5709.6fc5fd48f639100fa6ad.chunk.js
%%DATADIR%%/web/v2/5709.6fc5fd48f639100fa6ad.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/5794.719f2daca8b8f3a118fe.chunk.js
%%DATADIR%%/web/v2/6008.07f03fb5dba476a12f91.chunk.js
%%DATADIR%%/web/v2/6121.8c25bb62d82381e90df8.chunk.js
%%DATADIR%%/web/v2/6121.8c25bb62d82381e90df8.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/6218.26fc25279f45fbcf29f7.chunk.js
%%DATADIR%%/web/v2/6323.425683f5bf71a51caf65.chunk.js
%%DATADIR%%/web/v2/6331.89070793921be1288bb5.css
%%DATADIR%%/web/v2/6331.ccfaab2b17a28e1b6aa2.chunk.js
%%DATADIR%%/web/v2/6760.fe4a9b58186542294e85.chunk.js
%%DATADIR%%/web/v2/68%%PYTHON_VER%%5b7a3193b43fd5dbe51.chunk.js
%%DATADIR%%/web/v2/683.cc9fa5f3bdc0bf3ab2fc.css
%%DATADIR%%/web/v2/7144.72da82bc4f112d1e6d31.chunk.js
%%DATADIR%%/web/v2/7144.72da82bc4f112d1e6d31.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/7146.43b5125ff0b41138f0bc.chunk.js
%%DATADIR%%/web/v2/7208.3c255b9641ab4d451747.chunk.js
%%DATADIR%%/web/v2/7332.8f89f4887946c129ea01.chunk.js
%%DATADIR%%/web/v2/7340.c563ddaad6c68dab9088.chunk.js
%%DATADIR%%/web/v2/7410.cb47519a7a5187208b28.chunk.js
%%DATADIR%%/web/v2/7436.6d4c25c5ff7d2e65734c.chunk.js
%%DATADIR%%/web/v2/7471.d61aa69f317a13bd1b86.chunk.js
%%DATADIR%%/web/v2/749.8ce93b3d6d67d600e8c8.chunk.js
%%DATADIR%%/web/v2/749.8ce93b3d6d67d600e8c8.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/7519.8a99c6b9370779196847.chunk.js
%%DATADIR%%/web/v2/7529.75d71f48d8d6ea454b6d.chunk.js
%%DATADIR%%/web/v2/7789.89070793921be1288bb5.css
%%DATADIR%%/web/v2/7789.f00b7764a97a7dadff97.chunk.js
%%DATADIR%%/web/v2/7840.e1af907905ff10afb069.chunk.js
%%DATADIR%%/web/v2/785.c45abbb1e2a4915d85df.chunk.js
%%DATADIR%%/web/v2/7857.0d6fb5e4a2c2b8996e0f.chunk.js
%%DATADIR%%/web/v2/7959.3995671185f9720b5454.chunk.js
%%DATADIR%%/web/v2/8011.3f8282bb427ea06e9408.chunk.js
%%DATADIR%%/web/v2/8059.c88ad65e1926faee2379.chunk.js
%%DATADIR%%/web/v2/8323.61daef62d0036dd19dbf.chunk.js
%%DATADIR%%/web/v2/8323.61daef62d0036dd19dbf.chunk.js.LICENSE.txt
%%DATADIR%%/web/v2/8323.e22de33686bb2f34063c.css
%%DATADIR%%/web/v2/8473.757c1686b1578c6813c8.chunk.js
%%DATADIR%%/web/v2/8505.b10bf3549c213fe15d55.chunk.js
%%DATADIR%%/web/v2/8507.89070793921be1288bb5.css
%%DATADIR%%/web/v2/8507.e30db778518756ef63fa.chunk.js
%%DATADIR%%/web/v2/86.167efe55b22f02c3155a.chunk.js
%%DATADIR%%/web/v2/8676.a3d687b3b339a72ab66e.chunk.js
%%DATADIR%%/web/v2/8784.c51d36fede97c85313e9.chunk.js
%%DATADIR%%/web/v2/9297.394c9cbf0a1e402384a6.chunk.js
%%DATADIR%%/web/v2/934.aadd4297c0cd646a1038.chunk.js
%%DATADIR%%/web/v2/9473.3693c06a873280f11bd6.chunk.js
%%DATADIR%%/web/v2/9510.58c95eb5f0290291b5a9.chunk.js
%%DATADIR%%/web/v2/966.89070793921be1288bb5.css
%%DATADIR%%/web/v2/966.8f0a484a79552c192bc1.chunk.js
%%DATADIR%%/web/v2/9818.ca4131b4d88d20e88f72.chunk.js
%%DATADIR%%/web/v2/9843.75b313f97c4d363a4959.chunk.js
%%DATADIR%%/web/v2/9912.b952e26497a284ac37b2.chunk.js
%%DATADIR%%/web/v2/LICENSE.md
%%DATADIR%%/web/v2/agent.html
%%DATADIR%%/web/v2/allFiles.6.104.1.json
%%DATADIR%%/web/v2/allFiles.6.json
%%DATADIR%%/web/v2/app.7443b231e52789baa643.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.f0b9e2b96837688d2aab.js
%%DATADIR%%/web/v2/netdata.ui.f50ab375c8daf7a2a547.js
%%DATADIR%%/web/v2/netdata.ui.f50ab375c8daf7a2a547.js.LICENSE.txt
%%DATADIR%%/web/v2/npm.react.dom.b2a6a30db3d683abdb32.js
%%DATADIR%%/web/v2/npm.react.dom.b2a6a30db3d683abdb32.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.30ce76c6e7acf60ebf83.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%%/ebpf.d
@dir(netdata,netdata,0750) %%ETCDIR%%/go.d
@dir(netdata,netdata,0750) %%ETCDIR%%/health.d
@dir(netdata,netdata,0750) %%ETCDIR%%/logsmanagement.d
@dir(netdata,netdata,0750) %%ETCDIR%%/python.d
@dir(netdata,netdata,0750) %%ETCDIR%%/ssl
@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
%%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_NetdataProtobuf.cmake (+152 lines)
1	From 787cfeed1a54949e817b2a1250b640a4f5049a06 Mon Sep 17 00:00:00 2001
2	From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
3	Date: Wed, 1 May 2024 07:04:28 -0400
4	Subject: [PATCH] Significantly simplify the protobuf handling in CMake.
5	(#17533)
6
7	---
8	packaging/cmake/Modules/NetdataProtobuf.cmake \| 99 +++----------------
9	1 file changed, 16 insertions(+), 83 deletions(-)
10
11	diff --git a/packaging/cmake/Modules/NetdataProtobuf.cmake b/packaging/cmake/Modules/NetdataProtobuf.cmake
12	index bc0ffc03bea961..271252fb5c1663 100644
13	--- packaging/cmake/Modules/NetdataProtobuf.cmake.orig
14	+++ packaging/cmake/Modules/NetdataProtobuf.cmake
15	@@ -3,47 +3,19 @@
16	# Copyright (c) 2024 Netdata Inc.
17	# SPDX-License-Identifier: GPL-3.0-or-later
18
19	-macro(netdata_protobuf_21_tags)
20	- set(PROTOBUF_TAG f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c) # v21.12
21	- set(NEED_ABSL False)
22	-endmacro()
23	-
24	-macro(netdata_protobuf_25_tags)
25	- set(PROTOBUF_TAG 4a2aef570deb2bfb8927426558701e8bfc26f2a4) # v25.3
26	- set(NEED_ABSL True)
27	- set(ABSL_TAG 2f9e432cce407ce0ae50676696666f33a77d42ac) # 20240116.1
28	-endmacro()
29	-
30	-# Determine what version of protobuf and abseil to bundle.
31	-#
32	-# This is unfortunately very complicated because we support systems
33	-# older than what Google officially supports for C++.
34	-macro(netdata_set_bundled_protobuf_tags)
35	- netdata_protobuf_21_tags()
36	-
37	- if(NOT USE_CXX_11)
38	- if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
39	- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.3.1)
40	- netdata_protobuf_25_tags()
41	- endif()
42	- elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
43	- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7.0.0)
44	- netdata_protobuf_25_tags()
45	- endif()
46	- elseif(CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
47	- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12)
48	- netdata_protobuf_25_tags()
49	- endif()
50	- endif()
51	- endif()
52	-endmacro()
53	-
54	# Prepare a vendored copy of Protobuf for use with Netdata.
55	function(netdata_bundle_protobuf)
56	include(FetchContent)
57	include(NetdataFetchContentExtra)
58
59	- netdata_set_bundled_protobuf_tags()
60	+ set(PROTOBUF_TAG f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c) # v21.12
61	+ set(NEED_ABSL False)
62	+
63	+ if(CMAKE_CXX_STANDARD GREATER_EQUAL 14)
64	+ set(PROTOBUF_TAG 4a2aef570deb2bfb8927426558701e8bfc26f2a4) # v25.3
65	+ set(NEED_ABSL True)
66	+ set(ABSL_TAG 2f9e432cce407ce0ae50676696666f33a77d42ac) # 20240116.1
67	+ endif()
68
69	set(FETCHCONTENT_TRY_FIND_PACKAGE_MODE NEVER)
70
71	@@ -115,27 +87,7 @@ macro(netdata_detect_protobuf)
72
73	if(TARGET protobuf::libprotobuf)
74	if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET protobuf::protoc)
75	- get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
76	- IMPORTED_LOCATION_RELEASE)
77	- if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
78	- get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
79	- IMPORTED_LOCATION_RELWITHDEBINFO)
80	- endif()
81	- if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
82	- get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
83	- IMPORTED_LOCATION_MINSIZEREL)
84	- endif()
85	- if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
86	- get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
87	- IMPORTED_LOCATION_DEBUG)
88	- endif()
89	- if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
90	- get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
91	- IMPORTED_LOCATION_NOCONFIG)
92	- endif()
93	- if(NOT Protobuf_PROTOC_EXECUTABLE)
94	- set(Protobuf_PROTOC_EXECUTABLE protobuf::protoc)
95	- endif()
96	+ set(Protobuf_PROTOC_EXECUTABLE protobuf::protoc)
97	endif()
98
99	# It is technically possible that this may still not
100	@@ -146,27 +98,8 @@ macro(netdata_detect_protobuf)
101	message(FATAL_ERROR "Could not determine the location of the protobuf compiler for the detected version of protobuf.")
102	endif()
103
104	- set(NETDATA_PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
105	- set(NETDATA_PROTOBUF_LIBS protobuf::libprotobuf)
106	- get_target_property(NETDATA_PROTOBUF_CFLAGS_OTHER
107	- protobuf::libprotobuf
108	- INTERFACE_COMPILE_DEFINITIONS)
109	- get_target_property(NETDATA_PROTOBUF_INCLUDE_DIRS
110	- protobuf::libprotobuf
111	- INTERFACE_INCLUDE_DIRECTORIES)
112	-
113	- if(NETDATA_PROTOBUF_CFLAGS_OTHER STREQUAL NETDATA_PROTOBUF_CFLAGS_OTHER-NOTFOUND)
114	- set(NETDATA_PROTOBUF_CFLAGS_OTHER "")
115	- endif()
116	-
117	- if(NETDATA_PROTOBUF_INCLUDE_DIRS STREQUAL NETDATA_PROTOBUF_INCLUDE_DIRS-NOTFOUND)
118	- set(NETDATA_PROTOBUF_INCLUDE_DIRS "")
119	- endif()
120	- else()
121	- set(NETDATA_PROTOBUF_PROTOC_EXECUTABLE ${PROTOBUF_PROTOC_EXECUTABLE})
122	- set(NETDATA_PROTOBUF_CFLAGS_OTHER ${PROTOBUF_CFLAGS_OTHER})
123	- set(NETDATA_PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIRS})
124	- set(NETDATA_PROTOBUF_LIBS ${PROTOBUF_LIBRARIES})
125	+ set(PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
126	+ set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
127	endif()
128
129	set(ENABLE_PROTOBUF True)
130	@@ -203,9 +136,9 @@ function(netdata_protoc_generate_cpp INC_DIR OUT_DIR SRCS HDRS)
131	endif()
132
133	add_custom_command(OUTPUT ${GENERATED_PB_CC} ${GENERATED_PB_H}
134	- COMMAND ${NETDATA_PROTOBUF_PROTOC_EXECUTABLE}
135	+ COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
136	ARGS "-I$<JOIN:${_PROTOC_INCLUDE_DIRS},;-I>" --cpp_out=${OUT_DIR} ${ABS_FIL}
137	- DEPENDS ${ABS_FIL} ${NETDATA_PROTOBUF_PROTOC_EXECUTABLE}
138	+ DEPENDS ${ABS_FIL} ${PROTOBUF_PROTOC_EXECUTABLE}
139	COMMENT "Running C++ protocol buffer compiler on ${FIL}"
140	COMMAND_EXPAND_LISTS)
141	endforeach()
142	@@ -219,7 +152,7 @@ endfunction()
143
144	# Add protobuf to a specified target.
145	function(netdata_add_protobuf _target)
146	- target_compile_options(${_target} PRIVATE ${NETDATA_PROTOBUF_CFLAGS_OTHER})
147	- target_include_directories(${_target} PRIVATE ${NETDATA_PROTOBUF_INCLUDE_DIRS})
148	- target_link_libraries(${_target} PRIVATE ${NETDATA_PROTOBUF_LIBS})
149	+ target_compile_definitions(${_target} PRIVATE ${PROTOBUF_CFLAGS_OTHER})
150	+ target_include_directories(${_target} PRIVATE ${PROTOBUF_INCLUDE_DIRS})
151	+ target_link_libraries(${_target} PRIVATE ${PROTOBUF_LIBRARIES})
152	endfunction()

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);