Skip to content

Commit

Permalink
PMM-12314 Grafana 10 (#2713)
Browse files Browse the repository at this point in the history
* PMM-12314 Bump node to 18

* PMM-12314 revert NodeJS v18 for RHEL7

* PMM-12314 follow the official inst instructions from the repo

* PMM-12314 use the old style install script

* PMM-12314 temp disable debug packages

* PMM-12314 try to debug pmm-managed

* PMM-12314 change the delay when pinging pmm-managed

* PMM-12643 revert tmp changes

* PMM-12643 fix the comment syntax

* PMM-12314 Update grafana spec file

* PMM-12314 Add grafana commit hash

---------

Co-authored-by: Alex Demidoff <alexander.demidoff@percona.com>
Co-authored-by: Jiří Čtvrtka <62988319+JiriCtvrtka@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 16, 2024
1 parent 7491172 commit 989ce79
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
8 changes: 6 additions & 2 deletions build/ansible/roles/initialization/tasks/main.yml
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
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
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 <matej.kubinec@ext.percona.com> - 10.2.3-1
- PMM-12314 Grafana 10.2.3

* Mon Nov 27 2023 Alex Demidoff <alexander.demidoff@percona.com> - 9.2.20-2
- PMM-12693 Run Grafana as non-root user

Expand Down

0 comments on commit 989ce79

Please sign in to comment.