summaryrefslogtreecommitdiffstats
path: root/netdata-installer.sh
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-05-19 12:33:38 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-05-19 12:33:59 +0000
commit1ee0c09c5742557e037df5421ca62abddb90ae22 (patch)
tree71c0fa48bb6d31d036c9badd7e038527f90d1a73 /netdata-installer.sh
parentReleasing debian version 1.30.1-1. (diff)
downloadnetdata-1ee0c09c5742557e037df5421ca62abddb90ae22.tar.xz
netdata-1ee0c09c5742557e037df5421ca62abddb90ae22.zip
Merging upstream version 1.31.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'netdata-installer.sh')
-rwxr-xr-xnetdata-installer.sh47
1 files changed, 9 insertions, 38 deletions
diff --git a/netdata-installer.sh b/netdata-installer.sh
index 2bc9abc51..ea4aadb04 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -419,7 +419,7 @@ if [ -z "$NETDATA_DISABLE_TELEMETRY" ]; then
cat << BANNER4
${TPUT_YELLOW}${TPUT_BOLD}NOTE${TPUT_RESET}:
- Anonymous usage stats will be collected and sent to Google Analytics.
+ Anonymous usage stats will be collected and sent to Netdata.
To opt-out, pass --disable-telemetry option to the installer or export
the environment variable DO_NOT_TRACK to a non-zero or non-empty value
(e.g: export DO_NOT_TRACK=1).
@@ -650,12 +650,17 @@ EOF
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl \
-D OPENSSL_LIBRARIES=/usr/local/opt/openssl/lib \
-D LWS_WITH_SOCKS5:bool=ON \
+ -D LWS_IPV6:bool=ON \
$CMAKE_FLAGS \
.
else
- run ${env_cmd} cmake -D LWS_WITH_SOCKS5:bool=ON $CMAKE_FLAGS .
+ run ${env_cmd} cmake \
+ -D LWS_WITH_SOCKS5:bool=ON \
+ -D LWS_IPV6:bool=ON \
+ $CMAKE_FLAGS \
+ .
fi
- run ${env_cmd} make
+ run ${env_cmd} make -j$(find_processors)
popd > /dev/null || exit 1
}
@@ -1357,40 +1362,6 @@ fi
# -----------------------------------------------------------------------------
-copy_react_dashboard() {
- run cp -a $(find ${1} -mindepth 1 -maxdepth 1) "${NETDATA_WEB_DIR}"
- run chown -R "${NETDATA_WEB_USER}:${NETDATA_WEB_GROUP}" "${NETDATA_WEB_DIR}"
-}
-
-install_react_dashboard() {
- progress "Fetching and installing dashboard"
-
- DASHBOARD_PACKAGE_VERSION="$(cat packaging/dashboard.version)"
-
- tmp="$(mktemp -d -t netdata-dashboard-XXXXXX)"
- DASHBOARD_PACKAGE_BASENAME="dashboard.tar.gz"
-
- if fetch_and_verify "dashboard" \
- "https://github.com/netdata/dashboard/releases/download/${DASHBOARD_PACKAGE_VERSION}/${DASHBOARD_PACKAGE_BASENAME}" \
- "${DASHBOARD_PACKAGE_BASENAME}" \
- "${tmp}" \
- "${NETDATA_LOCAL_TARBALL_OVERRIDE_DASHBOARD}"; then
- if run tar -xf "${tmp}/${DASHBOARD_PACKAGE_BASENAME}" -C "${tmp}" &&
- copy_react_dashboard "${tmp}/build" &&
- rm -rf "${tmp}"; then
- run_ok "React dashboard installed."
- else
- run_failed "Failed to install React dashboard. The install process will continue, but you will not be able to use the new dashboard."
- fi
- else
- run_failed "Unable to fetch React dashboard. The install process will continue, but you will not be able to use the new dashboard."
- fi
-}
-
-install_react_dashboard
-
-# -----------------------------------------------------------------------------
-
# govercomp compares go.d.plugin versions. Exit codes:
# 0 - version1 == version2
# 1 - version1 > version2
@@ -1613,7 +1584,7 @@ remove_old_ebpf() {
if [ -f "${NETDATA_PREFIX}/etc/netdata/ebpf_process.conf" ]; then
echo >&2 "Renaming eBPF configuration file."
- mv "${NETDATA_PREFIX}/etc/netdata/ebpf_process.conf" "${NETDATA_PREFIX}/etc/netdata/ebpf.conf"
+ mv "${NETDATA_PREFIX}/etc/netdata/ebpf_process.conf" "${NETDATA_PREFIX}/etc/netdata/ebpf.d.conf"
fi
# Added to remove eBPF programs with name pattern: NAME_VERSION.SUBVERSION.PATCH