Merging upstream version 1.34.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 181 insertions, 2 deletions

diff --git a/.github/scripts/docker-test.sh b/.github/scripts/docker-test.sh
index 795711b1a..22821d17e 100755
--- a/.github/scripts/docker-test.sh
+++ b/.github/scripts/docker-test.sh
@@ -33,7 +33,9 @@ wait_for() {
   printf "OK\n"
 }
 
-apt-get update && apt-get upgrade -y && apt get install -y netcat
+if [ -z "$(command -v nc 2>/dev/null)" ] && [ -z "$(command -v netcat 2>/dev/null)" ]; then
+    sudo apt-get update && sudo apt-get upgrade -y && sudo apt-get install -y netcat
+fi
 
 docker run -d --name=netdata \
            -p 19999:19999 \
diff --git a/.github/scripts/prepare-release-base.sh b/.github/scripts/prepare-release-base.sh
new file mode 100755
index 000000000..cb6be8e7c
--- /dev/null
+++ b/.github/scripts/prepare-release-base.sh
@@ -0,0 +1,177 @@
+#!/bin/sh
+
+set -e
+
+REPO="${1}"
+EVENT_NAME="${2}"
+EVENT_TYPE="${3}"
+EVENT_VERSION="${4}"
+
+##############################################################
+# Version validation functions
+
+check_version_format() {
+    if ! echo "${EVENT_VERSION}" | grep -qE '^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$'; then
+        echo "::error::The supplied version (${EVENT_VERSION}) is not a valid version string."
+        return 1
+    fi
+}
+
+patch_is_zero() {
+    if ! echo "${EVENT_VERSION}" | grep -qE '^v[[:digit:]]+\.[[:digit:]]+\.0$'; then
+        echo "::error::The patch number for a ${EVENT_TYPE} build must be 0."
+        return 1
+    fi
+}
+
+minor_is_zero() {
+    if ! echo "${EVENT_VERSION}" | grep -qE '^v[[:digit:]]+\.0';  then
+        echo "::error::The minor version number for a ${EVENT_TYPE} build must be 0."
+        return 1
+    fi
+}
+
+major_matches() {
+    current_major="$(cut -f 1 -d '-' packaging/version | cut -f 1 -d '.' | cut -f 2 -d 'v')"
+    target_major="$(echo "${EVENT_VERSION}" | cut -f 1 -d '.' | cut -f 2 -d 'v')"
+
+    if [ "${target_major}" != "${current_major}" ]; then
+        echo "::error::Major version mismatch, expected ${current_major} but got ${target_major}."
+        return 1
+    fi
+}
+
+minor_matches() {
+    current_minor="$(cut -f 1 -d '-' packaging/version | cut -f 2 -d '.')"
+    target_minor="$(echo "${EVENT_VERSION}" | cut -f 2 -d '.')"
+
+    if [ "${target_minor}" != "${current_minor}" ]; then
+        echo "::error::Minor version mismatch, expected ${current_minor} but got ${target_minor}."
+        return 1
+    fi
+}
+
+check_for_existing_tag() {
+    if git tag | grep -qE "^${EVENT_VERSION}$"; then
+        echo "::error::A tag for version ${EVENT_VERSION} already exists."
+        return 1
+    fi
+}
+
+check_newer_major_version() {
+    current="$(cut -f 1 -d '-' packaging/version | cut -f 1 -d '.' | cut -f 2 -d 'v')"
+    target="$(echo "${EVENT_VERSION}" | cut -f 1 -d '.' | cut -f 2 -d 'v')"
+
+    if [ "${target}" -le "${current}" ]; then
+        echo "::error::Version ${EVENT_VERSION} is not newer than the current version."
+        return 1
+    fi
+}
+
+check_newer_minor_version() {
+    current="$(cut -f 1 -d '-' packaging/version | cut -f 2 -d '.')"
+    target="$(echo "${EVENT_VERSION}" | cut -f 2 -d '.')"
+
+    if [ "${target}" -le "${current}" ]; then
+        echo "::error::Version ${EVENT_VERSION} is not newer than the current version."
+        return 1
+    fi
+}
+
+check_newer_patch_version() {
+    current="$(cut -f 1 -d '-' packaging/version | cut -f 3 -d '.')"
+    target="$(echo "${EVENT_VERSION}" | cut -f 3 -d '.')"
+
+    if [ "${target}" -le "${current}" ]; then
+        echo "::error::Version ${EVENT_VERSION} is not newer than the current version."
+        return 1
+    fi
+}
+
+##############################################################
+# Core logic
+
+git config user.name "netdatabot"
+git config user.email "bot@netdata.cloud"
+
+if [ "${REPO}" != "netdata/netdata" ]; then
+    echo "::notice::Not running in the netdata/netdata repository, not queueing a release build."
+    echo "::set-output name=run::false"
+elif [ "${EVENT_NAME}" = 'schedule' ] || [ "${EVENT_TYPE}" = 'nightly' ]; then
+    echo "::notice::Preparing a nightly release build."
+    LAST_TAG=$(git describe --abbrev=0 --tags)
+    COMMITS_SINCE_RELEASE=$(git rev-list "${LAST_TAG}"..HEAD --count)
+    NEW_VERSION="${LAST_TAG}-$((COMMITS_SINCE_RELEASE + 1))-nightly"
+    LAST_VERSION_COMMIT="$(git rev-list -1 HEAD packaging/version)"
+    HEAD_COMMIT="$(git rev-parse HEAD)"
+    if [ "${EVENT_NAME}" = 'schedule' ] && [ "${LAST_VERSION_COMMIT}" = "${HEAD_COMMIT}" ] && grep -qE '.*-nightly$' packaging/version; then
+        echo "::notice::No commits since last nightly build, not publishing a new nightly build."
+        echo "::set-output name=run::false"
+    else
+        echo "${NEW_VERSION}" > packaging/version || exit 1
+        echo "::set-output name=run::true"
+        echo "::set-output name=message::Update changelog and version for nightly build: ${NEW_VERSION}."
+        echo "::set-output name=ref::master"
+        echo "::set-output name=type::nightly"
+        echo "::set-output name=branch::master"
+        echo "::set-output name=version::nightly"
+    fi
+elif [ "${EVENT_TYPE}" = 'patch' ] && [ "${EVENT_VERSION}" != "nightly" ]; then
+    echo "::notice::Preparing a patch release build."
+    check_version_format || exit 1
+    check_for_existing_tag || exit 1
+    branch_name="$(echo "${EVENT_VERSION}" | cut -f 1-2 -d '.')"
+    if [ -z "$(git branch --list "${branch_name}")" ]; then
+        echo "::error::Could not find a branch for the ${branch_name}.x release series."
+        exit 1
+    fi
+    git checkout "${branch_name}"
+    minor_matches || exit 1
+    major_matches || exit 1
+    check_newer_patch_number || exit 1
+    echo "${EVENT_VERSION}" > packaging/version || exit 1
+    echo "::set-output name=run::true"
+    echo "::set-output name=message::Patch release ${EVENT_VERSION}."
+    echo "::set-output name=ref::${EVENT_VERSION}"
+    echo "::set-output name=type::release"
+    echo "::set-output name=branch::${branch_name}"
+    echo "::set-output name=version::$(tr -d 'v' < packaging/version)"
+elif [ "${EVENT_TYPE}" = 'minor' ] && [ "${EVENT_VERSION}" != "nightly" ]; then
+    echo "::notice::Preparing a minor release build."
+    check_version_format || exit 1
+    patch_is_zero || exit 1
+    major_matches || exit 1
+    check_newer_minor_version || exit 1
+    check_for_existing_tag || exit 1
+    branch_name="$(echo "${EVENT_VERSION}" | cut -f 1-2 -d '.')"
+    if [ -n "$(git branch --list "${branch_name}")" ]; then
+        echo "::error::A branch named ${branch_name} already exists in the repository."
+        exit 1
+    fi
+    git branch "${branch_name}"
+    git checkout "${branch_name}"
+    echo "${EVENT_VERSION}" > packaging/version || exit 1
+    echo "::set-output name=run::true"
+    echo "::set-output name=message::Minor release ${EVENT_VERSION}."
+    echo "::set-output name=ref::${EVENT_VERSION}"
+    echo "::set-output name=type::release"
+    echo "::set-output name=branch::${branch_name}"
+    echo "::set-output name=version::$(tr -d 'v' < packaging/version)"
+elif [ "${EVENT_TYPE}" = 'major' ] && [ "${EVENT_VERSION}" != "nightly" ]; then
+    echo "::notice::Preparing a major release build."
+    check_version_format || exit 1
+    minor_is_zero || exit 1
+    patch_is_zero || exit 1
+    check_newer_major_version || exit 1
+    check_for_existing_tag || exit 1
+    echo "${EVENT_VERSION}" > packaging/version || exit 1
+    echo "::set-output name=run::true"
+    echo "::set-output name=message::Major release ${EVENT_VERSION}"
+    echo "::set-output name=ref::${EVENT_VERSION}"
+    echo "::set-output name=type::release"
+    echo "::set-output name=branch::master"
+    echo "::set-output name=version::$(tr -d 'v' < packaging/version)"
+else
+    echo '::error::Unrecognized release type or invalid version.'
+    exit 1
+fi
diff --git a/.github/scripts/run_install_with_dist_file.sh b/.github/scripts/run_install_with_dist_file.sh
index 18cf80927..83559f267 100755
--- a/.github/scripts/run_install_with_dist_file.sh
+++ b/.github/scripts/run_install_with_dist_file.sh
@@ -29,7 +29,7 @@ printf >&2 "Entering %s and starting docker run ..." "${distdir}"
 
 pushd "${distdir}" || exit 1
 docker run \
-  -e DO_NOT_TRACK=1 \
+  -e DISABLE_TELEMETRY=1 \
   -v "${PWD}:/netdata" \
   -w /netdata \
   "ubuntu:latest" \