Merging upstream version 1.12.2.

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

1 files changed, 13 insertions, 5 deletions

diff --git a/netdata-installer.sh b/netdata-installer.sh
index 080570c87..181f20071 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -44,7 +44,7 @@ download() {
 	url="${1}"
 	dest="${2}"
 	if command -v curl >/dev/null 2>&1; then
-		run curl -L --connect-timeout 5 --retry 3 "${url}" >"${dest}" || fatal "Cannot download ${url}"
+		run curl -sSL --connect-timeout 10 --retry 3 "${url}" >"${dest}" || fatal "Cannot download ${url}"
 	elif command -v wget >/dev/null 2>&1; then
 		run wget -T 15 -O - "${url}" >"${dest}" || fatal "Cannot download ${url}"
 	else
@@ -100,6 +100,7 @@ AUTOUPDATE=0
 NETDATA_PREFIX=
 LIBS_ARE_HERE=0
 NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS-}"
+RELEASE_CHANNEL="nightly"
 
 usage() {
 	netdata_banner "installer command line options"
@@ -128,7 +129,12 @@ Valid <installer options> are:
 
         Install netdata-updater to cron,
         to update netdata automatically once per day
-        (can only be done for installations from git)
+
+   --stable-channel
+
+        Auto-updater will update netdata only when new release is published
+        in GitHub release pages. This results in less frequent updates.
+        Default: Use packages from GCS (nightly release channel).
 
    --enable-plugin-freeipmi
    --disable-plugin-freeipmi
@@ -204,6 +210,9 @@ while [ ! -z "${1}" ]; do
 	elif [ "$1" = "--auto-update" -o "$1" = "-u" ]; then
 		AUTOUPDATE=1
 		shift 1
+	elif [ "$1" = "--stable-channel" ]; then
+		RELEASE_CHANNEL="stable"
+		shift 1
 	elif [ "$1" = "--enable-plugin-freeipmi" ]; then
 		NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS//--enable-plugin-freeipmi/} --enable-plugin-freeipmi"
 		shift 1
@@ -1043,9 +1052,8 @@ NETDATA_CONFIGURE_OPTIONS="${NETDATA_CONFIGURE_OPTIONS}"
 NETDATA_ADDED_TO_GROUPS="${NETDATA_ADDED_TO_GROUPS}"
 INSTALL_UID="${UID}"
 REINSTALL_COMMAND="${REINSTALL_COMMAND}"
-# next 3 values are meant to be populated by autoupdater (if enabled)
-NETDATA_TARBALL_URL="https://storage.googleapis.com/netdata-nightlies/netdata-latest.tar.gz"
-NETDATA_TARBALL_CHECKSUM_URL="https://storage.googleapis.com/netdata-nightlies/sha256sums.txt"
+RELEASE_CHANNEL="${RELEASE_CHANNEL}"
+# This value is meant to be populated by autoupdater (if enabled)
 NETDATA_TARBALL_CHECKSUM="new_installation"
 EOF