From f1fa43026d8b91e728fd524bad635c0af2635149 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 14 Mar 2024 23:56:09 +0100 Subject: [PATCH 1/3] arm support and version bump --- manifest.toml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 9854048..dc0a303 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.8.4~ynh3" +version = "2.9.5~ynh1" maintainers = ["fflorent"] @@ -20,7 +20,7 @@ cpe = "cpe:2.3:a:grafana:loki" [integration] yunohost = ">= 11.0.0" -architectures = ["amd64", "arm64"] +architectures = ["amd64", "armhf", "arm64"] multi_instance = true ldap = "not_relevant" sso = "not_relevant" @@ -35,24 +35,30 @@ ram.runtime = "50M" [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" in_subdir = false autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = "loki-linux-amd64" - autoupdate.asset.arm64 = "loki-linux-arm64" + autoupdate.asset.amd64 = "^loki-linux-amd64.zip$" + autoupdate.asset.amd64 = "^loki-linux-arm.zip$" + 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" in_subdir = false autoupdate.strategy = "latest_github_release" - autoupdate.asset.amd64 = "promtail-linux-amd64" - autoupdate.asset.arm64 = "promtail-linux-arm64" + autoupdate.asset.amd64 = "^promtail-linux-amd64.zip$" + autoupdate.asset.amd64 = "^promtail-linux-arm.zip$" + autoupdate.asset.arm64 = "^promtail-linux-arm64.zip$" [resources.system_user] From 68d70b0a74379cbce1c6e03f26ea2ce27cd3b79c Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Thu, 14 Mar 2024 23:59:20 +0100 Subject: [PATCH 2/3] fix duplicate key --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index dc0a303..983161e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_release" autoupdate.asset.amd64 = "^loki-linux-amd64.zip$" - autoupdate.asset.amd64 = "^loki-linux-arm.zip$" + autoupdate.asset.armhf = "^loki-linux-arm.zip$" autoupdate.asset.arm64 = "^loki-linux-arm64.zip$" [resources.sources.promtail] @@ -57,7 +57,7 @@ ram.runtime = "50M" autoupdate.strategy = "latest_github_release" autoupdate.asset.amd64 = "^promtail-linux-amd64.zip$" - autoupdate.asset.amd64 = "^promtail-linux-arm.zip$" + autoupdate.asset.armhf = "^promtail-linux-arm.zip$" autoupdate.asset.arm64 = "^promtail-linux-arm64.zip$" [resources.system_user] From 6b6ae3d07e0f728592b005c02ed58164e565c464 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 14 Mar 2024 22:59:25 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 17 ++++++++--------- README_fr.md | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 99bd385..2890b79 100644 --- a/README.md +++ b/README.md @@ -30,15 +30,14 @@ 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.8.4~ynh3 +**Shipped version:** 2.9.5~ynh1 ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info @@ -46,10 +45,10 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug or sudo yunohost app upgrade loki -u https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 06619b2..da7e94e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,15 +30,14 @@ 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.8.4~ynh3 +**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 @@ -46,10 +45,10 @@ Merci de faire vos pull request sur la [branche testing](https://github.com/Yuno Pour essayer la branche testing, procédez comme suit. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/loki_ynh/tree/testing --debug 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 :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :**