From 497e49a5498f946070078d664c184f73cc9457f4 Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Thu, 25 Jul 2024 09:44:18 -0400 Subject: [PATCH 1/5] Preparing packaging for next version: v5.1.3-0.a1.0 --- .../perfsonar-grafana/unibuild-packaging/deb/changelog | 6 ++++++ .../unibuild-packaging/rpm/perfsonar-grafana.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog index aab940a..a62c91c 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog @@ -1,3 +1,9 @@ +perfsonar-grafana (5.1.3~a1.0-1) perfsonar-5.1-snapshot; urgency=low + + * New upstream version. + + -- perfSONAR developers Thu, 25 Jul 2024 09:44:18 -0400 + perfsonar-grafana (5.1.2-1) perfsonar-5.1; urgency=low * New upstream version. diff --git a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec index 573d219..ad26f22 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec @@ -3,8 +3,8 @@ %define httpd_config_base /etc/httpd/conf.d #Version variables set by automated scripts -%define perfsonar_auto_version 5.1.2 -%define perfsonar_auto_relnum 1 +%define perfsonar_auto_version 5.1.3 +%define perfsonar_auto_relnum 0.a1.0 # defining macros needed by SELinux # SELinux policy type - Targeted policy is the default SELinux policy used in Red Hat Enterprise Linux. From d6089f492b6168115f80479ca72a0de3e39ef538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Wed, 14 Aug 2024 17:55:43 +0200 Subject: [PATCH 2/5] Upgrading to Grafana 10.4.7 --- grafana/packages.yml | 12 ++++++------ perfsonar-grafana/perfsonar-grafana/Dockerfile | 2 +- .../deb/perfsonar-grafana.postinst | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/grafana/packages.yml b/grafana/packages.yml index 08d2568..cffad34 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.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 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/unibuild-packaging/deb/perfsonar-grafana.postinst b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst index d2056a0..d8349c4 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst +++ b/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 \ No newline at end of file +exit 0 From 380547ec5661e6a0b5883eb37dd009fecc4eddc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Wed, 28 Aug 2024 11:43:17 +0200 Subject: [PATCH 3/5] Upgrading to Grafana 10.4.8 and tuning the grafana_folder_permissions script. --- grafana/packages.yml | 12 ++++++------ .../perfsonar-grafana/grafana_folder_permissions.py | 8 +++++--- .../deb/perfsonar-grafana.postinst | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/grafana/packages.yml b/grafana/packages.yml index cffad34..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.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 + 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.7_arm64.deb - deb_name: grafana_10.4.7_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/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/perfsonar-grafana.postinst b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst index d8349c4..09b9b11 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst @@ -26,7 +26,7 @@ case "$1" in fi fi - apache2ctl reload + systemctl restart apache2 #update grafana config - this also starts grafana /usr/lib/perfsonar/grafana/grafana_config.sh ;; From 774ec5d54ff3903afe468e494a99fad52a489776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A6titia=20Delvaux?= Date: Wed, 28 Aug 2024 11:53:53 +0200 Subject: [PATCH 4/5] Removing service restart as this is not available at this stage. --- .../unibuild-packaging/deb/perfsonar-grafana.postinst | 1 - 1 file changed, 1 deletion(-) 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 09b9b11..489f814 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/perfsonar-grafana.postinst @@ -26,7 +26,6 @@ case "$1" in fi fi - systemctl restart apache2 #update grafana config - this also starts grafana /usr/lib/perfsonar/grafana/grafana_config.sh ;; From 7bee8a4984777354e371e654f919e63f5591231c Mon Sep 17 00:00:00 2001 From: Andy Lake Date: Fri, 6 Sep 2024 11:50:35 -0400 Subject: [PATCH 5/5] Releasing grafana - RPM 5.1.3-1 - DEB 5.1.3-1 --- .../perfsonar-grafana/unibuild-packaging/deb/changelog | 4 ++-- .../unibuild-packaging/rpm/perfsonar-grafana.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog index a62c91c..5b86d03 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/deb/changelog @@ -1,8 +1,8 @@ -perfsonar-grafana (5.1.3~a1.0-1) perfsonar-5.1-snapshot; urgency=low +perfsonar-grafana (5.1.3-1) perfsonar-5.1; urgency=low * New upstream version. - -- perfSONAR developers Thu, 25 Jul 2024 09:44:18 -0400 + -- perfSONAR developers Fri, 06 Sep 2024 11:50:34 -0400 perfsonar-grafana (5.1.2-1) perfsonar-5.1; urgency=low diff --git a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec index ad26f22..34b2458 100644 --- a/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec +++ b/perfsonar-grafana/perfsonar-grafana/unibuild-packaging/rpm/perfsonar-grafana.spec @@ -4,7 +4,7 @@ #Version variables set by automated scripts %define perfsonar_auto_version 5.1.3 -%define perfsonar_auto_relnum 0.a1.0 +%define perfsonar_auto_relnum 1 # defining macros needed by SELinux # SELinux policy type - Targeted policy is the default SELinux policy used in Red Hat Enterprise Linux.