diff --git a/README.md b/README.md
index e222452..951e31f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
# NetData for YunoHost
-[](https://dash.yunohost.org/appci/app/netdata)  
+[](https://ci-apps.yunohost.org/ci/apps/netdata/)  
[](https://install-app.yunohost.org/?app=netdata)
@@ -26,7 +26,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._
-**Shipped version:** 1.44.3~ynh1
+**Shipped version:** 1.46.1~ynh1
**Demo:**
## Documentation and resources
diff --git a/README_es.md b/README_es.md
index 8def4d7..7c13890 100644
--- a/README_es.md
+++ b/README_es.md
@@ -5,7 +5,7 @@ No se debe editar a mano.
# NetData para Yunohost
-[](https://dash.yunohost.org/appci/app/netdata)  
+[](https://ci-apps.yunohost.org/ci/apps/netdata/)  
[](https://install-app.yunohost.org/?app=netdata)
@@ -26,7 +26,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._
-**Versión actual:** 1.44.3~ynh1
+**Versión actual:** 1.46.1~ynh1
**Demo:**
## Documentaciones y recursos
diff --git a/README_eu.md b/README_eu.md
index d186da0..2b7f4a7 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -5,7 +5,7 @@ EZ editatu eskuz.
# NetData YunoHost-erako
-[](https://dash.yunohost.org/appci/app/netdata)  
+[](https://ci-apps.yunohost.org/ci/apps/netdata/)  
[](https://install-app.yunohost.org/?app=netdata)
@@ -26,7 +26,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._
-**Paketatutako bertsioa:** 1.44.3~ynh1
+**Paketatutako bertsioa:** 1.46.1~ynh1
**Demoa:**
## Dokumentazioa eta baliabideak
diff --git a/README_fr.md b/README_fr.md
index 7e5e470..d1dee80 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
# NetData pour YunoHost
-[](https://dash.yunohost.org/appci/app/netdata)  
+[](https://ci-apps.yunohost.org/ci/apps/netdata/)  
[](https://install-app.yunohost.org/?app=netdata)
@@ -26,7 +26,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._
-**Version incluse :** 1.44.3~ynh1
+**Version incluse :** 1.46.1~ynh1
**Démo :**
## Documentations et ressources
diff --git a/README_gl.md b/README_gl.md
index b05d22d..e325ec3 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -5,7 +5,7 @@ NON debe editarse manualmente.
# NetData para YunoHost
-[](https://dash.yunohost.org/appci/app/netdata)  
+[](https://ci-apps.yunohost.org/ci/apps/netdata/)  
[](https://install-app.yunohost.org/?app=netdata)
@@ -26,7 +26,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._
-**Versión proporcionada:** 1.44.3~ynh1
+**Versión proporcionada:** 1.46.1~ynh1
**Demo:**
## Documentación e recursos
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index a798e6f..19b2adc 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -5,7 +5,7 @@
# YunoHost 上的 NetData
-[](https://dash.yunohost.org/appci/app/netdata)  
+[](https://ci-apps.yunohost.org/ci/apps/netdata/)  
[](https://install-app.yunohost.org/?app=netdata)
@@ -26,7 +26,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._
-**分发版本：** 1.44.3~ynh1
+**分发版本：** 1.46.1~ynh1
**演示：**
## 文档与资源
diff --git a/manifest.toml b/manifest.toml
index 90ed890..7d6df29 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "NetData"
description.en = "Real-time performance and health monitoring"
description.fr = "Monitoring serveur en temps reel"
-version = "1.44.3~ynh1"
+version = "1.46.1~ynh1"
maintainers = ["JimboJoe"]
@@ -49,10 +49,19 @@ ram.runtime = "50M"
[resources.sources]
[resources.sources.main]
- url = "https://github.com/netdata/netdata/releases/download/v1.44.3/netdata-v1.44.3.tar.gz"
- sha256 = "50df30a9aaf60d550eb8e607230d982827e04194f7df3eba0e83ff7919270ad2"
+ url = "https://github.com/netdata/netdata/releases/download/v1.46.1/netdata-v1.46.1.tar.gz"
+ sha256 = "e909a109e1d60bf9416a70f2bb0bbf668d75c75d7ca9ce0b59d88fc634266114"
autoupdate.strategy = "latest_github_release"
autoupdate.asset = "^netdata-v([0-9.]*)tar.gz$"
+ [resources.sources.go]
+ amd64.url = "https://go.dev/dl/go1.22.4.linux-amd64.tar.gz"
+ amd64.sha256 = "ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d"
+ i386.url = "https://go.dev/dl/go1.22.4.linux-386.tar.gz"
+ i386.sha256 = "47a2a8d249a91eb8605c33bceec63aedda0441a43eac47b4721e3975ff916cec"
+ arm64.url = "https://go.dev/dl/go1.22.4.linux-arm64.tar.gz"
+ arm64.sha256 = "a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771"
+ armhf.url = "https://go.dev/dl/go1.21.5.linux-armv6l.tar.gz"
+ armhf.sha256 = "837f4bf4e22fcdf920ffeaa4abf3d02d1314e03725431065f4d44c46a01b42fe"
[resources.system_user]
@@ -62,4 +71,4 @@ ram.runtime = "50M"
main.url = "/"
[resources.apt]
- packages = "zlib1g-dev, uuid-dev, libmnl-dev, gcc, make, git, autoconf, autoconf-archive, autogen, automake, pkg-config, curl, jq, nodejs, python3-mysqldb, libipmimonitoring-dev, acl, python3-pymongo, libuv1-dev, liblz4-dev, libjudy-dev, libssl-dev, cmake"
+ packages = "cmake, ninja-build, pkg-config, bison, flex, gcc, g++, git, mariadb-server, libelf-dev, libssl-dev, liblz4-dev, zlib1g-dev, uuid-dev, libyaml-dev, libjson-c-dev, libuv1-dev"
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index b618e7f..bf92c3f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -15,22 +15,29 @@ source /usr/share/yunohost/helpers
ynh_script_progression --message="Setting up source files..." --weight=11
# Download, check integrity, uncompress and patch the source from app.src
-NETDATA_TMPDIR=$(mktemp -d)
+NETDATA_TMPDIR="$install_dir/netdata_install"
+mkdir -p $NETDATA_TMPDIR
ynh_setup_source --dest_dir="$NETDATA_TMPDIR"
+GO_TMPDIR="$install_dir/go_install"
+mkdir -p $GO_TMPDIR
+ynh_setup_source --source_id="go" --dest_dir="$GO_TMPDIR"
#=================================================
# BUILD
#=================================================
ynh_script_progression --message="Executing Netdata installer..." --weight=10
-# create a temporary file for the log
-tmplog=$(mktemp /tmp/netdata-updater-log-XXXXXX.log)
-
+export PATH="$GO_TMPDIR/bin:$PATH"
+export GOPATH="$GO_TMPDIR/go/"
+export HOME=${HOME:-"/root/"}
pushd "$NETDATA_TMPDIR"
# the installer.sh script will append "netdata" after the --install-prefix arg
- ./netdata-installer.sh --install-prefix /var/www/ --dont-wait --disable-cloud --disable-telemetry --stable-channel >"$tmplog" 2>"$tmplog" || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
+ ynh_exec_warn_less ./netdata-installer.sh --install-prefix /var/www/ --dont-wait --disable-cloud --disable-telemetry --stable-channel
popd
+ynh_secure_remove --file=$NETDATA_TMPDIR
+ynh_secure_remove --file=$GO_TMPDIR
+
# Specific configuration
configure_netdata
@@ -56,4 +63,4 @@ ynh_systemd_action --service_name="$app" --action="restart" --log_path="$install
# END OF SCRIPT
#=================================================
-ynh_script_progression --message="Installation of $app completed" --last
+ynh_script_progression --message="Installation of $app completed" --last
\ No newline at end of file
diff --git a/scripts/remove b/scripts/remove
index 4d2ff58..a56bbd2 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -22,6 +22,8 @@ fi
# Remove the dedicated NGINX config
ynh_remove_nginx_config
+ynh_systemd_action --service_name="$app" --action="stop"
+
#=================================================
# UNINSTALLING NETDATA
#=================================================
@@ -44,7 +46,6 @@ ynh_secure_remove "/usr/share/netdata"
ynh_secure_remove "/usr/libexec/netdata"
ynh_secure_remove "/var/lib/netdata"
ynh_secure_remove "/var/cache/netdata"
-ynh_secure_remove "/var/log/netdata"
ynh_secure_remove "/etc/netdata"
#=================================================
diff --git a/scripts/restore b/scripts/restore
index ce3653a..d26f6d3 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -25,17 +25,24 @@ ynh_restore_file --origin_path="$install_dir/etc/netdata"
ynh_script_progression --message="Reinstalling Netdata..." --weight=18
# Download, check integrity, uncompress and patch the source from app.src
-NETDATA_TMPDIR=$(mktemp -d)
+NETDATA_TMPDIR="$install_dir/netdata_install"
+mkdir -p $NETDATA_TMPDIR
ynh_setup_source --dest_dir="$NETDATA_TMPDIR"
+GO_TMPDIR="$install_dir/go_install"
+mkdir -p $GO_TMPDIR
+ynh_setup_source --source_id="go" --dest_dir="$GO_TMPDIR"
-# create a temporary file for the log
-tmplog=$(mktemp /tmp/netdata-updater-log-XXXXXX.log)
-
+export PATH="$GO_TMPDIR/bin:$PATH"
+export GOPATH="$GO_TMPDIR/go/"
+export HOME=${HOME:-"/root/"}
pushd "$NETDATA_TMPDIR"
# the installer.sh script will append "netdata" after the --install-prefix arg
- ./netdata-installer.sh --install-prefix /var/www/ --dont-wait --disable-cloud --disable-telemetry --stable-channel >"$tmplog" 2>"$tmplog" || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
+ ynh_exec_warn_less ./netdata-installer.sh --install-prefix /var/www/ --dont-wait --disable-cloud --disable-telemetry --stable-channel
popd
+ynh_secure_remove --file=$NETDATA_TMPDIR
+ynh_secure_remove --file=$GO_TMPDIR
+
# Specific configuration
configure_netdata
diff --git a/scripts/upgrade b/scripts/upgrade
index eb4a0d5..1109e6a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,8 +19,12 @@ ynh_script_progression --message="Upgrading source files..." --weight=18
#=================================================
# Download, check integrity, uncompress and patch the source from app.src
-NETDATA_TMPDIR=$(mktemp -d)
-ynh_setup_source "$NETDATA_TMPDIR"
+NETDATA_TMPDIR="$install_dir/netdata_install"
+mkdir -p $NETDATA_TMPDIR
+ynh_setup_source --dest_dir="$NETDATA_TMPDIR"
+GO_TMPDIR="$install_dir/go_install"
+mkdir -p $GO_TMPDIR
+ynh_setup_source --source_id="go" --dest_dir="$GO_TMPDIR"
#=================================================
# SPECIFIC UPGRADE
@@ -33,14 +37,17 @@ if [ -n "${pids}" ]; then
kill -USR1 ${pids}
fi
-# create a temporary file for the log
-tmplog=$(mktemp /tmp/netdata-updater-log-XXXXXX.log)
-
+export PATH="$GO_TMPDIR/bin:$PATH"
+export GOPATH="$GO_TMPDIR/go/"
+export HOME=${HOME:-"/root/"}
pushd "$NETDATA_TMPDIR"
- # the installer.sh script will append "netdata" after the --install-prefix arg
- ./netdata-installer.sh --install-prefix /var/www/ --dont-wait --disable-cloud >"$tmplog" 2>"$tmplog" || ynh_die "FAILED TO COMPILE/INSTALL NETDATA"
+ # the installer.sh script will append "netdata" after the --install-prefix arg
+ ynh_exec_warn_less ./netdata-installer.sh --install-prefix /var/www/ --dont-wait --disable-cloud --disable-telemetry --stable-channel
popd
+ynh_secure_remove --file=$NETDATA_TMPDIR
+ynh_secure_remove --file=$GO_TMPDIR
+
# Specific configuration
configure_netdata