From a76b82f50a97a15245db98bf15160085a90696fe Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Wed, 29 Dec 2021 18:14:51 +0100 Subject: [PATCH 1/2] Upgrade to upstream version 1.32.1 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 5c561e6..0298443 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste (**physical** & **virtual** servers, **containers**, **IoT** devices), without disrupting their core function._ -**Shipped version:** 1.31.0 +**Shipped version:** 1.32.1 **Customization brought by the package:** diff --git a/conf/app.src b/conf/app.src index d9f50fb..a4692fe 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,3 +1,3 @@ -SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.31.0/netdata-v1.31.0.tar.gz -SOURCE_SUM=ca68f725224e8bbec041b493891376fbf41aedb47c4ac06161c2eda990089c9f +SOURCE_URL=https://github.com/netdata/netdata/releases/download/1.32.1/netdata-v1.32.1.tar.gz +SOURCE_SUM=ac406513e86ad24976a66146702aeac960e43908abc51d70e4a073905275d13e SOURCE_FORMAT=tar.gz diff --git a/manifest.json b/manifest.json index 2749d9b..c199d05 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Real-time performance and health monitoring", "fr": "Monitoring serveur en temps reel" }, - "version": "1.31.0~ynh1", + "version": "1.32.1~ynh1", "url": "http://my-netdata.io/", "license": "GPL-3.0", "maintainer": { From e328eee8772a1988090f1ba96bef74daaca7d370 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Wed, 29 Dec 2021 18:15:11 +0100 Subject: [PATCH 2/2] Fix too verbose restoration --- scripts/restore | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index bd0dbfb..38fc509 100644 --- a/scripts/restore +++ b/scripts/restore @@ -73,12 +73,21 @@ ynh_script_progression --message="Reinstalling Netdata..." --weight=18 # Download, check integrity, uncompress and patch the source from app.src NETDATA_TMPDIR=$(mktemp -d) -ynh_setup_source "$NETDATA_TMPDIR" +ynh_setup_source --dest_dir="$NETDATA_TMPDIR" + +# create a temporary file for the log +tmp=$(mktemp /tmp/netdata-updater-log-XXXXXX.log) +# open fd 3 and send it to tmp +exec 3>${tmp} # Launch netdata installation in /opt directory cd $NETDATA_TMPDIR -./netdata-installer.sh --install /opt --dont-wait +./netdata-installer.sh --install /opt --dont-wait --disable-cloud >&3 2>&3 || ynh_die "FAILED TO COMPILE/INSTALL NETDATA" +# close fd 3 +exec 3<&- + +# Specific configuration configure_netdata #=================================================