Merge branch 'master' into testing

README.md

@@ -27,7 +27,7 @@ Grafana is a multi-platform open source analytics and interactive visualization
 * creates a default dashboard to plot some data from NetData (doesn't cover every metric, can be greatly enhanced!)
 
 
-**Shipped version:** 10.2.3~ynh1
+**Shipped version:** 10.2.3~ynh2
 
 **Demo:** <https://play.grafana.org>
 

README_eu.md

@@ -26,8 +26,7 @@ Grafana is a multi-platform open source analytics and interactive visualization
 * creates a Grafana Data Source to fetch data from InfluxDB (and hence NetData!)
 * creates a default dashboard to plot some data from NetData (doesn't cover every metric, can be greatly enhanced!)
 
-
-**Paketatutako bertsioa:** 10.2.3~ynh1
+**Paketatutako bertsioa:** 10.2.3~ynh2
 
 **Demoa:** <https://play.grafana.org>
 

README_fr.md

@@ -27,7 +27,7 @@ Grafana is a multi-platform open source analytics and interactive visualization
 * creates a default dashboard to plot some data from NetData (doesn't cover every metric, can be greatly enhanced!)
 
 
-**Version incluse :** 10.2.3~ynh1
+**Version incluse :** 10.2.3~ynh2
 
 **Démo :** <https://play.grafana.org>
 

README_gl.md

@@ -27,7 +27,7 @@ Grafana is a multi-platform open source analytics and interactive visualization
 * creates a default dashboard to plot some data from NetData (doesn't cover every metric, can be greatly enhanced!)
 
 
-**Versión proporcionada:** 10.2.3~ynh1
+**Versión proporcionada:** 10.2.3~ynh2
 
 **Demo:** <https://play.grafana.org>
 

README_it.md

@@ -0,0 +1,57 @@
+<!--
+N.B.: Questo README è stato automaticamente generato da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+NON DEVE essere modificato manualmente.
+-->
+
+# Grafana per YunoHost
+
+[![Livello di integrazione](https://dash.yunohost.org/integration/grafana.svg)](https://dash.yunohost.org/appci/app/grafana) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/grafana.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/grafana.maintain.svg)
+
+[![Installa Grafana con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana)
+
+*[Leggi questo README in altre lingue.](./ALL_README.md)*
+
+> *Questo pacchetto ti permette di installare Grafana su un server YunoHost in modo semplice e veloce.*  
+> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.*
+
+## Panoramica
+
+Grafana is a multi-platform open source analytics and interactive visualization web application. It provides charts, graphs, and alerts for the web when connected to supported data sources.
+
+## YunoHost specific features
+
+* installs InfluxDB as time series database
+* if the NetData package is installed, configures NetData to feed InfluxDB every minute
+* installs Grafana as dashboard server
+* creates a Grafana Data Source to fetch data from InfluxDB (and hence NetData!)
+* creates a default dashboard to plot some data from NetData (doesn't cover every metric, can be greatly enhanced!)
+
+
+**Versione pubblicata:** 10.2.3~ynh1
+
+**Prova:** <https://play.grafana.org>
+
+## Screenshot
+
+![Screenshot di Grafana](./doc/screenshots/Grafana8_Kubernetes.jpg)
+
+## Documentazione e risorse
+
+- Sito web ufficiale dell’app: <https://grafana.com/>
+- Repository upstream del codice dell’app: <https://github.com/grafana/grafana>
+- Store di YunoHost: <https://apps.yunohost.org/app/grafana>
+- Segnala un problema: <https://github.com/YunoHost-Apps/grafana_ynh/issues>
+
+## Informazioni per sviluppatori
+
+Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing).
+
+Per provare la branch di `testing`, si prega di procedere in questo modo:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade grafana -u https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug
+```
+
+**Maggiori informazioni riguardo il pacchetto di quest’app:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -27,7 +27,7 @@ Grafana is a multi-platform open source analytics and interactive visualization
 * creates a default dashboard to plot some data from NetData (doesn't cover every metric, can be greatly enhanced!)
 
 
-**分发版本：** 10.2.3~ynh1
+**分发版本：** 10.2.3~ynh2
 
 **演示：** <https://play.grafana.org>
 

manifest.toml

@@ -5,7 +5,7 @@ name = "Grafana"
 description.en = "Metric & analytic dashboards for monitoring"
 description.fr = "Tableaux de bord de supervision"
 
-version = "10.2.3~ynh1"
+version = "10.2.3~ynh2"
 
 maintainers = ["JimboJoe"]
 

scripts/install

@@ -25,10 +25,10 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring Grafana and InfluxDB..." --weight=30
 
 # If NetData is installed, configure it to feed InfluxDB
-if [ -d "/opt/netdata/etc/netdata" ] ; then
-  netdata_conf="/opt/netdata/etc/netdata/exporting.conf"
+if [ -d "/var/www/netdata/etc/netdata" ] ; then
+  netdata_conf="/var/www/netdata/etc/netdata/exporting.conf"
   if [ ! -f "$netdata_conf" ] ; then
-    cp "/opt/netdata/usr/lib/netdata/conf.d/exporting.conf" /opt/netdata/etc/netdata
+    cp "/var/www/netdata/usr/lib/netdata/conf.d/exporting.conf" /var/www/netdata/etc/netdata
   fi
   sed -i '/^\[exporting:global\]$/,/^\[/ {
         s/enabled = no/enabled = yes/

scripts/remove

@@ -39,7 +39,7 @@ ynh_remove_nginx_config
 ynh_script_progression --message="Removing various files..."
 
 # If NetData is installed, configure it not to feed InfluxDB any more
-netdata_conf="/opt/netdata/etc/netdata/exporting.conf"
+netdata_conf="/var/www/netdata/etc/netdata/exporting.conf"
 if [[ -f "$netdata_conf" ]] ; then
     sed -i '/^\[exporting:global\]$/,/^\[/ {
         s/enabled = yes/enabled = no/

scripts/upgrade

@@ -40,10 +40,10 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring Grafana and InfluxDB..." --weight=3
 
 # If NetData is installed, configure it to feed InfluxDB
-if [ -d "/opt/netdata" ] ; then
-  netdata_conf="/opt/netdata/etc/netdata/exporting.conf"
+if [ -d "/var/www/netdata" ] ; then
+  netdata_conf="/var/www/netdata/etc/netdata/exporting.conf"
   if [ ! -f $netdata_conf ] ; then
-    cp /opt/netdata/usr/lib/netdata/conf.d/exporting.conf $netdata_conf
+    cp /var/www/netdata/usr/lib/netdata/conf.d/exporting.conf $netdata_conf
   fi
   sed -i '/^\[exporting:global\]$/,/^\[/ {
         s/enabled = no/enabled = yes/
@@ -67,7 +67,7 @@ EOF
   fi
 
   # Remove obsolete NetData backend if in use
-  netdata_conf="/opt/netdata/etc/netdata/netdata.conf"
+  netdata_conf="/var/www/netdata/etc/netdata/netdata.conf"
   if [ -f "$netdata_conf" ] ; then
     # If there is already a [backend] section
     if [ -n "$(cat $netdata_conf | grep '\[backend\]')" ] ; then