From 5a15d94e06b49cc931aded4e1efd441c75850ac7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 16 Aug 2022 06:11:17 +0000 Subject: [PATCH 1/7] Upgrade to v1.36.1 --- conf/app.src | 5 ++--- manifest.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index a618ad3..055eebd 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz -SOURCE_SUM=587f6cce421015f8e0a527e3964a4de8cc17085c354498150bc3ade21606bbf9 +SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.36.1/netdata-v1.36.1.tar.gz +SOURCE_SUM=f4a1233112b55e07e2862ffda0416255f0aa4c8e2b16929b76fa7ad6b69fd931 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= -SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 2e63713..6bf06f3 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.35.1~ynh1", + "version": "1.36.1~ynh1", "url": "http://my-netdata.io/", "upstream": { "license": "GPL-3.0", From d386a4833c44f8f1badf43cc530d65a1e625059b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 16 Aug 2022 06:11:21 +0000 Subject: [PATCH 2/7] Auto-update README --- README.md | 3 ++- README_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ddb81d1..f7aa85a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,8 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste disrupting their core function._ -**Shipped version:** 1.35.1~ynh1 +**Shipped version:** 1.36.1~ynh1 + **Demo:** https://learn.netdata.cloud/docs/agent/demo-sites/ ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 4b4e3e4..d4f10ed 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,8 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste disrupting their core function._ -**Version incluse :** 1.35.1~ynh1 +**Version incluse :** 1.36.1~ynh1 + **Démo :** https://learn.netdata.cloud/docs/agent/demo-sites/ ## Avertissements / informations importantes From ce6cf9208f2ab22a18313d24c7a0c00e82dae401 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Thu, 18 Aug 2022 15:11:22 +0200 Subject: [PATCH 3/7] Migrate from python to go postgresql collector --- scripts/_common.sh | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index db75578..f5bfbce 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="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-psycopg2 python3-pymongo libuv1-dev liblz4-dev libjudy-dev libssl-dev cmake" +pkg_dependencies="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" #================================================= # PERSONAL HELPERS @@ -84,20 +84,19 @@ EOF # If PostgreSQL is installed, add a PostgreSQL entry using instance password netdata_add_yunohost_postgres_configuration () { - local postgres_file="$final_path/etc/netdata/python.d/postgres.conf" + local postgres_file="$final_path/etc/netdata/go.d/postgres.conf" if [ ! -f $postgres_file ] ; then - cp $final_path/etc/netdata/orig/python.d/postgres.conf $postgres_file + cp $final_path/etc/netdata/orig/go.d/postgres.conf $postgres_file fi - if [ -f /etc/yunohost/psql ] && [ -z "$(grep "yunohost:" $postgres_file)" ] ; then + if [ -f /etc/yunohost/psql ] && [ -z "$(grep "yunohost" $postgres_file)" ] ; then cat >> $postgres_file < Date: Thu, 18 Aug 2022 15:23:57 +0200 Subject: [PATCH 4/7] Rename postgresl config to "local" (same as MySQL) --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index f5bfbce..a209464 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -90,7 +90,7 @@ netdata_add_yunohost_postgres_configuration () { fi if [ -f /etc/yunohost/psql ] && [ -z "$(grep "yunohost" $postgres_file)" ] ; then cat >> $postgres_file < Date: Thu, 18 Aug 2022 18:05:09 +0000 Subject: [PATCH 5/7] Auto-update README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 7f119c3..f7aa85a 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ disrupting their core function._ **Shipped version:** 1.36.1~ynh1 - **Demo:** https://learn.netdata.cloud/docs/agent/demo-sites/ ## Disclaimers / important information From ed0bfb8f67fe9f05be61c12147efa2e8cac142c1 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sat, 20 Aug 2022 18:36:57 +0200 Subject: [PATCH 6/7] Add proper comment to avoid multiple postgres conf --- scripts/_common.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index a209464..d5fee85 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -88,8 +88,9 @@ netdata_add_yunohost_postgres_configuration () { if [ ! -f $postgres_file ] ; then cp $final_path/etc/netdata/orig/go.d/postgres.conf $postgres_file fi - if [ -f /etc/yunohost/psql ] && [ -z "$(grep "yunohost" $postgres_file)" ] ; then + if [ -f /etc/yunohost/psql ] && [ -z "$(grep "YUNOHOST" $postgres_file)" ] ; then cat >> $postgres_file < Date: Sun, 21 Aug 2022 09:36:25 +0200 Subject: [PATCH 7/7] Fix tile access restriction to admin --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index fb34e18..417fcb4 100644 --- a/scripts/install +++ b/scripts/install @@ -133,7 +133,7 @@ then fi # Add direct access in the portal to admin only -ynh_permission_update --permission="main" --add="$admin" +ynh_permission_update --permission="main" --remove="all_users" --add="$admin" #================================================= # RELOAD NGINX