Upgrading to Grafana 10.4.7

grafana/packages.yml

@@ -1,12 +1,12 @@
 grafana:
-  rpm_url:  https://dl.grafana.com/oss/release/grafana-10.4.4-1.x86_64.rpm
-  rpm_name: grafana-10.4.4-1.x86_64.rpm
-  deb_url:  https://dl.grafana.com/oss/release/grafana_10.4.4_amd64.deb
-  deb_name: grafana_10.4.4_amd64.deb
+  rpm_url:  https://dl.grafana.com/oss/release/grafana-10.4.7-1.x86_64.rpm
+  rpm_name: grafana-10.4.7-1.x86_64.rpm
+  deb_url:  https://dl.grafana.com/oss/release/grafana_10.4.7_amd64.deb
+  deb_name: grafana_10.4.7_amd64.deb
 grafana-arm64:
   rpm_url: 
   rpm_name: 
-  deb_url:  https://dl.grafana.com/oss/release/grafana_10.4.4_arm64.deb
-  deb_name: grafana_10.4.4_arm64.deb
+  deb_url:  https://dl.grafana.com/oss/release/grafana_10.4.7_arm64.deb
+  deb_name: grafana_10.4.7_arm64.deb
     # Unfortunately the .deb packages are managed differently and all external repository packages are currently stored in the minor-repo repository.
     # See https://github.com/perfsonar/minor-packages/blob/5.1.1/opensearch/archive_ext_packages.yml

perfsonar-grafana/perfsonar-grafana/Dockerfile

@@ -1,4 +1,4 @@
-FROM grafana/grafana:10.4.0-ubuntu
+FROM grafana/grafana:10.4.7-ubuntu
 
 COPY . /usr/lib/perfsonar/grafana
 

perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst

@@ -26,8 +26,9 @@ case "$1" in
             fi
         fi
 
+        apache2ctl reload
         #update grafana config - this also starts grafana
-        /usr/lib/perfsonar/grafana//grafana_config.sh
+        /usr/lib/perfsonar/grafana/grafana_config.sh
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -40,4 +41,4 @@ case "$1" in
 esac
 
 #DEBHELPER#
-exit 0
+exit 0