From 9dcabbd904de1245e0725ca19d354f6085c74030 Mon Sep 17 00:00:00 2001 From: Matej Kubinec <32638572+matejkubinec@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:48:33 +0200 Subject: [PATCH] PMM-13235 Grafana 11 (#3075) * PMM-13235 Update grafana spec file to 11.1 * PMM-13235 Update spec and contributing grafana repo url * PMM-13235 Bump grafana version to 11.1.4 * PMM-13235 Bump grafana version to 11.1.5 * PMM-13235 Add commit hash --- build/packages/rpm/server/SPECS/grafana.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 71ea12301d..a90b2f40ac 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -1,9 +1,9 @@ %global debug_package %{nil} -%global commit f2a6d70344f94674f731e6e9b031a6f147de46cc +%global commit 7dd51483f34ce324e603160f415395fce0bc55a1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") -%define release 105 -%define grafana_version 10.4.2 +%define release 106 +%define grafana_version 11.1.5 %define full_pmm_version 2.0.0 %define full_version v%{grafana_version}-%{full_pmm_version} %define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist} @@ -17,8 +17,8 @@ Version: %{grafana_version} Release: %{rpm_release} Summary: Grafana is an open source, feature rich metrics dashboard and graph editor License: AGPLv3 -URL: https://github.com/percona-platform/grafana -Source0: https://github.com/percona-platform/grafana/archive/%{commit}.tar.gz +URL: https://github.com/percona/grafana +Source0: https://github.com/percona/grafana/archive/%{commit}.tar.gz ExclusiveArch: %{ix86} x86_64 %{arm} BuildRequires: fontconfig @@ -82,6 +82,15 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it exit 0 %changelog +* Fri Sep 06 2024 Matej Kubinec - 11.1.5-1 +- PMM-13235 Grafana 11.1.5 + +* Thu Aug 15 2024 Matej Kubinec - 11.1.4-1 +- PMM-13235 Grafana 11.1.4 + +* Wed Jul 17 2024 Matej Kubinec - 11.1.0-1 +- PMM-13235 Grafana 11.1.0 + * Tue Apr 16 2024 Matej Kubinec - 10.4.2-1 - PMM-13059 Grafana 10.4.2