From e6a07353b9eede4805a6d2fbb0dc92021d60420f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Mar 2024 02:42:44 +0100 Subject: [PATCH 1/6] Upgrade sources --- manifest.toml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.toml b/manifest.toml index 983161e..916aeb5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -33,12 +33,12 @@ ram.runtime = "50M" [resources] [resources.sources] [resources.sources.loki] - amd64.url = "https://github.com/grafana/loki/releases/download/v2.9.5/loki-linux-amd64.zip" - amd64.sha256 = "9d919a55e7a2dbaeab46e777a0589d7e304c71fed011f989143883cbc887e348" - armhf.url = "https://github.com/grafana/loki/releases/download/v2.9.5/loki-linux-arm.zip" - armhf.sha256 = "104efc28b322523bf5bced67bdcc3746e1f7f872057f6ef54f25ab00ce426b39" - arm64.url = "https://github.com/grafana/loki/releases/download/v2.9.5/loki-linux-arm64.zip" - arm64.sha256 = "491833bf201c55388b82c3d1f583a9d4426c1b778ed3dc710cd67c8cbbbb67bb" + amd64.url = "https://github.com/grafana/loki/releases/download/v2.9.6/loki-linux-amd64.zip" + amd64.sha256 = "4d083365dc2c843de5d836cc836cf49e391eb1174f77a40bfd4a26a74ba3173e" + armhf.url = "https://github.com/grafana/loki/releases/download/v2.9.6/loki-linux-arm.zip" + armhf.sha256 = "7be1438b3b192ca7e75dfdbba91debb04e0c1a5455e099ee1b2b524e9e65d6aa" + arm64.url = "https://github.com/grafana/loki/releases/download/v2.9.6/loki-linux-arm64.zip" + arm64.sha256 = "8ad3c6c8eab570c830bf6a7198f65290514c4065b9c507d11d9d6afcf7eba9de" in_subdir = false autoupdate.strategy = "latest_github_release" @@ -47,12 +47,12 @@ ram.runtime = "50M" autoupdate.asset.arm64 = "^loki-linux-arm64.zip$" [resources.sources.promtail] - amd64.url = "https://github.com/grafana/loki/releases/download/v2.9.5/promtail-linux-amd64.zip" - amd64.sha256 = "e444bcff2d6677d284350819d3d1b7b473a1699357689230254fbc602b28dac7" - armhf.url = "https://github.com/grafana/loki/releases/download/v2.9.5/promtail-linux-arm.zip" - armhf.sha256 = "d0cc7552b8ce69534893040e6518288a6899c4f3acf9d4e7d32335f5f2f6145d" - arm64.url = "https://github.com/grafana/loki/releases/download/v2.9.5/promtail-linux-arm64.zip" - arm64.sha256 = "b23bd750dc5f6a76d808826ebc9d3c8b3540adb329578b650571a10d2be348b8" + amd64.url = "https://github.com/grafana/loki/releases/download/v2.9.6/promtail-linux-amd64.zip" + amd64.sha256 = "04db05ba4caf098cbfd3f49b2f0ee7b2e94073fd7822ee775cc904c6569b5075" + armhf.url = "https://github.com/grafana/loki/releases/download/v2.9.6/promtail-linux-arm.zip" + armhf.sha256 = "253db7ed747d20f560460f95f2aeccd87c0886029799f243de466818484563f5" + arm64.url = "https://github.com/grafana/loki/releases/download/v2.9.6/promtail-linux-arm64.zip" + arm64.sha256 = "78ce372104cace335d119dfe11516fefe1cd74a26d80d9eca1fc58552bbed9ef" in_subdir = false autoupdate.strategy = "latest_github_release" From 6c3b28b67dca683659cc938f8c777dd23b6ed6a2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Mar 2024 01:42:47 +0000 Subject: [PATCH 2/6] Auto-update READMEs --- ALL_README.md | 8 ++++++++ README.md | 41 +++++++++++++++++++++-------------------- README_fr.md | 29 +++++++++++++++-------------- 3 files changed, 44 insertions(+), 34 deletions(-) create mode 100644 ALL_README.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..b412b5e --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +[Read the README in English](README.md) + + +* [Lire le README en français](README_fr.md) + + diff --git a/README.md b/README.md index 2890b79..53b3250 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ -# Loki + Promtail for YunoHost +# Loki + Promtail pour YunoHost -[![Integration level](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Working status](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) +[![Niveau d'intégration ](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Status du fonctionnement](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Statut demaintenance](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) -[![Install Loki + Promtail with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=loki) +[![Installer Loki + Promtail avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=loki) -*[Lire ce readme en français.](./README_fr.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *This package allows you to install Loki + Promtail 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.* +> *Ce package vous permet d’installer Loki + Promtail 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.* -## Overview +## Vue d'ensemble Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. It does not index the contents of the logs, but rather a set of labels for each log stream. @@ -30,20 +30,21 @@ A Loki-based logging stack consists of 3 components: - Loki is the main server, responsible for storing logs and processing queries. - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Shipped version:** 2.9.5~ynh1 -## Documentation and resources +**Version incluse :** 2.9.5~ynh1 +## Documentations et ressources -- Official app website: -- Official admin documentation: -- Upstream app code repository: -- YunoHost Store: -- Report a bug: +- Site officiel de l’app : +- Documentation officielle de l'admin +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : -## Developer info +## Informations pour les développeurs -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/loki_ynh/tree/testing). +Merci de faire vos pull request sur la [branche branch](https://github.com/YunoHost-Apps/loki_ynh/tree/testing), -To try the testing branch, please proceed like that. + +Pour essayer la branche testing, procédez comme suit. ```bash sudo yunohost app install https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug @@ -51,4 +52,4 @@ or sudo yunohost app upgrade loki -u https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug ``` -**More info regarding app packaging:** +**Plus d'infos sur le packaging d'applications :** diff --git a/README_fr.md b/README_fr.md index da7e94e..53b3250 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,20 +1,20 @@ # Loki + Promtail pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) +[![Niveau d'intégration ](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Status du fonctionnement](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Statut demaintenance](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) [![Installer Loki + Promtail avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=loki) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* > *Ce package vous permet d’installer Loki + Promtail 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.* -## Vue d’ensemble +## Vue d'ensemble Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. It does not index the contents of the logs, but rather a set of labels for each log stream. @@ -30,25 +30,26 @@ A Loki-based logging stack consists of 3 components: - Loki is the main server, responsible for storing logs and processing queries. - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Version incluse :** 2.9.5~ynh1 +**Version incluse :** 2.9.5~ynh1 ## Documentations et ressources -- Site officiel de l’app : -- Documentation officielle de l’admin : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l'admin +- 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/loki_ynh/tree/testing). +Merci de faire vos pull request sur la [branche branch](https://github.com/YunoHost-Apps/loki_ynh/tree/testing), + Pour essayer la branche testing, procédez comme suit. ```bash sudo yunohost app install https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug -ou +or sudo yunohost app upgrade loki -u https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d'infos sur le packaging d'applications :** From eb14541bd2eacd5ac9d9ee0376c4d847d8a3067f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 May 2024 11:24:23 +0000 Subject: [PATCH 3/6] Auto-update READMEs --- ALL_README.md | 9 +++++---- README.md | 39 ++++++++++++++++++++------------------- README_fr.md | 27 ++++++++++++++------------- 3 files changed, 39 insertions(+), 36 deletions(-) diff --git a/ALL_README.md b/ALL_README.md index 0c11da5..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) - - -* [Lire le README en français](README_fr.md) +- [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) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 7adecdb..9290c8f 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ -# Loki + Promtail pour YunoHost +# Loki + Promtail for YunoHost -[![Niveau d'intégration ](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Status du fonctionnement](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Statut demaintenance](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Working status](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) -[![Installer Loki + Promtail avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=loki) +[![Install Loki + Promtail with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=loki) -*[Lire le README dans d'autres langues.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *Ce package vous permet d’installer Loki + Promtail 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.* +> *This package allows you to install Loki + Promtail 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.* -## Vue d'ensemble +## Overview Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. It does not index the contents of the logs, but rather a set of labels for each log stream. @@ -30,20 +30,21 @@ A Loki-based logging stack consists of 3 components: - Loki is the main server, responsible for storing logs and processing queries. - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Version incluse :** 2.9.5~ynh1 -- Site officiel de l’app : -- Documentation officielle de l'admin -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +**Shipped version:** 2.9.5~ynh1 +## Documentation and resources -## Informations pour les développeurs +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: -Merci de faire vos pull request sur la [branche branch](https://github.com/YunoHost-Apps/loki_ynh/tree/testing), +## Developer info +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/loki_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug @@ -51,4 +52,4 @@ or sudo yunohost app upgrade loki -u https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 1119b8c..d903b40 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,11 +1,11 @@ # Loki + Promtail pour YunoHost -[![Niveau d'intégration ](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Status du fonctionnement](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Statut demaintenance](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/loki.svg)](https://dash.yunohost.org/appci/app/loki) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/loki.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/loki.maintain.svg) [![Installer Loki + Promtail avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=loki) @@ -14,7 +14,7 @@ Il ne doit pas être modifié à la main. > *Ce package vous permet d’installer Loki + Promtail 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 +## Vue d’ensemble Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. It does not index the contents of the logs, but rather a set of labels for each log stream. @@ -30,25 +30,26 @@ A Loki-based logging stack consists of 3 components: - Loki is the main server, responsible for storing logs and processing queries. - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Version incluse :** 2.9.5~ynh1 + +**Version incluse :** 2.9.5~ynh1 ## Documentations et ressources -- Site officiel de l’app : -- Documentation officielle de l'admin -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- 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 branch](https://github.com/YunoHost-Apps/loki_ynh/tree/testing), +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/loki_ynh/tree/testing). Pour essayer la branche `testing`, procédez comme suit : ```bash sudo yunohost app install https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug -or +ou sudo yunohost app upgrade loki -u https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** From 252b598d0073fdd28a3fc297825c462f8bdae60c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 13:25:03 +0200 Subject: [PATCH 4/6] Update manifest.toml --- manifest.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5556ded..8024023 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Loki + Promtail" description.en = "Grafana Loki is a set of components that can be composed into a fully featured logging stack." description.fr = "Grafana Loki est un ensemble de composants qui peuvent être composés pour former une pile de journalisation complète." -version = "2.9.5~ynh1" +version = "3.0.0~ynh1" maintainers = ["fflorent"] @@ -19,11 +19,14 @@ code = "https://github.com/grafana/loki" cpe = "cpe:2.3:a:grafana:loki" [integration] -yunohost = ">= 11.0.0" +yunohost = ">= 11.2" architectures = ["amd64", "armhf", "arm64"] multi_instance = true + ldap = "not_relevant" + sso = "not_relevant" + disk = "50M" ram.build = "50M" ram.runtime = "50M" From 68cc5693d15e886e5ae62161777fe7e9b87bf816 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 May 2024 11:25:08 +0000 Subject: [PATCH 5/6] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9290c8f..22d4662 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Shipped version:** 2.9.5~ynh1 +**Shipped version:** 3.0.0~ynh1 ## Documentation and resources - Official app website: diff --git a/README_eu.md b/README_eu.md index 353564b..8c43cd1 100644 --- a/README_eu.md +++ b/README_eu.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Paketatutako bertsioa:** 2.9.5~ynh1 +**Paketatutako bertsioa:** 3.0.0~ynh1 ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: diff --git a/README_fr.md b/README_fr.md index d903b40..1850155 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Version incluse :** 2.9.5~ynh1 +**Version incluse :** 3.0.0~ynh1 ## Documentations et ressources - Site officiel de l’app : diff --git a/README_gl.md b/README_gl.md index 6cac9a2..05e6cc1 100644 --- a/README_gl.md +++ b/README_gl.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**Versión proporcionada:** 2.9.5~ynh1 +**Versión proporcionada:** 3.0.0~ynh1 ## Documentación e recursos - Web oficial da app: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 3a6177e..fcfdd40 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -31,7 +31,7 @@ A Loki-based logging stack consists of 3 components: - [Grafana](https://github.com/Yunohost-Apps/grafana_ynh) for querying and displaying the logs. -**分发版本：** 2.9.5~ynh1 +**分发版本：** 3.0.0~ynh1 ## 文档与资源 - 官方应用网站： From 0bae4718936c412d1863d79105c6022d38af42e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 13:25:53 +0200 Subject: [PATCH 6/6] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8024023..ac803f7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -4,8 +4,8 @@ packaging_format = 2 id = "loki" name = "Loki + Promtail" -description.en = "Grafana Loki is a set of components that can be composed into a fully featured logging stack." -description.fr = "Grafana Loki est un ensemble de composants qui peuvent être composés pour former une pile de journalisation complète." +description.en = "Set of components that can be composed into a fully featured logging stack" +description.fr = "Ensemble de composants qui peuvent être composés pour former une pile de journalisation complète" version = "3.0.0~ynh1"