YunoHost-Apps/netdata_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/netdata_ynh.git synced 2024-09-03 19:46:33 +02:00
Code Issues Activity Actions

Merge pull request #93 from YunoHost-Apps/testing

Browse source
This commit is contained in:
JimboJoe 2022-08-22 08:54:07 +02:00 • committed by GitHub
commit 9b1ee21482
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -25,7 +25,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._ 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/ **Demo:** https://learn.netdata.cloud/docs/agent/demo-sites/

2
README_fr.md
View file

@ -25,7 +25,7 @@ _netdata is **fast** and **efficient**, designed to permanently run on all syste
disrupting their core function._ 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/ **Démo :** https://learn.netdata.cloud/docs/agent/demo-sites/

5
conf/app.src
View file

@ -1,7 +1,6 @@
SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.35.1/netdata-v1.35.1.tar.gz SOURCE_URL=https://github.com/netdata/netdata/releases/download/v1.36.1/netdata-v1.36.1.tar.gz
SOURCE_SUM=587f6cce421015f8e0a527e3964a4de8cc17085c354498150bc3ade21606bbf9 SOURCE_SUM=f4a1233112b55e07e2862ffda0416255f0aa4c8e2b16929b76fa7ad6b69fd931
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME= SOURCE_FILENAME=
SOURCE_EXTRACT=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Real-time performance and health monitoring", "en": "Real-time performance and health monitoring",
"fr": "Monitoring serveur en temps reel" "fr": "Monitoring serveur en temps reel"
}, },
"version": "1.35.1~ynh1", "version": "1.36.1~ynh1",
"url": "http://my-netdata.io/", "url": "http://my-netdata.io/",
"upstream": { "upstream": {
"license": "GPL-3.0", "license": "GPL-3.0",

22
scripts/_common.sh
View file

@ -5,7 +5,7 @@
#================================================= #=================================================
# dependencies used by the app # 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 # PERSONAL HELPERS
@ -84,20 +84,20 @@ EOF
# If PostgreSQL is installed, add a PostgreSQL entry using instance password # If PostgreSQL is installed, add a PostgreSQL entry using instance password
netdata_add_yunohost_postgres_configuration () { 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 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 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 cat >> $postgres_file <<EOF
yunohost: # ------------ YUNOHOST ---------------
name : 'local' - name: local
database : 'postgres' dsn: 'postgres://postgres:$(cat /etc/yunohost/psql)@localhost:5432/postgres'
user : 'postgres'
password : '$(cat /etc/yunohost/psql)'
host : 'localhost'
port : 5432
EOF EOF
fi fi
chgrp netdata $postgres_file 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
} }

2
scripts/install
View file

@ -133,7 +133,7 @@ then
fi fi
# Add direct access in the portal to admin only # 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 # RELOAD NGINX