From c671552d92cf1a9624fdeb8dbfec2a4257d63030 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 13 Jun 2020 09:34:16 +0200
Subject: [PATCH] Upgrade to upstream version 7.0.3

---
 CHANGELOG.md       | 15 +++++++++++++++
 README.md          |  4 ++--
 manifest.json      |  2 +-
 scripts/_common.sh |  2 +-
 scripts/restore    |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 853f053..07442f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,21 @@ Changelog
 ## Unreleased
 - Nothing for now...
 
+## [7.0.3~ynh1](https://github.com/YunoHost-Apps/grafana_ynh/pull/21) - 2020-06-13
+
+#### Changed
+* Upgrade to upstream version 7.0.3
+
+## [7.0.1~ynh1](https://github.com/YunoHost-Apps/grafana_ynh/pull/21) - 2020-05-31
+
+#### Changed
+* Upgrade to upstream version 7.0.1
+
+## [7.0.0~ynh1](https://github.com/YunoHost-Apps/grafana_ynh/pull/21) - 2020-05-24
+
+#### Changed
+* Upgrade to upstream version 7.0.0
+
 ## [6.7.3~ynh1](https://github.com/YunoHost-Apps/grafana_ynh/pull/21) - 2020-05-15
 
 #### Added
diff --git a/README.md b/README.md
index 2030241..26d1605 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Grafana app for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/grafana.svg)](https://dash.yunohost.org/appci/app/grafana)  
+[![Integration level](https://dash.yunohost.org/integration/grafana.svg)](https://dash.yunohost.org/appci/app/grafana) ![](https://ci-apps.yunohost.org/ci/badges/grafana.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/grafana.maintain.svg)  
 [![Install grafana with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=grafana)
 
 > *This package allows you to install grafana quickly and simply on a YunoHost server.  
@@ -13,7 +13,7 @@ NetData only collects, displays and sets alarms based on data from the last hour
 
 Note: You can use it without NetData, but you'll have to install a collection application (e.g. collectd) to gather data.
 
-**Shipped version:** 6.7.3
+**Shipped version:** 7.0.3
 
 ## Screenshots
 
diff --git a/manifest.json b/manifest.json
index ffd01d6..9ae7742 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Beautiful metric & analytic dashboards for monitoring",
         "fr": "Tableaux de bords de supervision"
     },
-    "version": "7.0.0~ynh1",
+    "version": "7.0.3~ynh1",
     "license": "Apache-2.0",
     "url": "http://grafana.org/",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 2c1897e..2fbc0ea 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # Debian package version for Grafana
-GRAFANA_VERSION="7.0.0"
+GRAFANA_VERSION="7.0.3"
 # dependencies used by the app
 pkg_dependencies="influxdb"
 
diff --git a/scripts/restore b/scripts/restore
index 7e20033..be96d42 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -24,7 +24,7 @@ ynh_abort_if_errors
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading settings..." --weight=1
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
 app=$YNH_APP_INSTANCE_NAME