From cecf50322f87b533514e524c8490ce6205ad5755 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost-bot@users.noreply.github.com>
Date: Thu, 27 Jul 2023 06:11:17 +0000
Subject: [PATCH 1/3] Upgrade to v10.0.3

---
 manifest.json      | 2 +-
 scripts/_common.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2b6a754..b845b7a 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.2~ynh1",
+    "version": "10.0.3~ynh1",
     "url": "https://grafana.com/oss/grafana/",
     "upstream": {
         "license": "AGPL-3.0-only",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index c6a68e4..e45b7b0 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # Debian package version for Grafana
-GRAFANA_VERSION="10.0.2"
+GRAFANA_VERSION="10.0.3"
 
 # dependencies used by the app
 pkg_dependencies="influxdb"

From 41636b0d3f942a3d21b4cf605210741e4d4d6d66 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 27 Jul 2023 06:11:21 +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 24e4da1..ef62f48 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.2~ynh1
+**Shipped version:** 10.0.3~ynh1
 
 **Demo:** https://play.grafana.org
 
diff --git a/README_fr.md b/README_fr.md
index 1419a59..54d1edb 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.2~ynh1
+**Version incluse :** 10.0.3~ynh1
 
 **Démo :** https://play.grafana.org
 

From 472b57e001ce8bd8204bc3459e9cf3181fbdf269 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Thu, 27 Jul 2023 12:56:00 +0200
Subject: [PATCH 3/3] Fix pre-v10 grafana instances

---
 scripts/upgrade | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 7c43c61..de41cee 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -146,6 +146,9 @@ EOF
     ynh_systemd_action --service_name=netdata --action="restart"
 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"
+
 # Update Grafana LDAP authentication configuration
 cp ../conf/ldap.toml /etc/grafana