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

PMM-12314 Grafana 10 #2713

Merged
merged 13 commits into from
Jan 16, 2024
Merged

PMM-12314 Grafana 10 #2713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1260069
PMM-12314 Bump node to 18
matejkubinec Dec 15, 2023
2d96c59
PMM-12314 revert NodeJS v18 for RHEL7
ademidoff Dec 19, 2023
641f019
PMM-12314 follow the official inst instructions from the repo
ademidoff Dec 19, 2023
6910f75
PMM-12314 use the old style install script
ademidoff Dec 19, 2023
185fb45
Merge branch 'v3' into PMM-12314-grafana-10
ademidoff Dec 19, 2023
ca7b00a
PMM-12314 temp disable debug packages
ademidoff Dec 19, 2023
e905f7d
PMM-12314 try to debug pmm-managed
ademidoff Dec 19, 2023
7eefbb7
PMM-12314 change the delay when pinging pmm-managed
ademidoff Dec 19, 2023
5ffa3bb
PMM-12643 revert tmp changes
ademidoff Dec 20, 2023
844cb0d
PMM-12643 fix the comment syntax
ademidoff Dec 20, 2023
99162ac
Merge branch 'v3' into PMM-12314-grafana-10
JiriCtvrtka Jan 5, 2024
ceef263
PMM-12314 Update grafana spec file
matejkubinec Jan 16, 2024
9d5d631
PMM-12314 Add grafana commit hash
matejkubinec Jan 16, 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
8 changes: 6 additions & 2 deletions build/ansible/roles/initialization/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,17 @@
group: pmm
mode: 0775

# Note: we want to leave this for some time until we achieve stable builds
- name: Output pmm-managed logs
shell: sleep 10 && tail -n 300 /srv/logs/pmm-managed.log

- name: Wait for PMM to be ready
ansible.builtin.uri:
url: "http://127.0.0.1:7772/v1/readyz"
status_code: 200
method: GET
retries: 120
delay: 1
retries: 20
delay: 5

- name: Disable maintenance mode
file:
Expand Down
2 changes: 1 addition & 1 deletion build/docker/rpmbuild/Dockerfile.el9
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM oraclelinux:9-slim

# enable nodesource repo for nodejs
RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash -
RUN curl -sL https://rpm.nodesource.com/setup_18.x | bash -
RUN curl -sL https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo
RUN microdnf install -y yum

Expand Down
9 changes: 6 additions & 3 deletions build/packages/rpm/server/SPECS/grafana.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
%global debug_package %{nil}
%global commit 7ff49f34a3998067fa1ea480c07e0c74939ea306
%global commit 93891204fab2b2be06011638422d3bd9869a1603
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define build_timestamp %(date -u +"%y%m%d%H%M")
%define release 102
%define grafana_version 9.2.20
%define release 103
%define grafana_version 10.2.3
%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
* Tue Jan 16 2024 Matej Kubinec <[email protected]> - 10.2.3-1
- PMM-12314 Grafana 10.2.3

* Mon Nov 27 2023 Alex Demidoff <[email protected]> - 9.2.20-2
- PMM-12693 Run Grafana as non-root user

Expand Down
Loading