From a75db9c27de389d1222d28ddf4fba09769364f0a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 3 Feb 2022 22:04:35 +0000 Subject: [PATCH 1/3] Upgrade to v2.33.1 --- conf/app.386.src | 6 ++---- conf/app.amd64.src | 6 ++---- conf/app.arm64.src | 6 ++---- conf/app.armv5.src | 6 ++---- conf/app.armv6.src | 6 ++---- conf/app.armv7.src | 6 ++---- manifest.json | 4 ++-- 7 files changed, 14 insertions(+), 26 deletions(-) diff --git a/conf/app.386.src b/conf/app.386.src index 5020061..a6dba8c 100644 --- a/conf/app.386.src +++ b/conf/app.386.src @@ -1,7 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.linux-386.tar.gz -SOURCE_SUM=9666d90c981f80d82b605e022eb2af61b65e7d0962a95b6b5fe67cc395cbf915 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.1/prometheus-2.33.1.linux-386.tar.gz +SOURCE_SUM=2a02adc1ba695c4efd0ca9c466d253c4c3008d49c2d65339ce4f0f98e2052ee2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true -SOURCE_FILENAME=prometheus.tar.gz diff --git a/conf/app.amd64.src b/conf/app.amd64.src index aa9d32f..1ff5a63 100644 --- a/conf/app.amd64.src +++ b/conf/app.amd64.src @@ -1,7 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.linux-amd64.tar.gz -SOURCE_SUM=d2d0ded275090a13208114b633abe41c40e14c83ff5ec07230d79b4da1d8e701 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.1/prometheus-2.33.1.linux-amd64.tar.gz +SOURCE_SUM=55de29727fc4d3977d3400c54fa222ebb52755bd0201936f1e1052fea6f2b44b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true -SOURCE_FILENAME=prometheus.tar.gz diff --git a/conf/app.arm64.src b/conf/app.arm64.src index 3f98241..abc695c 100644 --- a/conf/app.arm64.src +++ b/conf/app.arm64.src @@ -1,7 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.linux-arm64.tar.gz -SOURCE_SUM=c6ef6c0ef92bfc9682c9ae5275c5bd5ab2c6f74178201e15f2bfd08cc8a139a8 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.1/prometheus-2.33.1.linux-arm64.tar.gz +SOURCE_SUM=21d89df7a98882a1a872bd3210aeaac3915a7f7be9f2ad28c986c80ad64ee77d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true -SOURCE_FILENAME=prometheus.tar.gz diff --git a/conf/app.armv5.src b/conf/app.armv5.src index bffef3d..8f15a66 100644 --- a/conf/app.armv5.src +++ b/conf/app.armv5.src @@ -1,7 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.linux-armv5.tar.gz -SOURCE_SUM=5cc36a0254c118639a461e52f7736f4b86e0f2775ab552cb426f0a4748c8cd8b +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.1/prometheus-2.33.1.linux-armv5.tar.gz +SOURCE_SUM=bc51a6073ac1d90c8ebd548694baeb8c6dff91945cf00b763c65a11412b7f945 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true -SOURCE_FILENAME=prometheus.tar.gz diff --git a/conf/app.armv6.src b/conf/app.armv6.src index 55e35d9..e35210d 100644 --- a/conf/app.armv6.src +++ b/conf/app.armv6.src @@ -1,7 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.linux-armv6.tar.gz -SOURCE_SUM=8346908ad57777d1cd7b2a3e95e0b7beb9891251f768caf863895bb051a65209 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.1/prometheus-2.33.1.linux-armv6.tar.gz +SOURCE_SUM=16769a890ce803f571a5c68689dd9c6401a9d80e491352eaefd5eeff6441e460 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true -SOURCE_FILENAME=prometheus.tar.gz diff --git a/conf/app.armv7.src b/conf/app.armv7.src index d68a186..b49fcd6 100644 --- a/conf/app.armv7.src +++ b/conf/app.armv7.src @@ -1,7 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.28.0/prometheus-2.28.0.linux-armv7.tar.gz -SOURCE_SUM=214632282772a45d4ac2c7053f95d252b8eb8c279ff228aba2ac25329ae903f8 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.1/prometheus-2.33.1.linux-armv7.tar.gz +SOURCE_SUM=09e285f098c36a5f2e7cf065fb38bd8f65ef262aeda728aac48b8cbb40ef34cc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_EXTRACT=true -SOURCE_FILENAME=prometheus.tar.gz diff --git a/manifest.json b/manifest.json index 0e496e0..9d903ab 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Monitoring system and time series database", "fr": "Supervision chronologique de systèmes et services" }, - "version": "2.28.0~ynh1", + "version": "2.33.1~ynh1", "url": "https://prometheus.io", "upstream": { "license": "Apache-2.0", @@ -30,7 +30,7 @@ "mysql" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain", From db8a6488006ad0c603c04df1b01bae2a53c8e7a4 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 3 Feb 2022 22:04:39 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cc592d9..cf7e53b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Monitoring system and time series database -**Shipped version:** 2.28.0~ynh1 +**Shipped version:** 2.33.1~ynh1 **Demo:** https://demo.do.prometheus.io diff --git a/README_fr.md b/README_fr.md index e06e414..6a6208a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Supervision chronologique de systèmes et services -**Version incluse :** 2.28.0~ynh1 +**Version incluse :** 2.33.1~ynh1 **Démo :** https://demo.do.prometheus.io From 7ffb2ea3130bac0eaae8a79c6b6cd179e6bb87d1 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Fri, 4 Feb 2022 22:40:08 +0100 Subject: [PATCH 3/3] Fix change_url --- scripts/change_url | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 084986c..fa17761 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -94,6 +94,8 @@ then ynh_add_nginx_config # Create a dedicated service config ynh_add_systemd_config +else + path_url="$old_path" fi # Change the domain for NGINX