Merge pull request #93 from YunoHost-Apps/testing

README.md

@@ -25,7 +25,7 @@ _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/

README_fr.md

@@ -25,7 +25,7 @@ _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/

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

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",

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,20 @@ 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 <<EOF
-yunohost:
-    name     : 'local'
-    database : 'postgres'
-    user     : 'postgres'
-    password : '$(cat /etc/yunohost/psql)'
-    host     : 'localhost'
-    port     : 5432
+# ------------ YUNOHOST ---------------
+  - name: local
+    dsn: 'postgres://postgres:$(cat /etc/yunohost/psql)@localhost:5432/postgres'
 EOF
   fi
   chgrp netdata $postgres_file
+    # Manage upgrade case from python to go plugin
+  if [ -f "$final_path/etc/netdata/python.d/postgres.conf" ] ; then
+    ynh_secure_remove --file="$final_path/etc/netdata/python.d/postgres.conf"
+  fi
 }

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