Merge pull request #98 from YunoHost-Apps/testing

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.4.7~ynh1
+**Shipped version:** 9.5.1~ynh1
 
 **Demo:** https://play.grafana.org
 

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.4.7~ynh1
+**Version incluse :** 9.5.1~ynh1
 
 **Démo :** https://play.grafana.org
 

conf/ldap.toml

@@ -78,4 +78,6 @@ group_dn = "*"
 org_role = "Admin"
 # The Grafana organization database id, optional, if left out the default org (id 1) will be used
 org_id = 1
+# Make users grafana admins
+grafana_admin = true
 

manifest.json

@@ -6,7 +6,7 @@
         "en": "Metric & analytic dashboards for monitoring",
         "fr": "Tableaux de bord de supervision"
     },
-    "version": "9.4.7~ynh1",
+    "version": "9.5.1~ynh1",
     "url": "https://grafana.com/oss/grafana/",
     "upstream": {
         "license": "AGPL-3.0-only",

scripts/_common.sh

@@ -5,7 +5,7 @@
 #=================================================
 
 # Debian package version for Grafana
-GRAFANA_VERSION="9.4.7"
+GRAFANA_VERSION="9.5.1"
 
 # dependencies used by the app
 pkg_dependencies="influxdb"

scripts/upgrade

@@ -146,6 +146,9 @@ EOF
     ynh_systemd_action --service_name=netdata --action="restart"
 fi
 
+# Update Grafana LDAP authentication configuration
+cp ../conf/ldap.toml /etc/grafana
+
 # Update default dashboard for NetData (source: https://grafana.com/grafana/dashboards/2701)
 # Remove new lines
 tr -d '\n' < ../conf/netdata_dashboard.json  > dashboard.json