mirror of
https://git.freebsd.org/ports.git
synced 2025-05-12 23:31:50 -04:00
net-mgmt/netdata: Update to 2.2.3
Changelog: https://github.com/netdata/netdata/releases/tag/v2.2.3 Thanks to Namkhai and contributors for the time consuming effort to make it suitable for packaging and testing PR: 275792
This commit is contained in:
Namkhai Bourquin
Daniel Engberg
parent
66cbfb2936
commit
07cc225b41
17 changed files with 778 additions and 754 deletions
|
|
@ -1,9 +1,13 @@
|
||||||
PORTNAME= netdata
|
PORTNAME= netdata
|
||||||
DISTVERSIONPREFIX= v
|
DISTVERSIONPREFIX= v
|
||||||
DISTVERSION= 1.43.2
|
DISTVERSION= 2.2.3
|
||||||
PORTREVISION= 8
|
|
||||||
CATEGORIES= net-mgmt
|
CATEGORIES= net-mgmt
|
||||||
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
|
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/:netdata \
|
||||||
|
https://raw.githubusercontent.com/netdata/netdata/refs/tags/v${DISTVERSION}/src/go/:goplugin \
|
||||||
|
https://dl.nkeor.me/freebsd/netdata/:nkeor
|
||||||
|
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:netdata
|
||||||
|
DIST_SUBDIR= ${PORTNAME}
|
||||||
|
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
|
||||||
|
|
||||||
MAINTAINER= nk@nkeor.me
|
MAINTAINER= nk@nkeor.me
|
||||||
COMMENT= Scalable distributed realtime performance and health monitoring
|
COMMENT= Scalable distributed realtime performance and health monitoring
|
||||||
|
|
@ -12,89 +16,130 @@ WWW= https://github.com/netdata/netdata
|
||||||
LICENSE= GPLv3
|
LICENSE= GPLv3
|
||||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||||
|
|
||||||
LIB_DEPENDS= libjson-c.so:devel/json-c \
|
BUILD_DEPENDS= ${LOCALBASE}/bin/mmv:misc/mmv
|
||||||
libyaml.so:textproc/libyaml \
|
LIB_DEPENDS= libabsl_base.so:devel/abseil \
|
||||||
|
libbrotlicommon.so:archivers/brotli \
|
||||||
|
libcurl.so:ftp/curl \
|
||||||
|
libjson-c.so:devel/json-c \
|
||||||
|
liblz4.so:archivers/liblz4 \
|
||||||
|
libpcre2-8.so:devel/pcre2 \
|
||||||
|
libprotobuf.so:devel/protobuf \
|
||||||
libuuid.so:misc/e2fsprogs-libuuid \
|
libuuid.so:misc/e2fsprogs-libuuid \
|
||||||
libuv.so:devel/libuv
|
libuv.so:devel/libuv \
|
||||||
|
libyaml.so:textproc/libyaml \
|
||||||
|
libzstd.so:archivers/zstd
|
||||||
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
|
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${PY_FLAVOR} \
|
||||||
${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
|
${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
|
||||||
bash:shells/bash \
|
bash:shells/bash
|
||||||
curl:ftp/curl
|
|
||||||
|
|
||||||
USES= autoreconf compiler:c++17-lang cpe gmake localbase:ldflags pathfix \
|
USES= cmake compiler:c++17-lang cpe localbase:ldflags \
|
||||||
pkgconfig:both python shebangfix ssl
|
pathfix pkgconfig:both python shebangfix ssl
|
||||||
|
USE_GITHUB= nodefault
|
||||||
USE_RC_SUBR= ${PORTNAME}
|
USE_RC_SUBR= ${PORTNAME}
|
||||||
SHEBANG_GLOB= *
|
SHEBANG_GLOB= *
|
||||||
BINARY_ALIAS= ar=llvm-ar ranlib=llvm-ranlib
|
|
||||||
|
CMAKE_ON= DISABLE_HARDENING ENABLE_DASHBOARD
|
||||||
|
# DebugFS and below are Linux exclusive
|
||||||
|
CMAKE_OFF= ENABLE_PLUGIN_EBPF \
|
||||||
|
ENABLE_PLUGIN_NFACCT \
|
||||||
|
ENABLE_PLUGIN_XENSTAT \
|
||||||
|
ENABLE_PLUGIN_DEBUGFS \
|
||||||
|
ENABLE_PLUGIN_PERF \
|
||||||
|
ENABLE_PLUGIN_SLABINFO \
|
||||||
|
ENABLE_PLUGIN_SYSTEMD_JOURNAL \
|
||||||
|
ENABLE_PLUGIN_CGROUP_NETWORK \
|
||||||
|
ENABLE_PLUGIN_LOCAL_LISTENERS \
|
||||||
|
ENABLE_PLUGIN_NETWORK_VIEWER
|
||||||
|
|
||||||
|
CFLAGS+= -D_WANT_VMMETER
|
||||||
|
|
||||||
# Libs that you can't unbundle...
|
# Libs that you can't unbundle...
|
||||||
# SQLite3, --exclude database/sqlite/sqlite3*
|
# SQLite3, --exclude database/sqlite/sqlite3*
|
||||||
# (lib)judy, --exclude libnetdata/libjudy
|
# (lib)judy, --exclude libnetdata/libjudy
|
||||||
EXTRACT_AFTER_ARGS= --exclude ml/dlib --exclude web/server/h2o
|
EXTRACT_AFTER_ARGS= --exclude ml/dlib \
|
||||||
|
--exclude collectors/python.d.plugin/python_modules/pyyaml2 \
|
||||||
GNU_CONFIGURE= yes
|
--exclude collectors/python.d.plugin/python_modules/pyyaml3 \
|
||||||
CONFIGURE_ARGS= --disable-h2o --disable-unit-tests --with-user=netdata
|
--exclude collectors/python.d.plugin/python_modules/urllib3
|
||||||
|
|
||||||
INSTALL_TARGET= install-strip
|
|
||||||
CPPFLAGS+= -D_WANT_VMMETER
|
|
||||||
USE_CXXSTD= c++17
|
|
||||||
|
|
||||||
SUB_FILES= ${PORTNAME}.conf.sample
|
SUB_FILES= ${PORTNAME}.conf.sample
|
||||||
SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \
|
SUB_LIST= NETDATA_CACHE=${NETDATA_CACHE} \
|
||||||
NETDATA_LOG=${NETDATA_LOG} \
|
NETDATA_LOG=${NETDATA_LOG} \
|
||||||
NETDATA_PERST=${NETDATA_PERST}
|
NETDATA_PERST=${NETDATA_PERST} \
|
||||||
|
NETDATA_RUN=${NETDATA_RUN}
|
||||||
|
|
||||||
USERS= netdata
|
USERS= netdata
|
||||||
GROUPS= netdata
|
GROUPS= netdata
|
||||||
|
|
||||||
PLIST_SUB= NETDATA_CACHE=${NETDATA_CACHE} \
|
|
||||||
NETDATA_LOG=${NETDATA_LOG} \
|
|
||||||
NETDATA_PERST=${NETDATA_PERST}
|
|
||||||
|
|
||||||
OPTIONS_DEFINE= CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO ML
|
|
||||||
OPTIONS_DEFAULT= CLOUD DBENGINE LTO ML
|
|
||||||
OPTIONS_EXCLUDE_riscv64= LTO
|
|
||||||
OPTIONS_EXCLUDE_powerpc64le= ML
|
|
||||||
OPTIONS_SUB= YES
|
|
||||||
|
|
||||||
CLOUD_DESC= Enable cloud functionality
|
|
||||||
CUPS_DESC= Enable support for cups
|
|
||||||
DBENGINE_DESC= Enable support for database engine
|
|
||||||
FREEIPMI_DESC= Enable support for freeipmi
|
|
||||||
GOPLUGIN_DESC= Enable the go collector plugin
|
|
||||||
ML_DESC= Enable anomaly detection via dlib
|
|
||||||
|
|
||||||
CLOUD_LIB_DEPENDS= libprotobuf.so:devel/protobuf
|
|
||||||
CLOUD_CONFIGURE_OFF= --disable-cloud
|
|
||||||
CUPS_LIB_DEPENDS= libcups.so:print/cups
|
|
||||||
CUPS_CONFIGURE_ENABLE= plugin-cups
|
|
||||||
DBENGINE_LIB_DEPENDS= liblz4.so:archivers/liblz4
|
|
||||||
DBENGINE_CONFIGURE_ENABLE= dbengine
|
|
||||||
FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
|
|
||||||
FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi
|
|
||||||
GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go
|
|
||||||
LTO_USES= compiler:c11
|
|
||||||
LTO_CONFIGURE_ENABLE= lto
|
|
||||||
ML_BUILD_DEPENDS= ${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp
|
|
||||||
ML_CONFIGURE_ENABLE= ml
|
|
||||||
|
|
||||||
NETDATA_CACHE= /var/cache/${PORTNAME}
|
NETDATA_CACHE= /var/cache/${PORTNAME}
|
||||||
NETDATA_LOG= /var/log/${PORTNAME}
|
NETDATA_LOG= /var/log/${PORTNAME}
|
||||||
NETDATA_PERST= /var/db/${PORTNAME}
|
NETDATA_PERST= /var/db/${PORTNAME}
|
||||||
|
NETDATA_RUN= /var/run/${PORTNAME}
|
||||||
|
NETDATA_CLOUDVERSION= 20250202
|
||||||
|
|
||||||
|
PLIST_SUB= NETDATA_CACHE=${NETDATA_CACHE} \
|
||||||
|
NETDATA_LOG=${NETDATA_LOG} \
|
||||||
|
NETDATA_PERST=${NETDATA_PERST} \
|
||||||
|
NETDATA_RUN=${NETDATA_RUN}
|
||||||
|
|
||||||
|
OPTIONS_DEFINE= CUPS CLOUD_DASHBOARD FREEIPMI GOPLUGIN ML PROMETHEUS
|
||||||
|
OPTIONS_DEFAULT= ML
|
||||||
|
OPTIONS_EXCLUDE_powerpc64le= ML
|
||||||
|
OPTIONS_SUB= YES
|
||||||
|
|
||||||
|
CUPS_DESC= Enable support for cups
|
||||||
|
CLOUD_DASHBOARD_DESC= Enable proprietary v3 dashboard
|
||||||
|
FREEIPMI_DESC= Enable support for freeipmi
|
||||||
|
GOPLUGIN_DESC= Enable the go collector plugin
|
||||||
|
ML_DESC= Enable anomaly detection via dlib
|
||||||
|
PROMETHEUS_DESC= Enable prometheus remote write exporter
|
||||||
|
CUPS_LIB_DEPENDS= libcups.so:print/cups
|
||||||
|
CUPS_CMAKE_BOOL= ENABLE_PLUGIN_CUPS
|
||||||
|
CLOUD_DASHBOARD_DISTFILES= agent_${NETDATA_CLOUDVERSION}.tar.gz:nkeor
|
||||||
|
CLOUD_DASHBOARD_EXTRACT_ONLY= agent_${NETDATA_CLOUDVERSION}.tar.gz
|
||||||
|
FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipmi
|
||||||
|
FREEIPMI_CMAKE_BOOL= ENABLE_PLUGIN_FREEIPMI
|
||||||
|
GOPLUGIN_DISTFILES= go.mod:goplugin
|
||||||
|
GOPLUGIN_USES= go:1.23,no_targets,modules
|
||||||
|
GOPLUGIN_FETCH_DEPENDS= go123:lang/go123
|
||||||
|
GOPLUGIN_CMAKE_BOOL= ENABLE_PLUGIN_GO
|
||||||
|
ML_BUILD_DEPENDS= ${LOCALBASE}/include/dlib/matrix.h:science/dlib-cpp
|
||||||
|
ML_CMAKE_BOOL= ENABLE_ML
|
||||||
|
PROMETHEUS_LIB_DEPENDS= libsnappy.so:archivers/snappy \
|
||||||
|
libabsl_base.so:devel/abseil \
|
||||||
|
libprotobuf.so:devel/protobuf
|
||||||
|
PROMETHEUS_CMAKE_BOOL= ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE
|
||||||
|
|
||||||
|
post-fetch-GOPLUGIN-on:
|
||||||
|
@(cd ${DISTDIR}/${DIST_SUBDIR}; \
|
||||||
|
${SETENVI} ${WRK_ENV} \
|
||||||
|
${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all)
|
||||||
|
|
||||||
|
post-extract-GOPLUGIN-on:
|
||||||
|
@${ECHO_MSG} "===> Tidying god.plugin dependencies";
|
||||||
|
@(cd ${WRKSRC}/src/go; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod tidy -e)
|
||||||
|
@${ECHO_MSG} "===> Vendoring god.plugin dependencies";
|
||||||
|
@(cd ${WRKSRC}/src/go; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} GOPROXY=${GO_MODCACHE} ${GO_CMD} mod vendor -e)
|
||||||
|
|
||||||
|
pre-patch:
|
||||||
|
@${REINPLACE_CMD} -e 's|usr/lib/|lib/|g' ${WRKSRC}/CMakeLists.txt
|
||||||
|
@${REINPLACE_CMD} -e 's|usr/libexec/|libexec/|g' ${WRKSRC}/CMakeLists.txt
|
||||||
|
@${REINPLACE_CMD} -e 's|usr/share/|share/|g' ${WRKSRC}/CMakeLists.txt
|
||||||
|
|
||||||
post-patch:
|
post-patch:
|
||||||
@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
|
@${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|g' \
|
||||||
${PATCH_WRKSRC}/configure.ac
|
${PATCH_WRKSRC}/packaging/cmake/Modules/NetdataVersion.cmake
|
||||||
@${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \
|
@${REINPLACE_CMD} -e 's|%%NETDATA_CACHE%%|${NETDATA_CACHE}|g' \
|
||||||
${PATCH_WRKSRC}/configure.ac
|
${PATCH_WRKSRC}/CMakeLists.txt
|
||||||
@${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \
|
@${REINPLACE_CMD} -e 's|%%NETDATA_LOG%%|${NETDATA_LOG}|g' \
|
||||||
${PATCH_WRKSRC}/configure.ac
|
${PATCH_WRKSRC}/CMakeLists.txt
|
||||||
@${REINPLACE_CMD} -e 's|%%NETDATA_PERST%%|${NETDATA_PERST}|g' \
|
@${REINPLACE_CMD} -e 's|%%NETDATA_PERST%%|${NETDATA_PERST}|g' \
|
||||||
${PATCH_WRKSRC}/configure.ac
|
${PATCH_WRKSRC}/CMakeLists.txt
|
||||||
|
@${REINPLACE_CMD} -e 's|%%NETDATA_RUN%%|${NETDATA_RUN}|g' \
|
||||||
|
${PATCH_WRKSRC}/CMakeLists.txt
|
||||||
@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \
|
@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' \
|
||||||
${PATCH_WRKSRC}/configure.ac
|
${PATCH_WRKSRC}/CMakeLists.txt
|
||||||
@${REINPLACE_CMD} -e 's|%%PYTHON%%|${PYTHON_CMD}|g' \
|
@${REINPLACE_CMD} -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g' \
|
||||||
${PATCH_WRKSRC}/collectors/python.d.plugin/python.d.plugin.in
|
${PATCH_WRKSRC}/src/collectors/python.d.plugin/python.d.plugin.in
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
${MKDIR} ${STAGEDIR}${ETCDIR}
|
${MKDIR} ${STAGEDIR}${ETCDIR}
|
||||||
|
|
@ -103,15 +148,15 @@ post-install:
|
||||||
${MKDIR} ${STAGEDIR}${NETDATA_CACHE}
|
${MKDIR} ${STAGEDIR}${NETDATA_CACHE}
|
||||||
${MKDIR} ${STAGEDIR}${NETDATA_LOG}
|
${MKDIR} ${STAGEDIR}${NETDATA_LOG}
|
||||||
${MKDIR} ${STAGEDIR}${NETDATA_PERST}
|
${MKDIR} ${STAGEDIR}${NETDATA_PERST}
|
||||||
(for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \
|
@cd ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME} && mmv ";*.conf" "#1#2.conf.sample"
|
||||||
${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf \
|
|
||||||
${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.txt ; do \
|
|
||||||
${MV} $$fi $$fi".sample"; \
|
|
||||||
done)
|
|
||||||
${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf
|
${RM} ${STAGEDIR}${ETCDIR}/netdata-updater.conf
|
||||||
|
${RM} ${STAGEDIR}${LOCALBASE}/libexec/netdata/netdata-updater.sh
|
||||||
${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system
|
${RM} -r ${STAGEDIR}${PREFIX}/lib/netdata/system
|
||||||
|
|
||||||
post-install-CLOUD-off:
|
post-install-CLOUD_DASHBOARD-on:
|
||||||
rm ${STAGEDIR}${PREFIX}/sbin/netdata-claim.sh
|
@(cd ${WRKDIR}/dist/agent && ${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR}/web)
|
||||||
|
|
||||||
|
post-install-CLOUD_DASHBOARD-off:
|
||||||
|
${INSTALL_DATA} ${STAGEDIR}/${DATADIR}/web/v1/index.html ${STAGEDIR}/${DATADIR}/web/index.html
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
TIMESTAMP = 1698687088
|
TIMESTAMP = 1738522786
|
||||||
SHA256 (netdata-v1.43.2.tar.gz) = d4a7ea2717ac7c8f04865f18e13aeaa0a36784156059f1b5ced75a44f74afc4d
|
SHA256 (netdata/netdata-v2.2.3.tar.gz) = 0250afe498d21fe450d7438824f203fc70390549bc53d4664f963ec7677ec583
|
||||||
SIZE (netdata-v1.43.2.tar.gz) = 46462665
|
SIZE (netdata/netdata-v2.2.3.tar.gz) = 50390364
|
||||||
|
SHA256 (netdata/agent_20250202.tar.gz) = c8f2be37c167ab4033ee25226b159a38668e85a5fa9d206bb3b1eb823f4a8ffa
|
||||||
|
SIZE (netdata/agent_20250202.tar.gz) = 2992115
|
||||||
|
SHA256 (netdata/go.mod) = 1fce1d5b3a3cb018e3bc4dacf3b9e29d2801a2f66b5434549bcdfffdd1cd3389
|
||||||
|
SIZE (netdata/go.mod) = 7534
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@
|
||||||
|
|
||||||
[plugins]
|
[plugins]
|
||||||
freebsd = yes
|
freebsd = yes
|
||||||
|
statsd = no
|
||||||
|
|
||||||
[web]
|
[web]
|
||||||
respect do not track policy = yes
|
respect do not track policy = yes
|
||||||
|
|
|
||||||
105
net-mgmt/netdata/files/patch-CMakeLists.txt
Normal file
105
net-mgmt/netdata/files/patch-CMakeLists.txt
Normal file
|
|
@ -0,0 +1,105 @@
|
||||||
|
--- CMakeLists.txt.orig 2025-01-02 17:07:23 UTC
|
||||||
|
+++ CMakeLists.txt
|
||||||
|
@@ -33,7 +33,7 @@ set(CMAKE_C_STANDARD 11)
|
||||||
|
set(CMAKE_INSTALL_MESSAGE LAZY)
|
||||||
|
|
||||||
|
set(CMAKE_C_STANDARD 11)
|
||||||
|
-set(CMAKE_CXX_STANDARD 14)
|
||||||
|
+set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "netdata")
|
||||||
|
|
||||||
|
option(USE_CXX_11 "Use C++11 instead of C++14 (should only be used on legacy systems that cannot support C++14, may disable some features)" False)
|
||||||
|
@@ -94,7 +94,7 @@ set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||||
|
set(OS_WINDOWS False)
|
||||||
|
|
||||||
|
set(NETDATA_RUNTIME_PREFIX "${CMAKE_INSTALL_PREFIX}")
|
||||||
|
-set(BINDIR usr/sbin)
|
||||||
|
+set(BINDIR sbin)
|
||||||
|
|
||||||
|
if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
|
||||||
|
set(OS_MACOS True)
|
||||||
|
@@ -1307,7 +1307,6 @@ if(ENABLE_ML)
|
||||||
|
set(ML_FILES
|
||||||
|
src/ml/ad_charts.h
|
||||||
|
src/ml/ad_charts.cc
|
||||||
|
- src/ml/dlib/dlib/all/source.cpp
|
||||||
|
src/ml/ml.cc
|
||||||
|
src/ml/ml_calculated_number.h
|
||||||
|
src/ml/ml_host.h
|
||||||
|
@@ -2682,10 +2681,6 @@ endif()
|
||||||
|
target_compile_options(NetdataClaim PUBLIC -mwindows)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-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}>"
|
||||||
|
@@ -2809,13 +2804,14 @@ endif()
|
||||||
|
string(REGEX REPLACE "/$" "" NETDATA_RUNTIME_PREFIX "${NETDATA_RUNTIME_PREFIX}")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-set(CACHE_DIR "${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")
|
||||||
|
-set(CONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/etc/netdata")
|
||||||
|
-set(LIBCONFIG_DIR "${NETDATA_RUNTIME_PREFIX}/lib/netdata/conf.d")
|
||||||
|
-set(LOG_DIR "${NETDATA_RUNTIME_PREFIX}/var/log/netdata")
|
||||||
|
-set(PLUGINS_DIR "${NETDATA_RUNTIME_PREFIX}/libexec/netdata/plugins.d")
|
||||||
|
-set(VARLIB_DIR "${NETDATA_RUNTIME_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 "share/netdata/web")
|
||||||
|
@@ -2839,11 +2835,11 @@ install(TARGETS netdata COMPONENT netdata DESTINATION
|
||||||
|
|
||||||
|
install(TARGETS netdata COMPONENT netdata DESTINATION "${BINDIR}")
|
||||||
|
|
||||||
|
-install(DIRECTORY COMPONENT netdata DESTINATION var/cache/netdata)
|
||||||
|
-install(DIRECTORY COMPONENT netdata DESTINATION var/log/netdata)
|
||||||
|
-install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/registry)
|
||||||
|
-install(DIRECTORY COMPONENT netdata DESTINATION var/lib/netdata/cloud.d)
|
||||||
|
-install(DIRECTORY COMPONENT netdata DESTINATION var/run/netdata)
|
||||||
|
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_CACHE%%)
|
||||||
|
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_LOG%%)
|
||||||
|
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/registery)
|
||||||
|
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_PERST%%/cloud.d)
|
||||||
|
+install(DIRECTORY COMPONENT netdata DESTINATION %%NETDATA_RUN%%)
|
||||||
|
install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata)
|
||||||
|
install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/custom-plugins.d)
|
||||||
|
install(DIRECTORY COMPONENT netdata DESTINATION etc/netdata/health.d)
|
||||||
|
@@ -2858,11 +2854,11 @@ set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}"
|
||||||
|
set(pkglibexecdir_POST "${NETDATA_RUNTIME_PREFIX}/libexec/netdata")
|
||||||
|
set(localstatedir_POST "${NETDATA_RUNTIME_PREFIX}/var")
|
||||||
|
set(sbindir_POST "${NETDATA_RUNTIME_PREFIX}/${BINDIR}")
|
||||||
|
-set(configdir_POST "${NETDATA_RUNTIME_PREFIX}/etc/netdata")
|
||||||
|
-set(libconfigdir_POST "${NETDATA_RUNTIME_PREFIX}/lib/netdata/conf.d")
|
||||||
|
-set(cachedir_POST "${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")
|
||||||
|
-set(registrydir_POST "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata/registry")
|
||||||
|
-set(varlibdir_POST "${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")
|
||||||
|
+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}")
|
||||||
|
set(netdata_group_POST "${NETDATA_USER}")
|
||||||
|
|
||||||
|
@@ -3368,8 +3364,8 @@ if(ENABLE_DASHBOARD)
|
||||||
|
#
|
||||||
|
|
||||||
|
if(ENABLE_DASHBOARD)
|
||||||
|
- include(NetdataDashboard)
|
||||||
|
- bundle_dashboard()
|
||||||
|
+ #include(NetdataDashboard)
|
||||||
|
+ #bundle_dashboard()
|
||||||
|
|
||||||
|
include(src/web/gui/v1/dashboard_v1.cmake)
|
||||||
|
include(src/web/gui/gui.cmake)
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
||||||
|
|
@ -1,111 +0,0 @@
|
||||||
--- 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)
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
--- collectors/python.d.plugin/python.d.plugin.in.orig 2022-02-03 22:42:27 UTC
|
|
||||||
+++ collectors/python.d.plugin/python.d.plugin.in
|
|
||||||
@@ -1,6 +1,6 @@
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
'''':;
|
|
||||||
-pybinary=$(which python3 || which python || which python2)
|
|
||||||
+pybinary=%%PYTHON%%
|
|
||||||
filtered=()
|
|
||||||
for arg in "$@"
|
|
||||||
do
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
--- 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
|
|
||||||
|
|
||||||
|
|
@ -1,81 +0,0 @@
|
||||||
--- 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"
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
--- 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);
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
--- 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);
|
|
||||||
|
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- packaging/cmake/Modules/NetdataGoTools.cmake.orig 2025-01-02 17:07:16 UTC
|
||||||
|
+++ packaging/cmake/Modules/NetdataGoTools.cmake
|
||||||
|
@@ -33,7 +33,7 @@ macro(add_go_target target output build_src build_dir)
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${output}
|
||||||
|
- COMMAND "${CMAKE_COMMAND}" -E env GOROOT=${GO_ROOT} CGO_ENABLED=0 GOPROXY=https://proxy.golang.org,direct "${GO_EXECUTABLE}" build -buildvcs=false -ldflags "${GO_LDFLAGS}" -o "${CMAKE_BINARY_DIR}/${output}" "./${build_dir}"
|
||||||
|
+ COMMAND "${CMAKE_COMMAND}" -E env GOROOT=${GO_ROOT} CGO_ENABLED=0 GOPROXY=off "${GO_EXECUTABLE}" build -buildvcs=false -mod=vendor -ldflags "${GO_LDFLAGS}" -o "${CMAKE_BINARY_DIR}/${output}" "./${build_dir}"
|
||||||
|
DEPENDS ${${target}_DEPS}
|
||||||
|
COMMENT "Building Go component ${output}"
|
||||||
|
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/${build_src}"
|
||||||
|
|
@ -0,0 +1,40 @@
|
||||||
|
--- packaging/cmake/Modules/NetdataVersion.cmake.orig 2025-01-02 17:07:16 UTC
|
||||||
|
+++ packaging/cmake/Modules/NetdataVersion.cmake
|
||||||
|
@@ -7,22 +7,23 @@ function(netdata_version)
|
||||||
|
# packaging/version. This version field are used for cmake's project,
|
||||||
|
# cpack's packaging, and the agent's functionality.
|
||||||
|
function(netdata_version)
|
||||||
|
- find_package(Git)
|
||||||
|
+ #find_package(Git)
|
||||||
|
|
||||||
|
- if(GIT_EXECUTABLE)
|
||||||
|
- execute_process(COMMAND ${GIT_EXECUTABLE} describe
|
||||||
|
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
- RESULT_VARIABLE GIT_DESCRIBE_RESULT
|
||||||
|
- OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT)
|
||||||
|
- if(GIT_DESCRIBE_RESULT)
|
||||||
|
- file(STRINGS "${CMAKE_SOURCE_DIR}/packaging/version" GIT_DESCRIBE_OUTPUT)
|
||||||
|
- message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
|
||||||
|
- endif()
|
||||||
|
- else()
|
||||||
|
- file(STRINGS packaging/version GIT_DESCRIBE_OUTPUT)
|
||||||
|
- message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
|
||||||
|
- endif()
|
||||||
|
+ #if(GIT_EXECUTABLE)
|
||||||
|
+ # execute_process(COMMAND ${GIT_EXECUTABLE} describe
|
||||||
|
+ # WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
||||||
|
+ # RESULT_VARIABLE GIT_DESCRIBE_RESULT
|
||||||
|
+ # OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT)
|
||||||
|
+ # if(GIT_DESCRIBE_RESULT)
|
||||||
|
+ # file(STRINGS "${CMAKE_SOURCE_DIR}/packaging/version" GIT_DESCRIBE_OUTPUT)
|
||||||
|
+ # message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
|
||||||
|
+ # endif()
|
||||||
|
+ #else()
|
||||||
|
+ # file(STRINGS packaging/version GIT_DESCRIBE_OUTPUT)
|
||||||
|
+ # message(WARNING "using version from packaging/version: '${GIT_DESCRIBE_OUTPUT}'")
|
||||||
|
+ #endif()
|
||||||
|
|
||||||
|
+ set(GIT_DESCRIBE_OUTPUT "v%%DISTVERSION%%")
|
||||||
|
string(STRIP ${GIT_DESCRIBE_OUTPUT} GIT_DESCRIBE_OUTPUT)
|
||||||
|
set(NETDATA_VERSION_STRING "${GIT_DESCRIBE_OUTPUT}" PARENT_SCOPE)
|
||||||
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- src/collectors/python.d.plugin/python.d.plugin.in.orig 2025-01-02 17:07:23 UTC
|
||||||
|
+++ src/collectors/python.d.plugin/python.d.plugin.in
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
'''':;
|
||||||
|
-pybinary=$(which python3 || which python || which python2)
|
||||||
|
+pybinary=$(which %%PYTHON_VERSION%% || which python || which python2)
|
||||||
|
filtered=()
|
||||||
|
for arg in "$@"
|
||||||
|
do
|
||||||
11
net-mgmt/netdata/files/patch-src_ml_ml__calculated__number.h
Normal file
11
net-mgmt/netdata/files/patch-src_ml_ml__calculated__number.h
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- src/ml/ml_calculated_number.h.orig 2025-01-02 17:07:23 UTC
|
||||||
|
+++ src/ml/ml_calculated_number.h
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
#ifndef NETDATA_ML_CALCULATED_NUMBER_H
|
||||||
|
#define NETDATA_ML_CALCULATED_NUMBER_H
|
||||||
|
|
||||||
|
-#include "dlib/dlib/matrix.h"
|
||||||
|
+#include "dlib/matrix.h"
|
||||||
|
|
||||||
|
// CentOS 7 shenanigans
|
||||||
|
#include <cmath>
|
||||||
11
net-mgmt/netdata/files/patch-src_ml_ml__kmeans.cc
Normal file
11
net-mgmt/netdata/files/patch-src_ml_ml__kmeans.cc
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- src/ml/ml_kmeans.cc.orig 2025-01-02 17:07:23 UTC
|
||||||
|
+++ src/ml/ml_kmeans.cc
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
|
||||||
|
#include "ml_kmeans.h"
|
||||||
|
#include "libnetdata/libnetdata.h"
|
||||||
|
-#include "dlib/dlib/clustering.h"
|
||||||
|
+#include "dlib/clustering.h"
|
||||||
|
|
||||||
|
void
|
||||||
|
ml_kmeans_init(ml_kmeans_t *kmeans)
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue