From 43e78a439cb093d60b9bca72746b8f34cf9f5886 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 2 Jun 2026 09:07:24 +0200 Subject: [PATCH 1/5] PMM-15117 Update grafana spec file --- build/packages/rpm/server/SPECS/grafana.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index f71f47a78b..6aa3435c4b 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -2,8 +2,8 @@ %global commit b149f083323912e93d25fef812f73361426e26ab %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") -%define release 115 -%define grafana_version 12.4.3 +%define release 116 +%define grafana_version 12.4.3+security-02 %define full_pmm_version 3.0.0 %define full_version v%{grafana_version}-%{full_pmm_version} %define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist} @@ -77,6 +77,9 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it exit 0 %changelog +* Tue Jun 02 2026 Matej Kubinec - 12.4.3+security-02-1 +- PMM-14213 Upgrade Grafana to v12.4.3+security-02 + * Thu May 14 2026 Fábio Silva - 12.4.3 - PMM-14213 Upgrade Grafana to v12.4.2 From 89298b263929004e3fab77a7d510258fdd503ac0 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 2 Jun 2026 12:56:55 +0200 Subject: [PATCH 2/5] PMM-15117 Update version --- build/packages/rpm/server/SPECS/grafana.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 6aa3435c4b..39af27d528 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -3,7 +3,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") %define release 116 -%define grafana_version 12.4.3+security-02 +%define grafana_version 12.4.3 %define full_pmm_version 3.0.0 %define full_version v%{grafana_version}-%{full_pmm_version} %define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist} From a5174eb62af7c91e5eded16c3ff5ec2eb4ca336a Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 2 Jun 2026 14:08:39 +0200 Subject: [PATCH 3/5] PMM-15117 Use version reported from grafana cli --- build/packages/rpm/server/SPECS/grafana.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 39af27d528..b50d2a9e85 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -3,7 +3,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") %define release 116 -%define grafana_version 12.4.3 +%define grafana_version 12.4.4 %define full_pmm_version 3.0.0 %define full_version v%{grafana_version}-%{full_pmm_version} %define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist} @@ -77,7 +77,7 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it exit 0 %changelog -* Tue Jun 02 2026 Matej Kubinec - 12.4.3+security-02-1 +* Tue Jun 02 2026 Matej Kubinec - 12.4.4-1 - PMM-14213 Upgrade Grafana to v12.4.3+security-02 * Thu May 14 2026 Fábio Silva - 12.4.3 From 0da0ec8eaf5429d702786d03f05f6e42d83949d5 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 2 Jun 2026 14:49:17 +0200 Subject: [PATCH 4/5] PMM-15117 Fix grafana binaries path --- build/packages/rpm/server/SPECS/grafana.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index b50d2a9e85..40ae424edf 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -49,10 +49,10 @@ cp -rpav public %{buildroot}%{_datadir}/grafana cp -rpav tools %{buildroot}%{_datadir}/grafana install -d -p %{buildroot}%{_sbindir} -cp bin/linux-amd64/grafana-server %{buildroot}%{_sbindir}/ -cp bin/linux-amd64/grafana %{buildroot}%{_sbindir}/ +cp bin/linux/amd64/grafana-server %{buildroot}%{_sbindir}/ +cp bin/linux/amd64/grafana %{buildroot}%{_sbindir}/ install -d -p %{buildroot}%{_bindir} -cp bin/linux-amd64/grafana-cli %{buildroot}%{_bindir}/ +cp bin/linux/amd64/grafana-cli %{buildroot}%{_bindir}/ install -d -p %{buildroot}%{_sysconfdir}/grafana cp conf/sample.ini %{buildroot}%{_sysconfdir}/grafana/grafana.ini From db150344880d61956aa1c33f877fe5fbe160c1d4 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Tue, 2 Jun 2026 15:48:42 +0200 Subject: [PATCH 5/5] PMM-15117 Update changelog description --- build/packages/rpm/server/SPECS/grafana.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 40ae424edf..1c3678304d 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -78,7 +78,7 @@ exit 0 %changelog * Tue Jun 02 2026 Matej Kubinec - 12.4.4-1 -- PMM-14213 Upgrade Grafana to v12.4.3+security-02 +- PMM-14213 Upgrade Grafana to v12.4.4 * Thu May 14 2026 Fábio Silva - 12.4.3 - PMM-14213 Upgrade Grafana to v12.4.2