diff --git a/grafana/packages.yml b/grafana/packages.yml index 08d2568..f521cb2 100644 --- a/grafana/packages.yml +++ b/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.8-1.x86_64.rpm + rpm_name: grafana-10.4.8-1.x86_64.rpm + deb_url: https://dl.grafana.com/oss/release/grafana_10.4.8_amd64.deb + deb_name: grafana_10.4.8_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.8_arm64.deb + deb_name: grafana_10.4.8_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 diff --git a/perfsonar-grafana/perfsonar-grafana/Dockerfile b/perfsonar-grafana/perfsonar-grafana/Dockerfile index 25a8ef0..fb50c44 100644 --- a/perfsonar-grafana/perfsonar-grafana/Dockerfile +++ b/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 diff --git a/perfsonar-grafana/perfsonar-grafana/grafana_folder_permissions.py b/perfsonar-grafana/perfsonar-grafana/grafana_folder_permissions.py index 4654c18..184f24e 100644 --- a/perfsonar-grafana/perfsonar-grafana/grafana_folder_permissions.py +++ b/perfsonar-grafana/perfsonar-grafana/grafana_folder_permissions.py @@ -49,8 +49,9 @@ #connect to api and update permissions try_count = 0 -TRY_MAX = 15 -SLEEP_TIME=2 +TRY_MAX = 5 +SLEEP_TIME=6 +time.sleep(SLEEP_TIME) while(try_count < TRY_MAX): try: for folder_uid in folder_uids: @@ -59,7 +60,8 @@ auth=('admin', admin_password), headers={"Accept": "application/json","Content-Type": "application/json"}, json=FOLDER_PERMISSIONS_JSON, - verify=False + verify=False, + timeout=12 ) r.raise_for_status() break diff --git a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog index 2a9150b..1f81a62 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog @@ -4,6 +4,12 @@ perfsonar-grafana (5.2.0~a1.0-1) perfsonar-5.2-snapshot; urgency=low -- perfSONAR developers Tue, 11 Jun 2024 18:35:57 +0200 +perfsonar-grafana (5.1.3-1) perfsonar-5.1; urgency=low + + * New upstream version. + + -- perfSONAR developers Fri, 06 Sep 2024 11:50:34 -0400 + perfsonar-grafana (5.1.2-1) perfsonar-5.1; urgency=low * New upstream version. diff --git a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst index d2056a0..489f814 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst @@ -27,7 +27,7 @@ case "$1" in fi #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 +40,4 @@ case "$1" in esac #DEBHELPER# -exit 0 \ No newline at end of file +exit 0