From 64b87909df21e1cc9ed034ad311748da282a7b13 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Wed, 17 Jul 2024 15:47:15 +0200 Subject: [PATCH 1/7] PMM-13235 Update grafana spec file to 11.1 --- build/packages/rpm/server/SPECS/grafana.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 71ea12301d..e678bd96b2 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -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} @@ -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 - 11.1.0-1 +- PMM-13235 Grafana 11.1.0 + * Tue Apr 16 2024 Matej Kubinec - 10.4.2-1 - PMM-13059 Grafana 10.4.2 From 78dac45c4dc842e16ecd4d4dacab0dac021c975e Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Mon, 12 Aug 2024 09:40:44 +0200 Subject: [PATCH 2/7] PMM-13235 Update spec and contributing grafana repo url --- CONTRIBUTING.md | 2 +- build/packages/rpm/server/SPECS/grafana.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index dd4f7a54b5..f0bfc68bd2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index e678bd96b2..187bb7dc9c 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -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 From c03367306bb505e5735451b74dbe3334514f055f Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Thu, 15 Aug 2024 10:58:12 +0200 Subject: [PATCH 3/7] PMM-13235 Bump grafana version to 11.1.4 --- build/packages/rpm/server/SPECS/grafana.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 187bb7dc9c..f09f542e84 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -3,7 +3,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") %define release 106 -%define grafana_version 11.1.0 +%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} @@ -82,6 +82,9 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it exit 0 %changelog +* Thu Aug 15 2024 Matej Kubinec - 11.1.4-1 +- PMM-13235 Grafana 11.1.4 + * Wed Jul 17 2024 Matej Kubinec - 11.1.0-1 - PMM-13235 Grafana 11.1.0 From 0cb54997a3357d8cf3ba2beee5f4b0074a9e669c Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Fri, 6 Sep 2024 13:44:41 +0200 Subject: [PATCH 4/7] PMM-13235 Bump grafana version to 11.1.5 --- build/packages/rpm/server/SPECS/grafana.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index f09f542e84..2fe22deba2 100644 --- a/build/packages/rpm/server/SPECS/grafana.spec +++ b/build/packages/rpm/server/SPECS/grafana.spec @@ -82,6 +82,9 @@ getent passwd pmm >/dev/null || echo "User pmm does not exist. Please create it exit 0 %changelog +* Fri Sep 06 2024 Matej Kubinec - 11.1.5-1 +- PMM-13235 Grafana 11.1.5 + * Thu Aug 15 2024 Matej Kubinec - 11.1.4-1 - PMM-13235 Grafana 11.1.4 From a396d72d2fe223ff43de3d19869618159e475b74 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Wed, 18 Sep 2024 14:33:41 +0200 Subject: [PATCH 5/7] PMM-13235 Add commit hash --- build/packages/rpm/server/SPECS/grafana.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/packages/rpm/server/SPECS/grafana.spec b/build/packages/rpm/server/SPECS/grafana.spec index 2fe22deba2..a90b2f40ac 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 f2a6d70344f94674f731e6e9b031a6f147de46cc +%global commit 7dd51483f34ce324e603160f415395fce0bc55a1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define build_timestamp %(date -u +"%y%m%d%H%M") %define release 106 -%define grafana_version 11.1.4 +%define grafana_version 11.1.5 %define full_pmm_version 2.0.0 %define full_version v%{grafana_version}-%{full_pmm_version} %define rpm_release %{release}.%{build_timestamp}.%{shortcommit}%{?dist} From 647021bd1655914a48f9c677705284bd69b582fa Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Wed, 18 Sep 2024 12:53:02 +0000 Subject: [PATCH 6/7] PMM-7 fix supervisor_test after merging --- agent/agents/supervisor/supervisor_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/agents/supervisor/supervisor_test.go b/agent/agents/supervisor/supervisor_test.go index 9e85b92585..aee9ce5907 100644 --- a/agent/agents/supervisor/supervisor_test.go +++ b/agent/agents/supervisor/supervisor_test.go @@ -77,7 +77,7 @@ func TestSupervisor(t *testing.T) { &agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}) expectedList = []*agentlocal.AgentInfo{ {AgentType: type_TEST_NOOP, AgentId: "noop3", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING}, - {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65000, ProcessExecPath: "sleep"}, + {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}, } assert.Equal(t, expectedList, s.AgentsList()) From bf115fc9521d367aeb65fbe59ecf54eba128b909 Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Wed, 18 Sep 2024 12:53:02 +0000 Subject: [PATCH 7/7] PMM-7 fix supervisor_test after merging --- agent/agents/supervisor/supervisor_test.go | 2 +- api/buf.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent/agents/supervisor/supervisor_test.go b/agent/agents/supervisor/supervisor_test.go index 9e85b92585..aee9ce5907 100644 --- a/agent/agents/supervisor/supervisor_test.go +++ b/agent/agents/supervisor/supervisor_test.go @@ -77,7 +77,7 @@ func TestSupervisor(t *testing.T) { &agentv1.StateChangedRequest{AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}) expectedList = []*agentlocal.AgentInfo{ {AgentType: type_TEST_NOOP, AgentId: "noop3", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING}, - {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_STARTING, ListenPort: 65000, ProcessExecPath: "sleep"}, + {AgentType: type_TEST_SLEEP, AgentId: "sleep1", Status: inventoryv1.AgentStatus_AGENT_STATUS_RUNNING, ListenPort: 65000, ProcessExecPath: "sleep"}, } assert.Equal(t, expectedList, s.AgentsList()) diff --git a/api/buf.yaml b/api/buf.yaml index b130c4ee02..7bca40f52a 100644 --- a/api/buf.yaml +++ b/api/buf.yaml @@ -13,12 +13,12 @@ lint: - PACKAGE_NO_IMPORT_CYCLE ignore_only: PACKAGE_VERSION_SUFFIX: - - api/common/common.proto - - api/common/metrics_resolutions.proto + - common/common.proto + - common/metrics_resolutions.proto RPC_REQUEST_STANDARD_NAME: - - api/agent/v1/agent.proto + - agent/v1/agent.proto RPC_RESPONSE_STANDARD_NAME: - - api/agent/v1/agent.proto + - agent/v1/agent.proto disallow_comment_ignores: true breaking: use: