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.

Sign up for GitHub

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

Jump to bottom

PMM-13235 Grafana 11 #3075

Merged
merged 16 commits into from
Sep 19, 2024
Merged

PMM-13235 Grafana 11 #3075

Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
64b8790
PMM-13235 Update grafana spec file to 11.1
matejkubinec Jul 17, 2024
7c36f72
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Jul 18, 2024
4a154dc
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Jul 29, 2024
78dac45
PMM-13235 Update spec and contributing grafana repo url
matejkubinec Aug 12, 2024
155b89e
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Aug 12, 2024
c033673
PMM-13235 Bump grafana version to 11.1.4
matejkubinec Aug 15, 2024
0736894
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Sep 2, 2024
0cb5499
PMM-13235 Bump grafana version to 11.1.5
matejkubinec Sep 6, 2024
a396d72
PMM-13235 Add commit hash
matejkubinec Sep 18, 2024
672ba7c
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Sep 18, 2024
fba564c
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Sep 18, 2024
647021b
PMM-7 fix supervisor_test after merging
ademidoff Sep 18, 2024
ce7de91
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Sep 18, 2024
bf115fc
PMM-7 fix supervisor_test after merging
ademidoff Sep 18, 2024
a3eb41a
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Sep 18, 2024
8315394
Merge branch 'v3' into PMM-13235-grafana-11
matejkubinec Sep 19, 2024
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
7 changes: 5 additions & 2 deletions build/packages/rpm/server/SPECS/grafana.spec
View file
Open in desktop
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.0
%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 Down Expand Up @@ -82,6 +82,9 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it
exit 0

%changelog
* 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