diff --git a/build/ansible/roles/initialization/tasks/main.yml b/build/ansible/roles/initialization/tasks/main.yml index 935f2b9d51..be42baf2e8 100644 --- a/build/ansible/roles/initialization/tasks/main.yml +++ b/build/ansible/roles/initialization/tasks/main.yml @@ -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: diff --git a/build/docker/rpmbuild/Dockerfile.el9 b/build/docker/rpmbuild/Dockerfile.el9 index 96555cfc2d..58091d4dd4 100644 --- a/build/docker/rpmbuild/Dockerfile.el9 +++ b/build/docker/rpmbuild/Dockerfile.el9 @@ -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 diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index f3d6e644ee..873df8558a 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 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} @@ -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 - 10.2.3-1 +- PMM-12314 Grafana 10.2.3 + * Mon Nov 27 2023 Alex Demidoff - 9.2.20-2 - PMM-12693 Run Grafana as non-root user