Merge pull request #3136 from ktsaou/master

both installers download configuration netdata

6 files changed, 149 insertions, 95 deletions

diff --git a/installer/functions.sh b/installer/functions.sh
index a5449faf4e..d403bfe520 100644
--- a/installer/functions.sh
+++ b/installer/functions.sh
@@ -640,6 +640,84 @@ install_netdata_logrotate() {
 }
 
 # -----------------------------------------------------------------------------
+# download netdata.conf
+
+fix_netdata_conf() {
+    local owner="${1}"
+
+    if [ "${UID}" -eq 0 ]
+        then
+        run chown "${owner}" "${filename}"
+    fi
+    run chmod 0664 "${filename}"
+}
+
+generate_netdata_conf() {
+    local owner="${1}" filename="${2}" url="${3}"
+
+    if [ ! -s "${filename}" ]
+        then
+        cat >"${filename}" <<EOFCONF
+# netdata can generate its own config.
+# Get it with:
+#
+# wget -O ${filename} "${url}"
+#
+# or
+#
+# curl -s -o ${filename} "${url}"
+#
+EOFCONF
+        fix_netdata_conf "${owner}"
+    fi
+}
+
+download_netdata_conf() {
+    local owner="${1}" filename="${2}" url="${3}"
+
+    if [ ! -s "${filename}" ]
+        then
+        echo >&2
+        echo >&2 "-------------------------------------------------------------------------------"
+        echo >&2
+        echo >&2 "Downloading default configuration from netdata..."
+        sleep 5
+
+        # remove a possibly obsolete download
+        [ -f "${filename}.new" ] && rm "${filename}.new"
+
+        # disable a proxy to get data from the local netdata
+        export http_proxy=
+        export https_proxy=
+
+        # try curl
+        run curl -s -o "${filename}.new" "${url}"
+        ret=$?
+
+        if [ ${ret} -ne 0 -o ! -s "${filename}.new" ]
+            then
+            # try wget
+            run wget -O "${filename}.new" "${url}"
+            ret=$?
+        fi
+
+        if [ ${ret} -eq 0 -a -s "${filename}.new" ]
+            then
+            run mv "${filename}.new" "${filename}"
+            run_ok "New configuration saved for you to edit at ${filename}"
+        else
+            [ -f "${filename}.new" ] && rm "${filename}.new"
+            run_failed "Cannnot download configuration from netdata daemon using url '${url}'"
+
+            generate_netdata_conf "${owner}" "${filename}" "${url}"
+        fi
+
+        fix_netdata_conf "${owner}"
+    fi
+}
+
+
+# -----------------------------------------------------------------------------
 # add netdata user and group
 
 NETDATA_ADDED_TO_DOCKER=0
