mirror of
https://github.com/netdata/netdata.git
synced 2025-04-10 16:17:36 +00:00
Fix DEB package builds. (#17765)
* Check for supplementary components in libexec during runtime checks. This should catch issues like what the PR it’s part of is fixing. * Fix building DEB packages with CPack. This both disables the logs-management plugin in the builds (which has never actually worked properly in our packages for multiple reasons) and fixes a botched merge involving the OS detection in the build system. * Fix up CI checks.
This commit is contained in:
Austin S. Hemmelgarn
GitHub
parent
2d59017ba5
commit
bbd591a8a7
5 changed files with 68 additions and 14 deletions
7
.github/scripts/pkg-test.sh
vendored
7
.github/scripts/pkg-test.sh
vendored
|
|
@ -120,6 +120,13 @@ esac
|
|||
|
||||
trap dump_log EXIT
|
||||
|
||||
export NETDATA_LIBEXEC_PREFIX=/usr/libexec/netdata
|
||||
export NETDATA_SKIP_LIBEXEC_PARTS="logs-management|freeipmi|xenstat|nfacct|cups"
|
||||
|
||||
if [ "$(uname -m)" != "x86_64" ]; then
|
||||
export NETDATA_SKIP_LIBEXEC_PARTS="${NETDATA_SKIP_LIBEXEC_PARTS}|ebpf"
|
||||
fi
|
||||
|
||||
/usr/sbin/netdata -D > ./netdata.log 2>&1 &
|
||||
|
||||
"${SCRIPT_DIR}/../../packaging/runtime-check.sh" || exit 1
|
||||
|
|
|
|||
|
|
@ -141,23 +141,23 @@ option(ENABLE_DBENGINE "Enable dbengine metrics storage" True)
|
|||
option(ENABLE_PLUGIN_APPS "Enable per-process resource usage monitoring" ${DEFAULT_FEATURE_STATE})
|
||||
option(ENABLE_PLUGIN_GO "Enable metric collectors written in Go" ${DEFAULT_FEATURE_STATE})
|
||||
|
||||
cmake_dependent_option(ENABLE_PLUGIN_CUPS "Enable CUPS monitoring" ${DEFAULT_FEATURE_STATE} "LINUX OR FREEBSD OR MACOS" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_CUPS "Enable CUPS monitoring" ${DEFAULT_FEATURE_STATE} "OS_LINUX OR OS_FREEBSD OR OS_MACOS" False)
|
||||
|
||||
cmake_dependent_option(ENABLE_PLUGIN_FREEIPMI "Enable IPMI monitoring" ${DEFAULT_FEATURE_STATE} "LINUX OR FREEBSD" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_FREEIPMI "Enable IPMI monitoring" ${DEFAULT_FEATURE_STATE} "OS_LINUX OR OS_FREEBSD" False)
|
||||
|
||||
cmake_dependent_option(ENABLE_PLUGIN_CGROUP_NETWORK "Enable Linux CGroup network usage monitoring" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_DEBUGFS "Enable Linux DebugFS metric collection" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_EBPF "Enable Linux eBPF metric collection" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_CGROUP_NETWORK "Enable Linux CGroup network usage monitoring" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_DEBUGFS "Enable Linux DebugFS metric collection" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_EBPF "Enable Linux eBPF metric collection" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_LEGACY_EBPF_PROGRAMS "Enable eBPF programs for kernels without BTF support" True "ENABLE_PLUGIN_EBPF" False)
|
||||
mark_as_advanced(ENABLE_LEGACY_EBPF_PROGRAMS)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_LOCAL_LISTENERS "Enable local listening socket tracking (including service auto-discovery support)" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_LOGS_MANAGEMENT "Enable log collection and monitoring based on Fluent Bit" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_NETWORK_VIEWER "Enable network viewer functionality" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_NFACCT "Enable Linux NFACCT metric collection" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_PERF "Enable Linux performance counter monitoring" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_SLABINFO "Enable Linux kernel SLAB allocator monitoring" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_SYSTEMD_JOURNAL "Enable systemd journal log collection" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_XENSTAT "Enable Xen domain monitoring" ${DEFAULT_FEATURE_STATE} "LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_LOCAL_LISTENERS "Enable local listening socket tracking (including service auto-discovery support)" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_LOGS_MANAGEMENT "Enable log collection and monitoring based on Fluent Bit" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_NETWORK_VIEWER "Enable network viewer functionality" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_NFACCT "Enable Linux NFACCT metric collection" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_PERF "Enable Linux performance counter monitoring" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_SLABINFO "Enable Linux kernel SLAB allocator monitoring" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_SYSTEMD_JOURNAL "Enable systemd journal log collection" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
cmake_dependent_option(ENABLE_PLUGIN_XENSTAT "Enable Xen domain monitoring" ${DEFAULT_FEATURE_STATE} "OS_LINUX" False)
|
||||
|
||||
# Metrics exporters
|
||||
option(ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE "Enable exporting to Prometheus via remote write API" ${DEFAULT_FEATURE_STATE})
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ add_cmake_option ENABLE_PLUGIN_DEBUGFS On
|
|||
add_cmake_option ENABLE_PLUGIN_FREEIPMI On
|
||||
add_cmake_option ENABLE_PLUGIN_GO On
|
||||
add_cmake_option ENABLE_PLUGIN_LOCAL_LISTENERS On
|
||||
add_cmake_option ENABLE_PLUGIN_LOGS_MANAGEMENT On
|
||||
add_cmake_option ENABLE_PLUGIN_LOGS_MANAGEMENT Off
|
||||
add_cmake_option ENABLE_PLUGIN_NFACCT On
|
||||
add_cmake_option ENABLE_PLUGIN_PERF On
|
||||
add_cmake_option ENABLE_PLUGIN_SLABINFO On
|
||||
|
|
|
|||
|
|
@ -10,6 +10,13 @@ dump_log() {
|
|||
|
||||
trap dump_log EXIT
|
||||
|
||||
export NETDATA_LIBEXEC_PREFIX="${NETDATA_INSTALL_PATH}/usr/libexec/netdata"
|
||||
export NETDATA_SKIP_LIBEXEC_PARTS="logs-management|freeipmi|xenstat|cups"
|
||||
|
||||
if [ "$(uname -m)" != "x86_64" ]; then
|
||||
export NETDATA_SKIP_LIBEXEC_PARTS="${NETDATA_SKIP_LIBEXEC_PARTS}|ebpf"
|
||||
fi
|
||||
|
||||
"${NETDATA_INSTALL_PATH}/bin/netdata" -D > ./netdata.log 2>&1 &
|
||||
|
||||
"${NETDATA_SOURCE_PATH}/packaging/runtime-check.sh" || exit 1
|
||||
|
|
|
|||
|
|
@ -48,3 +48,43 @@ curl -sfS http://127.0.0.1:19999/index.html || exit 1
|
|||
curl -sfS http://127.0.0.1:19999/v0/index.html || exit 1
|
||||
curl -sfS http://127.0.0.1:19999/v1/index.html || exit 1
|
||||
curl -sfS http://127.0.0.1:19999/v2/index.html || exit 1
|
||||
|
||||
NETDATA_LIBEXEC_PARTS="
|
||||
plugins.d/apps.plugin
|
||||
plugins.d/cgroup-network
|
||||
plugins.d/charts.d.plugin
|
||||
plugins.d/cups.plugin
|
||||
plugins.d/debugfs.plugin
|
||||
plugins.d/ebpf.plugin
|
||||
plugins.d/freeipmi.plugin
|
||||
plugins.d/go.d.plugin
|
||||
plugins.d/ioping.plugin
|
||||
plugins.d/local-listeners
|
||||
plugins.d/logs-management.plugin
|
||||
plugins.d/ndsudo
|
||||
plugins.d/network-viewer.plugin
|
||||
plugins.d/nfacct.plugin
|
||||
plugins.d/perf.plugin
|
||||
plugins.d/python.d.plugin
|
||||
plugins.d/slabinfo.plugin
|
||||
plugins.d/xenstat.plugin
|
||||
"
|
||||
|
||||
if [ -d "${NETDATA_LIBEXEC_PREFIX}" ]; then
|
||||
success=1
|
||||
for part in ${NETDATA_LIBEXEC_PARTS}; do
|
||||
# shellcheck disable=SC2254
|
||||
if echo "${part}" | grep -qE "${NETDATA_SKIP_LIBEXEC_PARTS}"; then
|
||||
continue
|
||||
fi
|
||||
|
||||
if [ ! -x "${NETDATA_LIBEXEC_PREFIX}/${part}" ]; then
|
||||
success=0
|
||||
echo "!!! ${NETDATA_LIBEXEC_PREFIX}/${part} is missing"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "${success}" -eq 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue