From 2e8bedf897acf4085478541bc1db848f6c2d0d41 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 29 Mar 2024 07:05:36 +0100 Subject: [PATCH 1/3] Auto-update README --- ALL_README.md | 6 ++++++ README.md | 24 +++++++++++----------- README_fr.md | 30 +++++++++++++-------------- README_gl.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ README_it.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 147 insertions(+), 27 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_gl.md create mode 100644 README_it.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..3d6c579 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index 419525f..4928957 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Grafana with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README is other languages.](./ALL_README.md)* -> *This package allows you to install Grafana quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Grafana quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -29,7 +29,7 @@ Grafana is a multi-platform open source analytics and interactive visualization **Shipped version:** 10.2.3~ynh1 -**Demo:** https://play.grafana.org +**Demo:** ## Screenshots @@ -37,18 +37,18 @@ Grafana is a multi-platform open source analytics and interactive visualization ## Documentation and resources -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug or sudo yunohost app upgrade grafana -u https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug diff --git a/README_fr.md b/README_fr.md index c3993ec..1c6e233 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Grafana pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Grafana avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Grafana rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Grafana rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -27,9 +27,9 @@ 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~ynh1 -**Démo :** https://play.grafana.org +**Démo :** ## Captures d’écran @@ -37,21 +37,21 @@ Grafana is a multi-platform open source analytics and interactive visualization ## Documentations et ressources -* Site officiel de l’app : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug ou sudo yunohost app upgrade grafana -u https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..12a2254 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,57 @@ + + +# Grafana para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/grafana.svg)](https://dash.yunohost.org/appci/app/grafana) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/grafana.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/grafana.maintain.svg) + +[![Instalar Grafana con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Grafana de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +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!) + + +**Versión proporcionada:** 10.2.3~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Grafana](./doc/screenshots/Grafana8_Kubernetes.jpg) + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug +ou +sudo yunohost app upgrade grafana -u https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_it.md b/README_it.md new file mode 100644 index 0000000..90b6213 --- /dev/null +++ b/README_it.md @@ -0,0 +1,57 @@ + + +# 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:** + +## Screenshot + +![Screenshot di Grafana](./doc/screenshots/Grafana8_Kubernetes.jpg) + +## Documentazione e risorse + +- Sito web ufficiale dell’app: +- Repository upstream del codice dell’app: +- Store di YunoHost: +- Segnala un problema: + +## 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:** From b0b0cc492d671a4871b68f55d4e9a3c975a79b8c Mon Sep 17 00:00:00 2001 From: Martin GRUDLER Date: Fri, 3 May 2024 11:11:14 +0200 Subject: [PATCH 2/3] Fixes the netdata path in order to repair influxdb feeding --- manifest.toml | 2 +- scripts/install | 6 +++--- scripts/remove | 2 +- scripts/upgrade | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1031af3..d70f9e0 100644 --- a/manifest.toml +++ b/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"] diff --git a/scripts/install b/scripts/install index 1e63b68..90899d6 100644 --- a/scripts/install +++ b/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/ diff --git a/scripts/remove b/scripts/remove index 29bd105..e24dabd 100644 --- a/scripts/remove +++ b/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/ diff --git a/scripts/upgrade b/scripts/upgrade index 86d3d6d..9e870ee 100644 --- a/scripts/upgrade +++ b/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 From 1688e0d3bb38e36f221fb3fe26a8791b80ffe6bd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 3 May 2024 17:43:18 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- ALL_README.md | 3 ++- README.md | 4 ++-- README_eu.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..a01b345 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 4928957..205b346 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Grafana with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Grafana quickly and simply on a YunoHost server.* > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* @@ -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:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..a05739e --- /dev/null +++ b/README_eu.md @@ -0,0 +1,57 @@ + + +# Grafana YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/grafana.svg)](https://dash.yunohost.org/appci/app/grafana) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/grafana.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/grafana.maintain.svg) + +[![Instalatu Grafana YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Grafana YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +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!) + + +**Paketatutako bertsioa:** 10.2.3~ynh2 + +**Demoa:** + +## Pantaila-argazkiak + +![Grafana(r)en pantaila-argazkia](./doc/screenshots/Grafana8_Kubernetes.jpg) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug +edo +sudo yunohost app upgrade grafana -u https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 1c6e233..7b67dc5 100644 --- a/README_fr.md +++ b/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 :** diff --git a/README_gl.md b/README_gl.md index 12a2254..b871fb3 100644 --- a/README_gl.md +++ b/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:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..897c755 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,57 @@ + + +# YunoHost 的 Grafana + +[![集成程度](https://dash.yunohost.org/integration/grafana.svg)](https://dash.yunohost.org/appci/app/grafana) ![工作状态](https://ci-apps.yunohost.org/ci/badges/grafana.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/grafana.maintain.svg) + +[![使用 YunoHost 安装 Grafana](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grafana) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Grafana。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +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!) + + +**分发版本：** 10.2.3~ynh2 + +**演示：** + +## 截图 + +![Grafana 的截图](./doc/screenshots/Grafana8_Kubernetes.jpg) + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/grafana_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug +或 +sudo yunohost app upgrade grafana -u https://github.com/YunoHost-Apps/grafana_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：**