@@ -654,15 +732,15 @@ add_netdata_user_and_group() {
     if [ ${UID} -eq 0 ]
         then
         portable_add_group netdata || return 1
-        portable_add_user netdata || return 1
+        portable_add_user netdata  || return 1
         portable_add_user_to_group docker   netdata && NETDATA_ADDED_TO_DOCKER=1
         portable_add_user_to_group nginx    netdata && NETDATA_ADDED_TO_NGINX=1
         portable_add_user_to_group varnish  netdata && NETDATA_ADDED_TO_VARNISH=1
         portable_add_user_to_group haproxy  netdata && NETDATA_ADDED_TO_HAPROXY=1
         portable_add_user_to_group adm      netdata && NETDATA_ADDED_TO_ADM=1
         portable_add_user_to_group nsd      netdata && NETDATA_ADDED_TO_NSD=1
-        portable_add_user_to_group proxy      netdata && NETDATA_ADDED_TO_PROXY=1
-        portable_add_user_to_group squid      netdata && NETDATA_ADDED_TO_SQUID=1
+        portable_add_user_to_group proxy    netdata && NETDATA_ADDED_TO_PROXY=1
+        portable_add_user_to_group squid    netdata && NETDATA_ADDED_TO_SQUID=1
         return 0
     fi
 
diff --git a/makeself/install-or-update.sh b/makeself/install-or-update.sh
index b64e7be335..34630cf169 100755
--- a/makeself/install-or-update.sh
+++ b/makeself/install-or-update.sh
@@ -162,7 +162,9 @@ progress "starting netdata"
 restart_netdata "/opt/netdata/bin/netdata"
 if [ $? -eq 0 ]
     then
+    download_netdata_conf "${NETDATA_USER}:${NETDATA_GROUP}" "/opt/netdata/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf"
     netdata_banner "is installed and running now!"
 else
+    generate_netdata_conf "${NETDATA_USER}:${NETDATA_GROUP}" "/opt/netdata/etc/netdata/netdata.conf" "http://localhost:19999/netdata.conf"
     netdata_banner "is installed now!"
 fi
diff --git a/makeself/jobs/70-netdata-git.install.sh b/makeself/jobs/70-netdata-git.install.sh
index 0486ce11a8..b85481492c 100755
--- a/makeself/jobs/70-netdata-git.install.sh
+++ b/makeself/jobs/70-netdata-git.install.sh
@@ -11,6 +11,13 @@ else
     export CFLAGS="-static -O1 -ggdb -Wall -Wextra -Wformat-signedness -fstack-protector-all -D_FORTIFY_SOURCE=2 -DNETDATA_INTERNAL_CHECKS=1"
 fi
 
+if [ ! -z "${NETDATA_INSTALL_PATH}" -a -d "${NETDATA_INSTALL_PATH}/etc" ]
+    then
+    # make sure we don't have an old etc path, so that the installer
+    # will install all files without examining changes
+    run mv "${NETDATA_INSTALL_PATH}/etc" "${NETDATA_INSTALL_PATH}/etc.new"
+fi
+
 run ./netdata-installer.sh --install "${NETDATA_INSTALL_PARENT}" \
     --dont-wait \
     --dont-start-it \
@@ -20,4 +27,5 @@ if [ ${NETDATA_BUILD_WITH_DEBUG} -eq 0 ]
 then
     run strip ${NETDATA_INSTALL_PATH}/bin/netdata
     run strip ${NETDATA_INSTALL_PATH}/usr/libexec/netdata/plugins.d/apps.plugin
+    run strip ${NETDATA_INSTALL_PATH}/usr/libexec/netdata/plugins.d/cgroup-network
 fi
diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh
index 465a319527..698f2f92d8 100755
--- a/makeself/jobs/99-makeself.install.sh
+++ b/makeself/jobs/99-makeself.install.sh
@@ -2,14 +2,46 @@
 
 . $(dirname "${0}")/../functions.sh "${@}" || exit 1
 
+run cd "${NETDATA_SOURCE_PATH}" || exit 1
+
+# -----------------------------------------------------------------------------
+# find the netdata version
+
+NOWNER="unknown"
+ORIGIN="$(git config --get remote.origin.url || echo "unknown")"
+if [[ "${ORIGIN}" =~ ^git@github.com:.*/netdata.*$ ]]
+    then
+    NOWNER="${ORIGIN/git@github.com:/}"
+    NOWNER="${NOWNER/\/netdata*/}"
+
+elif [[ "${ORIGIN}" =~ ^https://github.com/.*/netdata.*$ ]]
+    then
+    NOWNER="${ORIGIN/https:\/\/github.com\//}"
+    NOWNER="${NOWNER/\/netdata*/}"
+fi
+
+# make sure it does not have any slashes in it
+NOWNER="${NOWNER//\//_}"
+
+if [ "${NOWNER}" = "firehol" ]
+    then
+    NOWNER=
+else
+    NOWNER="-${NOWNER}"
+fi
+
+VERSION="$(git describe || echo "undefined")"
+[ -z "${VERSION}" ] && VERSION="undefined"
+
+FILE_VERSION="${VERSION}-$(uname -m)-$(date +"%Y%m%d-%H%M%S")${NOWNER}"
+
 
 # -----------------------------------------------------------------------------
 # copy the files needed by makeself installation
 
 run mkdir -p "${NETDATA_INSTALL_PATH}/system"
-run cd "${NETDATA_SOURCE_PATH}" || exit 1
 
-cp \
+run cp \
     makeself/post-installer.sh \
     makeself/install-or-update.sh \
     installer/functions.sh \
@@ -25,9 +57,9 @@ cp \
 # -----------------------------------------------------------------------------
 # create a wrapper to start our netdata with a modified path
 
-mkdir -p "${NETDATA_INSTALL_PATH}/bin/srv"
+run mkdir -p "${NETDATA_INSTALL_PATH}/bin/srv"
 
-mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
+run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \
     "${NETDATA_INSTALL_PATH}/bin/srv/netdata" || exit 1
 
 cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
@@ -35,28 +67,34 @@ cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF
 export PATH="${NETDATA_INSTALL_PATH}/bin:\${PATH}"
 exec "${NETDATA_INSTALL_PATH}/bin/srv/netdata" "\${@}"
 EOF
-chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
+run chmod 755 "${NETDATA_INSTALL_PATH}/bin/netdata"
 
 
 # -----------------------------------------------------------------------------
 # move etc to protect the destination when unpacked
 
-if [ -d "${NETDATA_INSTALL_PATH}/etc" ]
+if [ ! -z "${NETDATA_INSTALL_PATH}" -a -d "${NETDATA_INSTALL_PATH}/etc" ]
     then
     if [ -d "${NETDATA_INSTALL_PATH}/etc.new" ]
         then
-        rm -rf "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
+        run rm -rf "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
     fi
 
-    mv "${NETDATA_INSTALL_PATH}/etc" \
+    run mv "${NETDATA_INSTALL_PATH}/etc" \
         "${NETDATA_INSTALL_PATH}/etc.new" || exit 1
+
+    if [ -f "${NETDATA_INSTALL_PATH}/etc.new/netdata/netdata.conf" ]
+        then
+        # delete the generated netdata.conf, so that the static installer will generate a new one
+        run rm "${NETDATA_INSTALL_PATH}/etc.new/netdata/netdata.conf"
+    fi
 fi
 
 
 # -----------------------------------------------------------------------------
 # remove the links to allow untaring the archive
 
-rm "${NETDATA_INSTALL_PATH}/sbin" \
+run rm "${NETDATA_INSTALL_PATH}/sbin" \
     "${NETDATA_INSTALL_PATH}/usr/bin" \
     "${NETDATA_INSTALL_PATH}/usr/sbin" \
     "${NETDATA_INSTALL_PATH}/usr/local"
@@ -65,14 +103,16 @@ rm "${NETDATA_INSTALL_PATH}/sbin" \
 # -----------------------------------------------------------------------------
 # create the makeself archive
 
-"${NETDATA_MAKESELF_PATH}/makeself.sh" \
+run sed "s|NETDATA_VERSION|${FILE_VERSION}|g" <"${NETDATA_MAKESELF_PATH}/makeself.lsm" >"${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
+
+run "${NETDATA_MAKESELF_PATH}/makeself.sh" \
     --gzip \
     --complevel 9 \
     --notemp \
     --needroot \
     --target "${NETDATA_INSTALL_PATH}" \
     --header "${NETDATA_MAKESELF_PATH}/makeself-header.sh" \
-    --lsm "${NETDATA_MAKESELF_PATH}/makeself.lsm" \
+    --lsm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp" \
     --license "${NETDATA_MAKESELF_PATH}/makeself-license.txt" \
     --help-header "${NETDATA_MAKESELF_PATH}/makeself-help-header.txt" \
     "${NETDATA_INSTALL_PATH}" \
@@ -81,41 +121,16 @@ rm "${NETDATA_INSTALL_PATH}/sbin" \
     ./system/post-installer.sh \
     ${NULL}
 
+run rm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp"
 
 # -----------------------------------------------------------------------------
 # copy it to the netdata build dir
 
-NOWNER="unknown"
-ORIGIN="$(git config --get remote.origin.url || echo "unknown")"
-if [[ "${ORIGIN}" =~ ^git@github.com:.*/netdata.*$ ]]
-    then
-    NOWNER="${ORIGIN/git@github.com:/}"
-    NOWNER="${NOWNER/\/netdata*/}"
-
-elif [[ "${ORIGIN}" =~ ^https://github.com/.*/netdata.*$ ]]
-    then
-    NOWNER="${ORIGIN/https:\/\/github.com\//}"
-    NOWNER="${NOWNER/\/netdata*/}"
-fi
-
-# make sure it does not have any slashes in it
-NOWNER="${NOWNER//\//_}"
-
-if [ "${NOWNER}" = "firehol" ]
-    then
-    NOWNER=
-else
-    NOWNER="-${NOWNER}"
-fi
-
-VERSION="$(git describe || echo "undefined")"
-[ -z "${VERSION}" ] && VERSION="undefined"
-
-FILE="netdata-${VERSION}-$(uname -m)-$(date +"%Y%m%d-%H%M%S")${NOWNER}.gz.run"
+FILE="netdata-${FILE_VERSION}.gz.run"
 
-cp "${NETDATA_INSTALL_PATH}.gz.run" "${FILE}"
+run cp "${NETDATA_INSTALL_PATH}.gz.run" "${FILE}"
 echo >&2 "Self-extracting installer copied to '${FILE}'"
 
 [ -f netdata-latest.gz.run ] && rm netdata-latest.gz.run
-ln -s "${FILE}" netdata-latest.gz.run
+run ln -s "${FILE}" netdata-latest.gz.run
 echo >&2 "Self-extracting installer linked to 'netdata-latest.gz.run'"
diff --git a/makeself/makeself.lsm b/makeself/makeself.lsm
index 0267962948..6bd4703db2 100644
--- a/makeself/makeself.lsm
+++ b/makeself/makeself.lsm
@@ -1,6 +1,6 @@
 Begin3
 Title:          netdata
-Version:        1.6.0
+Version:        NETDATA_VERSION
 Description:    netdata is a system for distributed real-time performance and health monitoring.
                 It provides unparalleled insights, in real-time, of everything happening on the
                 system it runs (including applications such as web and database servers), using
diff --git a/netdata-installer.sh b/netdata-installer.sh
index f3f444f667..356eb4e4f6 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -817,16 +817,7 @@ install_netdata_service || run_failed "Cannot install netdata init service."
 started=0
 if [ ${DONOTSTART} -eq 1 ]
     then
-    if [ ! -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf" ]
-        then
-        echo "# Get config from http://127.0.0.1:${NETDATA_PORT}/netdata.conf" >"${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-
-        if [ "${UID}" -eq 0 ]
-            then
-            chown "${NETDATA_USER}" "${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-        fi
-        chmod 0644 "${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-    fi
+    generate_netdata_conf "${NETDATA_USER}" "${NETDATA_PREFIX}/etc/netdata/netdata.conf" "http://localhost:${NETDATA_PORT}/netdata.conf"
 
 else
     restart_netdata ${NETDATA_PREFIX}/usr/sbin/netdata "${@}"
@@ -845,47 +836,7 @@ else
     # -----------------------------------------------------------------------------
     # save a config file, if it is not already there
 
-    if [ ! -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf" ]
-        then
-        echo >&2
-        echo >&2 "-------------------------------------------------------------------------------"
-        echo >&2
-        echo >&2 "Downloading default configuration from netdata..."
-        sleep 5
-
-        # remove a possibly obsolete download
-        [ -f "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ] && rm "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new"
-
-        # disable a proxy to get data from the local netdata
-        export http_proxy=
-        export https_proxy=
-
-        # try wget
-        wget 2>/dev/null -O "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" "http://localhost:${NETDATA_PORT}/netdata.conf"
-        ret=$?
-
-        # try curl
-        if [ ${ret} -ne 0 -o ! -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ]
-            then
-            curl -s -o "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" "http://localhost:${NETDATA_PORT}/netdata.conf"
-            ret=$?
-        fi
-
-        if [ ${ret} -eq 0 -a -s "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ]
-            then
-            mv "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" "${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-            echo >&2 "New configuration saved for you to edit at ${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-
-            if [ "${UID}" -eq 0 ]
-                then
-                chown "${NETDATA_USER}" "${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-            fi
-            chmod 0664 "${NETDATA_PREFIX}/etc/netdata/netdata.conf"
-        else
-            echo >&2 "Cannnot download configuration from netdata daemon using url 'http://localhost:${NETDATA_PORT}/netdata.conf'"
-            [ -f "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new" ] && rm "${NETDATA_PREFIX}/etc/netdata/netdata.conf.new"
-        fi
-    fi
+    download_netdata_conf "${NETDATA_USER}" "${NETDATA_PREFIX}/etc/netdata/netdata.conf" "http://localhost:${NETDATA_PORT}/netdata.conf"
 fi
 
 # -----------------------------------------------------------------------------