From 683900932d75b6b070c980d3c4c44e70a6c3958c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Sep 2023 06:11:34 +0000 Subject: [PATCH 1/3] Upgrade to v10.1.1 --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 6cfe0f7..877c195 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Metric & analytic dashboards for monitoring", "fr": "Tableaux de bord de supervision" }, - "version": "10.1.0~ynh1", + "version": "10.1.1~ynh1", "url": "https://grafana.com/oss/grafana/", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 0a7b506..138f60d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Debian package version for Grafana -GRAFANA_VERSION="10.1.0" +GRAFANA_VERSION="10.1.1" # dependencies used by the app pkg_dependencies="influxdb" From 0c48574df3f5787b745703adf6c77252cb740552 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 1 Sep 2023 06:11:40 +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 bcd91c0..2e8cf22 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Metric & analytic dashboards for monitoring -**Shipped version:** 10.1.0~ynh1 +**Shipped version:** 10.1.1~ynh1 **Demo:** https://play.grafana.org diff --git a/README_fr.md b/README_fr.md index ca5358d..c74ebca 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Tableaux de bord de supervision -**Version incluse :** 10.1.0~ynh1 +**Version incluse :** 10.1.1~ynh1 **Démo :** https://play.grafana.org From d33f9b285bf2e4563519f74b39aba2d3a5cd8e31 Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Sat, 2 Sep 2023 11:29:11 +0200 Subject: [PATCH 3/3] Fix release 10 hotfix --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index de41cee..10893ad 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,7 +147,7 @@ EOF fi # Fix configuration for Grafana instances existing prior to version 10 -sed -i "/^\[server\]$/,/^\[/ s@;serve_from_sub_path = .*@serve_from_sub_path = false@" "/etc/grafana/grafana.ini" +sed -i "/^\[server\]$/,/^\[/ s@serve_from_sub_path = .*@serve_from_sub_path = false@" "/etc/grafana/grafana.ini" # Update Grafana LDAP authentication configuration cp ../conf/ldap.toml /etc/grafana