diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2022-12-09 17:35:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 17:35:53 +0200 |
| commit | 4322b1973d23a93d4e78a6cdf4c6da295da9f71c (patch) | |
| tree | 7e6c2705a96ab94fe4315db11432282354fbcd05 /packaging | |
| parent | ab28a99a4837b6a5de4073a6200cdb098a3c0920 (diff) | |
remove deprecated fping.plugin in accordance with v1.37.0 deprecation notice (#14073)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | packaging/makeself/install-or-update.sh | 6 | ||||
| -rwxr-xr-x | packaging/makeself/jobs/50-fping-5.1.install.sh | 45 |
3 files changed, 0 insertions, 54 deletions
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile index 287c592bb8..1b1d45cff5 100644 --- a/packaging/docker/Dockerfile +++ b/packaging/docker/Dockerfile @@ -76,9 +76,6 @@ RUN mkdir -p /opt/src /var/log/netdata && \ ln -sf /dev/stdout /var/log/netdata/access.log && \ ln -sf /dev/stdout /var/log/netdata/debug.log && \ ln -sf /dev/stderr /var/log/netdata/error.log && \ - # fping from alpine apk is on a different location. Moving it. - ln -snf /usr/sbin/fping /usr/local/bin/fping && \ - chmod 4755 /usr/local/bin/fping && \ # Add netdata user addgroup -g ${NETDATA_GID} -S "${DOCKER_GRP}" && \ adduser -S -H -s /usr/sbin/nologin -u ${NETDATA_GID} -h /etc/netdata -G "${DOCKER_GRP}" "${DOCKER_USR}" diff --git a/packaging/makeself/install-or-update.sh b/packaging/makeself/install-or-update.sh index be2b2f75f8..99cc189e6f 100755 --- a/packaging/makeself/install-or-update.sh +++ b/packaging/makeself/install-or-update.sh @@ -218,12 +218,6 @@ if [ -f "usr/libexec/netdata/plugins.d/go.d.plugin" ] && command -v setcap 1>/de run setcap "cap_net_admin+epi cap_net_raw=eip" "usr/libexec/netdata/plugins.d/go.d.plugin" fi -# fix the fping binary -if [ -f bin/fping ]; then - run chown root:${NETDATA_GROUP} bin/fping - run chmod 4750 bin/fping -fi - # ----------------------------------------------------------------------------- echo "Configure TLS certificate paths" diff --git a/packaging/makeself/jobs/50-fping-5.1.install.sh b/packaging/makeself/jobs/50-fping-5.1.install.sh deleted file mode 100755 index 644b5524ad..0000000000 --- a/packaging/makeself/jobs/50-fping-5.1.install.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-or-later - -# shellcheck source=packaging/makeself/functions.sh -. "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 - -version="5.1" - -# shellcheck disable=SC2015 -[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building fping" || true - -fetch "fping-${version}" "https://fping.org/dist/fping-${version}.tar.gz" \ - 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe fping - -export CFLAGS="-static -I/openssl-static/include -pipe" -export LDFLAGS="-static -L/openssl-static/lib" -export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig" - -if [ "${CACHE_HIT:-0}" -eq 0 ]; then - run ./configure \ - --prefix="${NETDATA_INSTALL_PATH}" \ - --enable-ipv4 \ - --enable-ipv6 \ - --disable-dependency-tracking - - cat > doc/Makefile <<-EOF - all: - clean: - install: - EOF - - run make clean - run make -j "$(nproc)" -fi - -run make install - -store_cache fping "${NETDATA_MAKESELF_PATH}/tmp/fping-${version}" - -if [ "${NETDATA_BUILD_WITH_DEBUG}" -eq 0 ]; then - run strip "${NETDATA_INSTALL_PATH}"/bin/fping -fi - -# shellcheck disable=SC2015 -[ "${GITHUB_ACTIONS}" = "true" ] && echo "::endgroup::" || true |