From 36de1c556af74c19680cebc7922e9fd61439625e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 23 Jun 2023 06:13:24 +0000 Subject: [PATCH 1/5] Upgrade to v10.0.1 --- manifest.json | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 937effd..f8fc711 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Metric & analytic dashboards for monitoring", "fr": "Tableaux de bord de supervision" }, - "version": "9.5.3~ynh1", + "version": "10.0.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 4936c17..775f9af 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Debian package version for Grafana -GRAFANA_VERSION="9.5.3" +GRAFANA_VERSION="10.0.1" # dependencies used by the app pkg_dependencies="influxdb" From 2d75dc42e44935891964c0d4e8a973327124ef57 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 23 Jun 2023 06:13:29 +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 cacf7f2..d12b4f2 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:** 9.5.3~ynh1 +**Shipped version:** 10.0.1~ynh1 **Demo:** https://play.grafana.org diff --git a/README_fr.md b/README_fr.md index 627af4f..309b297 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 :** 9.5.3~ynh1 +**Version incluse :** 10.0.1~ynh1 **Démo :** https://play.grafana.org From 55ae698799fbdad17af0677bec2cf80c674d386a Mon Sep 17 00:00:00 2001 From: JimboJoe Date: Sat, 24 Jun 2023 12:31:25 +0200 Subject: [PATCH 3/5] Fix nginx conf for sub_path installation see https://github.com/grafana/grafana/issues/70110 --- conf/nginx.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1bc6f42..e5fc35d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,3 @@ -#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { proxy_redirect off; From 1873ef774664e62d13c1519237ebf6ecfca3661f Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 23 Jul 2023 12:17:11 +0200 Subject: [PATCH 4/5] Adapt sub_path conf --- scripts/install | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/install b/scripts/install index a6f32eb..7931ef2 100644 --- a/scripts/install +++ b/scripts/install @@ -137,12 +137,6 @@ sed -i "/^\[server\]$/,/^\[/ s@;http_port = .*@http_port = $port@" $grafana_conf sed -i "/^\[server\]$/,/^\[/ s@;domain = .*@domain = $domain@" $grafana_conf # Set final URL sed -i "/^\[server\]$/,/^\[/ s@;root_url = .*@root_url = https://$domain$path_url@" $grafana_conf -# Specify if using sub_path -if [ "$path_url" != "/" ]; then - sed -i "/^\[server\]$/,/^\[/ s@;serve_from_sub_path = .*@serve_from_sub_path = true@" $grafana_conf -else - sed -i "/^\[server\]$/,/^\[/ s@;serve_from_sub_path = .*@serve_from_sub_path = false@" $grafana_conf -fi # Disable check for updates sed -i '/^\[analytics\]$/,/^\[/ s/;check_for_updates = .*/check_for_updates = false/' $grafana_conf # Disable analytics reporting From 609c1175937b41e831371471de81a0dec83562d9 Mon Sep 17 00:00:00 2001 From: Jimmy Monin Date: Sun, 23 Jul 2023 13:05:36 +0200 Subject: [PATCH 5/5] Upgrade to upstream version 10.0.2 --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/_common.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d12b4f2..24e4da1 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.0.1~ynh1 +**Shipped version:** 10.0.2~ynh1 **Demo:** https://play.grafana.org diff --git a/README_fr.md b/README_fr.md index 309b297..1419a59 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.0.1~ynh1 +**Version incluse :** 10.0.2~ynh1 **Démo :** https://play.grafana.org diff --git a/manifest.json b/manifest.json index f8fc711..2b6a754 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.0.1~ynh1", + "version": "10.0.2~ynh1", "url": "https://grafana.com/oss/grafana/", "upstream": { "license": "AGPL-3.0-only", diff --git a/scripts/_common.sh b/scripts/_common.sh index 775f9af..c6a68e4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # Debian package version for Grafana -GRAFANA_VERSION="10.0.1" +GRAFANA_VERSION="10.0.2" # dependencies used by the app pkg_dependencies="influxdb"