From ae17f4911ed1ea6b6a3764cc8ac07ef0be70e730 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Apr 2022 07:12:00 +0000 Subject: [PATCH 1/5] Upgrade to v2.35.0 --- conf/app.386.src | 4 ++-- conf/app.amd64.src | 4 ++-- conf/app.arm64.src | 4 ++-- conf/app.armv5.src | 4 ++-- conf/app.armv6.src | 4 ++-- conf/app.armv7.src | 4 ++-- manifest.json | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/app.386.src b/conf/app.386.src index 1cf2870..69c0d26 100644 --- a/conf/app.386.src +++ b/conf/app.386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.5/prometheus-2.33.5.linux-386.tar.gz -SOURCE_SUM=69a7a4c2d47d39a9f61ce62813c689e77992dd20489fdde1525c6678240fd145 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-386.tar.gz +SOURCE_SUM=8390969675efbc5e56b9c3f418f9b5dd62569e83c4994f71a3f0a6c4a4ff8e99 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.amd64.src b/conf/app.amd64.src index f13180d..cfed7e6 100644 --- a/conf/app.amd64.src +++ b/conf/app.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.5/prometheus-2.33.5.linux-amd64.tar.gz -SOURCE_SUM=53876d18d4ed2d02a35797d91b09e9057621b495415703be77dd29956002514d +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-amd64.tar.gz +SOURCE_SUM=e4546960688d1c85530ec3a93e109d15b540f3251e1f4736d0d9735e1e857faf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.arm64.src b/conf/app.arm64.src index 7ad257f..a6c6fd9 100644 --- a/conf/app.arm64.src +++ b/conf/app.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.5/prometheus-2.33.5.linux-arm64.tar.gz -SOURCE_SUM=538f558d37e7863db57b3e81ba7133e2ba397b9db0c3b3e481885296b5956073 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-arm64.tar.gz +SOURCE_SUM=3ebe0c533583a9ab03363a80aa629edd8e0cc42da3583e33958eb7abe74d4cd2 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.armv5.src b/conf/app.armv5.src index 5b35c6f..46f15bf 100644 --- a/conf/app.armv5.src +++ b/conf/app.armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.5/prometheus-2.33.5.linux-armv5.tar.gz -SOURCE_SUM=505e9f7546d434c3c58c7b264a7fa50b2a07848c7232688452a76c6b99259c14 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-armv5.tar.gz +SOURCE_SUM=12c9e07176de53ce0cc29d6c83fdf98dfb9655df9e8da76eb0fe01243532fe36 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.armv6.src b/conf/app.armv6.src index d03b5f8..58f10dc 100644 --- a/conf/app.armv6.src +++ b/conf/app.armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.5/prometheus-2.33.5.linux-armv6.tar.gz -SOURCE_SUM=eb6c0a309de29805323b34a90e898689fbe15e4e4215e149cabe2d883f275740 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-armv6.tar.gz +SOURCE_SUM=167cf474bb418156660a4c95bed9d1ce7833c3416089da49467a4dafabef4fc8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.armv7.src b/conf/app.armv7.src index 1659bcb..ab903a4 100644 --- a/conf/app.armv7.src +++ b/conf/app.armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.33.5/prometheus-2.33.5.linux-armv7.tar.gz -SOURCE_SUM=4b6730e0fa483328c27af0bd7a0a14c9f0ea13536c83c40552ea847d6f5afac8 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-armv7.tar.gz +SOURCE_SUM=a50274c833ef058502fb723806e28537ef276ec628d63e0c3fdc407ca7b65272 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index b7e7aec..03aa9af 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.33.5~ynh1", + "version": "2.35.0~ynh1", "url": "https://prometheus.io", "upstream": { "license": "Apache-2.0", From 545fd97c443b385e84b249e22e78c6341a1ade4e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Apr 2022 07:12:05 +0000 Subject: [PATCH 2/5] 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 a988741..7b11628 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.33.5~ynh1 +**Shipped version:** 2.35.0~ynh1 **Demo:** https://demo.do.prometheus.io diff --git a/README_fr.md b/README_fr.md index 7986b0c..5bf36bb 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.33.5~ynh1 +**Version incluse :** 2.35.0~ynh1 **Démo :** https://demo.do.prometheus.io From 375476c5efc77ab8cf9602152908fe8c3db6d51e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 May 2022 07:12:53 +0000 Subject: [PATCH 3/5] Upgrade to v2.36.0 --- conf/app.386.src | 4 ++-- conf/app.amd64.src | 4 ++-- conf/app.arm64.src | 4 ++-- conf/app.armv5.src | 4 ++-- conf/app.armv6.src | 4 ++-- conf/app.armv7.src | 4 ++-- manifest.json | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/app.386.src b/conf/app.386.src index 69c0d26..a1fbb5a 100644 --- a/conf/app.386.src +++ b/conf/app.386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-386.tar.gz -SOURCE_SUM=8390969675efbc5e56b9c3f418f9b5dd62569e83c4994f71a3f0a6c4a4ff8e99 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.36.0/prometheus-2.36.0.linux-386.tar.gz +SOURCE_SUM=288eeb55346d422dedb717684bf05b103ff59fea2f8fd320041d2fbb63cf3c66 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.amd64.src b/conf/app.amd64.src index cfed7e6..666a6cc 100644 --- a/conf/app.amd64.src +++ b/conf/app.amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-amd64.tar.gz -SOURCE_SUM=e4546960688d1c85530ec3a93e109d15b540f3251e1f4736d0d9735e1e857faf +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.36.0/prometheus-2.36.0.linux-amd64.tar.gz +SOURCE_SUM=8ce279468d3a94f54e208027f7db237145119ac3ece2e6011efe795de87ccc04 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.arm64.src b/conf/app.arm64.src index a6c6fd9..460f7f1 100644 --- a/conf/app.arm64.src +++ b/conf/app.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-arm64.tar.gz -SOURCE_SUM=3ebe0c533583a9ab03363a80aa629edd8e0cc42da3583e33958eb7abe74d4cd2 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.36.0/prometheus-2.36.0.linux-arm64.tar.gz +SOURCE_SUM=8ac17a6f7d2936d106c78463edfb3520abaab8fd69d11835f61d12d7e05122fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.armv5.src b/conf/app.armv5.src index 46f15bf..ba94ea6 100644 --- a/conf/app.armv5.src +++ b/conf/app.armv5.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-armv5.tar.gz -SOURCE_SUM=12c9e07176de53ce0cc29d6c83fdf98dfb9655df9e8da76eb0fe01243532fe36 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.36.0/prometheus-2.36.0.linux-armv5.tar.gz +SOURCE_SUM=ec108716d450fae4b9b15777dfbf760e841365c83a1c8e4904cfd12e06bff98b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.armv6.src b/conf/app.armv6.src index 58f10dc..8070132 100644 --- a/conf/app.armv6.src +++ b/conf/app.armv6.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-armv6.tar.gz -SOURCE_SUM=167cf474bb418156660a4c95bed9d1ce7833c3416089da49467a4dafabef4fc8 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.36.0/prometheus-2.36.0.linux-armv6.tar.gz +SOURCE_SUM=8a7142e0384ddb6504b0e3f08a2eb168acfe710872fafc3542980129192dba9b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.armv7.src b/conf/app.armv7.src index ab903a4..6d23a47 100644 --- a/conf/app.armv7.src +++ b/conf/app.armv7.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.35.0/prometheus-2.35.0.linux-armv7.tar.gz -SOURCE_SUM=a50274c833ef058502fb723806e28537ef276ec628d63e0c3fdc407ca7b65272 +SOURCE_URL=https://github.com/prometheus/prometheus/releases/download/v2.36.0/prometheus-2.36.0.linux-armv7.tar.gz +SOURCE_SUM=b016b76c08971b1f01191365595098bce879e52dfe85524565f329e2dbc6f544 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 03aa9af..e562fd0 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.35.0~ynh1", + "version": "2.36.0~ynh1", "url": "https://prometheus.io", "upstream": { "license": "Apache-2.0", From 22dd1851bfe6554fdca49c72080ca429edf2f0f3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 May 2022 07:12:57 +0000 Subject: [PATCH 4/5] Auto-update README --- README.md | 20 ++++++++++---------- README_fr.md | 26 +++++++++++++++----------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 7b11628..7217c09 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Prometheus for YunoHost -[![Integration level](https://dash.yunohost.org/integration/prometheus.svg)](https://dash.yunohost.org/appci/app/prometheus) ![](https://ci-apps.yunohost.org/ci/badges/prometheus.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/prometheus.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/prometheus.svg)](https://dash.yunohost.org/appci/app/prometheus) ![Working status](https://ci-apps.yunohost.org/ci/badges/prometheus.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/prometheus.maintain.svg) [![Install Prometheus with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=prometheus) *[Lire ce readme en français.](./README_fr.md)* @@ -17,10 +17,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Monitoring system and time series database -**Shipped version:** 2.35.0~ynh1 +**Shipped version:** 2.36.0~ynh1 **Demo:** https://demo.do.prometheus.io - ## Disclaimers / important information * Port assigned to the app can be read in `/etc/yunohost/apps/prometheus/settings.yml` @@ -29,21 +28,22 @@ Monitoring system and time series database ## Documentation and resources -* Official app website: https://prometheus.io -* Official admin documentation: https://prometheus.io/docs -* Upstream app code repository: https://github.com/prometheus/prometheus -* YunoHost documentation for this app: https://yunohost.org/app_prometheus -* Report a bug: https://github.com/YunoHost-Apps/prometheus_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/prometheus_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/prometheus_ynh/tree/testing --debug or sudo yunohost app upgrade prometheus -u https://github.com/YunoHost-Apps/prometheus_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 5bf36bb..94e0a40 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Prometheus pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/prometheus.svg)](https://dash.yunohost.org/appci/app/prometheus) ![](https://ci-apps.yunohost.org/ci/badges/prometheus.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/prometheus.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/prometheus.svg)](https://dash.yunohost.org/appci/app/prometheus) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/prometheus.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/prometheus.maintain.svg) [![Installer Prometheus avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=prometheus) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Prometheus 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.* @@ -13,10 +17,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Supervision chronologique de systèmes et services -**Version incluse :** 2.35.0~ynh1 +**Version incluse :** 2.36.0~ynh1 **Démo :** https://demo.do.prometheus.io - ## Avertissements / informations importantes * Le port assigné à l'app est consultable dans `/etc/yunohost/apps/prometheus/settings.yml` @@ -26,21 +29,22 @@ Supervision chronologique de systèmes et services ## Documentations et ressources -* Site officiel de l'app : https://prometheus.io -* Documentation officielle de l'admin : https://prometheus.io/docs -* Dépôt de code officiel de l'app : https://github.com/prometheus/prometheus -* Documentation YunoHost pour cette app : https://yunohost.org/app_prometheus -* Signaler un bug : https://github.com/YunoHost-Apps/prometheus_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/prometheus_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/prometheus_ynh/tree/testing --debug ou sudo yunohost app upgrade prometheus -u https://github.com/YunoHost-Apps/prometheus_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** From 35699444849d1ce8ae3b5256366b520442e96ec5 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 31 May 2022 18:45:25 +0200 Subject: [PATCH 5/5] Do not overwrite config file during upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c6d0d1d..8e5c51c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -84,7 +84,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" --source_id="app.$architecture" + ynh_setup_source --dest_dir="$final_path" --source_id="app.$architecture" --keep="prometheus.yml" fi chmod 750 "$final_path"