Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PMM-13235 Grafana 11 #3075

Merged
merged 16 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ This project is built from several repositories:
#### Frontends

* [percona/grafana-dashboards](https://github.com/percona/grafana-dashboards) PMM dashboards for database monitoring
* [percona-platform/grafana](https://github.com/percona-platform/grafana) user interface for PMM
* [percona/grafana](https://github.com/percona/grafana) user interface for PMM

### PMM Client

Expand Down
14 changes: 10 additions & 4 deletions build/packages/rpm/server/SPECS/grafana.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
%global commit f2a6d70344f94674f731e6e9b031a6f147de46cc
%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.4
%define full_pmm_version 2.0.0
%define full_version v%{grafana_version}-%{full_pmm_version}
%define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist}
Expand All @@ -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
Expand Down Expand Up @@ -82,6 +82,12 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it
exit 0

%changelog
* Thu Aug 15 2024 Matej Kubinec <[email protected]> - 11.1.4-1
- PMM-13235 Grafana 11.1.4

* Wed Jul 17 2024 Matej Kubinec <[email protected]> - 11.1.0-1
- PMM-13235 Grafana 11.1.0

* Tue Apr 16 2024 Matej Kubinec <[email protected]> - 10.4.2-1
- PMM-13059 Grafana 10.4.2

Expand Down
Loading