From e9c8bc8e9fc994f39a93541b4f828f84839c4b4c Mon Sep 17 00:00:00 2001 From: Yaroslav Podorvanov Date: Sun, 24 Apr 2022 01:54:30 +0300 Subject: [PATCH 01/30] PMM-7326 log level --- ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ci.yml b/ci.yml index e69de29bb2d1..29739dc86397 100644 --- a/ci.yml +++ b/ci.yml @@ -0,0 +1,10 @@ +deps: + # COMMON + - name: pmm + branch: PMM-7326-log-level + + - name: pmm-admin + branch: PMM-7326-log-level-for-FB-build-special + + - name: pmm-managed + branch: PMM-7326-log-level \ No newline at end of file From 3d2c315a153cb57c366bfd0ed20c3b58504c0f87 Mon Sep 17 00:00:00 2001 From: Yaroslav Podorvanov Date: Sun, 24 Apr 2022 03:05:55 +0300 Subject: [PATCH 02/30] PMM-7326 log level with right pmm dependency `go get -v github.com/percona/pmm@PMM-7326-log-level` --- ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci.yml b/ci.yml index 29739dc86397..036b2503783f 100644 --- a/ci.yml +++ b/ci.yml @@ -7,4 +7,4 @@ deps: branch: PMM-7326-log-level-for-FB-build-special - name: pmm-managed - branch: PMM-7326-log-level \ No newline at end of file + branch: PMM-7326-log-level-for-FB-build-special \ No newline at end of file From 38be68c24551412e9836bed10dd219378ad4f0ea Mon Sep 17 00:00:00 2001 From: Yaroslav Podorvanov Date: Mon, 25 Apr 2022 18:03:58 +0300 Subject: [PATCH 03/30] PMM-7326 complete From 6c80045380c3d6f8f2d33367fded31cfa0190da4 Mon Sep 17 00:00:00 2001 From: Yaroslav Podorvanov Date: Mon, 9 May 2022 15:08:51 +0300 Subject: [PATCH 04/30] PMM-7326 merge "go.mod" --- ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci.yml b/ci.yml index 036b2503783f..4b55c7a34299 100644 --- a/ci.yml +++ b/ci.yml @@ -4,7 +4,7 @@ deps: branch: PMM-7326-log-level - name: pmm-admin - branch: PMM-7326-log-level-for-FB-build-special + branch: PMM-7326-log-level - name: pmm-managed - branch: PMM-7326-log-level-for-FB-build-special \ No newline at end of file + branch: PMM-7326-log-level \ No newline at end of file From 6d841f1edbcd6800e5ddc85ed86941c0ab47b2e8 Mon Sep 17 00:00:00 2001 From: Yaroslav Podorvanov Date: Mon, 9 May 2022 20:55:24 +0300 Subject: [PATCH 05/30] PMM-9968 pmm-admin inventory --log-level --- ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci.yml b/ci.yml index 4b55c7a34299..fd95b73b137b 100644 --- a/ci.yml +++ b/ci.yml @@ -1,10 +1,10 @@ deps: # COMMON - name: pmm - branch: PMM-7326-log-level + branch: PMM-9968-pmm-admin-inventory-with-log-level - name: pmm-admin - branch: PMM-7326-log-level + branch: PMM-9968-pmm-admin-inventory-with-log-level - name: pmm-managed - branch: PMM-7326-log-level \ No newline at end of file + branch: PMM-9968-pmm-admin-inventory-with-log-level \ No newline at end of file From fc8bfad2a8692118700098d9517a7c5bf7bc8a05 Mon Sep 17 00:00:00 2001 From: Alexey Mukas <91831719+ritbl@users.noreply.github.com> Date: Mon, 30 May 2022 17:17:29 +0200 Subject: [PATCH 06/30] Update ci.yml --- ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci.yml b/ci.yml index fd95b73b137b..70db45a08b1d 100644 --- a/ci.yml +++ b/ci.yml @@ -1,5 +1,4 @@ deps: - # COMMON - name: pmm branch: PMM-9968-pmm-admin-inventory-with-log-level @@ -7,4 +6,4 @@ deps: branch: PMM-9968-pmm-admin-inventory-with-log-level - name: pmm-managed - branch: PMM-9968-pmm-admin-inventory-with-log-level \ No newline at end of file + branch: PMM-9968-pmm-admin-inventory-with-log-level From 387563f28875d1d40bcdf57e783a51529f5bb9a7 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Thu, 26 May 2022 11:53:07 +0000 Subject: [PATCH 07/30] rewind submodules --- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index 7f0b0c17587d..74b9b5994ea1 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit 7f0b0c17587dd0957cd1b5127ae68ced67320e16 +Subproject commit 74b9b5994ea1cd7ed433fe1f7fa3054416d9d6f7 From fb8bd0488836662769e7fe6e03c565cd7e2daf1c Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Thu, 26 May 2022 14:32:23 +0000 Subject: [PATCH 08/30] rewind submodules --- sources/pmm-qa/src/github.com/percona/pmm-qa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa index 83583f03062a..a7d222fb00bc 160000 --- a/sources/pmm-qa/src/github.com/percona/pmm-qa +++ b/sources/pmm-qa/src/github.com/percona/pmm-qa @@ -1 +1 @@ -Subproject commit 83583f03062a1b0ffd79b7afa8690b4cbf9feac2 +Subproject commit a7d222fb00bccd4dcfbac05d19fd0b8ac7d4bc40 From 804a5cb8f583a2a8a91e16c86c122918c7147396 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Fri, 27 May 2022 12:52:50 +0000 Subject: [PATCH 09/30] rewind submodules --- sources/pmm-qa/src/github.com/percona/pmm-qa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa index a7d222fb00bc..b8e83b66c4f1 160000 --- a/sources/pmm-qa/src/github.com/percona/pmm-qa +++ b/sources/pmm-qa/src/github.com/percona/pmm-qa @@ -1 +1 @@ -Subproject commit a7d222fb00bccd4dcfbac05d19fd0b8ac7d4bc40 +Subproject commit b8e83b66c4f1c708ac37be13eb48ff0370677604 From 05a4103d64e848cb4fb559463fdbbe1f5a7e90e8 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Fri, 27 May 2022 13:55:19 +0000 Subject: [PATCH 10/30] rewind submodules --- sources/pmm-qa/src/github.com/percona/pmm-qa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-qa/src/github.com/percona/pmm-qa b/sources/pmm-qa/src/github.com/percona/pmm-qa index b8e83b66c4f1..c07ed7751810 160000 --- a/sources/pmm-qa/src/github.com/percona/pmm-qa +++ b/sources/pmm-qa/src/github.com/percona/pmm-qa @@ -1 +1 @@ -Subproject commit b8e83b66c4f1c708ac37be13eb48ff0370677604 +Subproject commit c07ed7751810cd22d25840d4b6c1fe4f21964336 From 6780a2df51148327d064c274ba6988383cb49428 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Fri, 27 May 2022 15:22:36 +0000 Subject: [PATCH 11/30] rewind submodules --- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index 74b9b5994ea1..99e3306e2954 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit 74b9b5994ea1cd7ed433fe1f7fa3054416d9d6f7 +Subproject commit 99e3306e295488b046aa1f0dcf5cd3a6efd32711 From a2d76368801712194c7d00a696ad2ce0127a9bfc Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Fri, 27 May 2022 16:32:32 +0000 Subject: [PATCH 12/30] rewind submodules --- sources/pmm/src/github.com/percona/pmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index 23069cdf1bb8..6e642af77b55 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit 23069cdf1bb886cb2b82b9814ecb62ff67a362b8 +Subproject commit 6e642af77b55d8129451f67bef79d5bce4f510f6 From 15c60550a25376ca6f1cd6a95e4629495c4a313a Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Mon, 30 May 2022 10:12:40 +0000 Subject: [PATCH 13/30] rewind submodules --- .../src/github.com/percona-platform/dbaas-controller | 2 +- sources/pmm-dump | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller b/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller index 3b1d4c724238..eba0b2a725cb 160000 --- a/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller +++ b/sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller @@ -1 +1 @@ -Subproject commit 3b1d4c724238026929487724fe1a6a90782221a5 +Subproject commit eba0b2a725cb72f8d8ec534cff0518903e5591c2 diff --git a/sources/pmm-dump b/sources/pmm-dump index 53f3028d2761..3549216ec943 160000 --- a/sources/pmm-dump +++ b/sources/pmm-dump @@ -1 +1 @@ -Subproject commit 53f3028d276184199301cca8ff06d55a3a8b4691 +Subproject commit 3549216ec943a0d2dc249e2255ac9726e889904c From 07dfd0b79d4c3d5c9ff18fe0851da69808565cb6 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Mon, 30 May 2022 10:22:42 +0000 Subject: [PATCH 14/30] rewind submodules --- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index 99e3306e2954..3c8715ef5fb9 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit 99e3306e295488b046aa1f0dcf5cd3a6efd32711 +Subproject commit 3c8715ef5fb9e3c3599f890d3a38bf13d80dc43b From 3f43eb0d61033e5751a65a91537fa9b5251202de Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Mon, 30 May 2022 10:32:50 +0000 Subject: [PATCH 15/30] rewind submodules --- sources/pmm-dump | 2 +- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/pmm-dump b/sources/pmm-dump index 3549216ec943..370c69f5002f 160000 --- a/sources/pmm-dump +++ b/sources/pmm-dump @@ -1 +1 @@ -Subproject commit 3549216ec943a0d2dc249e2255ac9726e889904c +Subproject commit 370c69f5002ff95a6fe09116a79001c4146817ba diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index 3c8715ef5fb9..c7a03aa42c40 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit 3c8715ef5fb9e3c3599f890d3a38bf13d80dc43b +Subproject commit c7a03aa42c40788f8e18a9daf1cc50a934c31943 From c603c2539387aff230613bc668e9c34d2f32d1fd Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Mon, 30 May 2022 16:42:42 +0000 Subject: [PATCH 16/30] rewind submodules --- sources/pmm-update/src/github.com/percona/pmm-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-update/src/github.com/percona/pmm-update b/sources/pmm-update/src/github.com/percona/pmm-update index 619e14a24580..6f4e654899ab 160000 --- a/sources/pmm-update/src/github.com/percona/pmm-update +++ b/sources/pmm-update/src/github.com/percona/pmm-update @@ -1 +1 @@ -Subproject commit 619e14a24580e0f9d5d08e6abc1e290558637630 +Subproject commit 6f4e654899abd7d0737855d609a273eb2b22e364 From 41cf2ba017f9e675fc5da12977b7a0b6005ed41d Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Tue, 31 May 2022 10:02:45 +0000 Subject: [PATCH 17/30] rewind submodules --- sources/pmm-managed/src/github.com/percona/pmm-managed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index f4658185309a..7d18ac1a74b6 160000 --- a/sources/pmm-managed/src/github.com/percona/pmm-managed +++ b/sources/pmm-managed/src/github.com/percona/pmm-managed @@ -1 +1 @@ -Subproject commit f4658185309a4200429c42282aa81eb4e4b11922 +Subproject commit 7d18ac1a74b66410dab11211227ac848b344aff6 From a0c758d85b5e4e139200f903891734d4a0a03c88 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Tue, 31 May 2022 13:12:52 +0000 Subject: [PATCH 18/30] rewind submodules --- sources/pmm-dump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-dump b/sources/pmm-dump index 370c69f5002f..fd84fa816b21 160000 --- a/sources/pmm-dump +++ b/sources/pmm-dump @@ -1 +1 @@ -Subproject commit 370c69f5002ff95a6fe09116a79001c4146817ba +Subproject commit fd84fa816b21c89793bb4271f9deca1329a590b6 From 10d5bb69f5cddbb705d32a89f4e80e77669c10a0 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Tue, 31 May 2022 13:33:13 +0000 Subject: [PATCH 19/30] rewind submodules --- sources/pmm-dump | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-dump b/sources/pmm-dump index fd84fa816b21..a3b2196a74c7 160000 --- a/sources/pmm-dump +++ b/sources/pmm-dump @@ -1 +1 @@ -Subproject commit fd84fa816b21c89793bb4271f9deca1329a590b6 +Subproject commit a3b2196a74c7c85b43930d0bc6a5e1aae2cae254 From e84ae8282f84423697f537bd700f43e6d5a13a65 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 06:05:55 +0000 Subject: [PATCH 20/30] rewind submodules --- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index c7a03aa42c40..bdcf78f481b9 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit c7a03aa42c40788f8e18a9daf1cc50a934c31943 +Subproject commit bdcf78f481b91c8b50f460f3e9319fb856629b02 From a1610e1b49682d4fb508543be79f9119aa59aa2a Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 08:32:54 +0000 Subject: [PATCH 21/30] rewind submodules --- sources/pmm-managed/src/github.com/percona/pmm-managed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index 7d18ac1a74b6..83d35436418f 160000 --- a/sources/pmm-managed/src/github.com/percona/pmm-managed +++ b/sources/pmm-managed/src/github.com/percona/pmm-managed @@ -1 +1 @@ -Subproject commit 7d18ac1a74b66410dab11211227ac848b344aff6 +Subproject commit 83d35436418f7f8c408aa7453bdc25f975d3634d From becc9181a294e29dbda96505aeb28c9c37cef586 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 08:55:07 +0000 Subject: [PATCH 22/30] rewind submodules --- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index bdcf78f481b9..050306472c38 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit bdcf78f481b91c8b50f460f3e9319fb856629b02 +Subproject commit 050306472c3883ea45d6f7af9d335768427c3918 From 2a50ef1fcd1fbf07db0ad661c3cf4f828bbb1669 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 10:42:47 +0000 Subject: [PATCH 23/30] rewind submodules --- sources/pmm-managed/src/github.com/percona/pmm-managed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index 83d35436418f..7f3122846086 160000 --- a/sources/pmm-managed/src/github.com/percona/pmm-managed +++ b/sources/pmm-managed/src/github.com/percona/pmm-managed @@ -1 +1 @@ -Subproject commit 83d35436418f7f8c408aa7453bdc25f975d3634d +Subproject commit 7f3122846086e7a3c40b2950e5d8c4eb63ae3016 From a5d56840d48505ec8c5344400db088aa5a6d6278 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 11:42:50 +0000 Subject: [PATCH 24/30] rewind submodules --- sources/pmm/src/github.com/percona/pmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index 6e642af77b55..29f1d11e9157 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit 6e642af77b55d8129451f67bef79d5bce4f510f6 +Subproject commit 29f1d11e915746184fefc3f0d1f696f14e33e9ef From 9fb6a577da809bed1fa247865556b7e392852c3d Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 12:33:14 +0000 Subject: [PATCH 25/30] rewind submodules --- sources/pmm-admin/src/github.com/percona/pmm-admin | 2 +- sources/pmm-agent/src/github.com/percona/pmm-agent | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin index 5dd950267e14..fbd0e4925e71 160000 --- a/sources/pmm-admin/src/github.com/percona/pmm-admin +++ b/sources/pmm-admin/src/github.com/percona/pmm-admin @@ -1 +1 @@ -Subproject commit 5dd950267e14dbf9a22045acf4b16ae2f54a7383 +Subproject commit fbd0e4925e718a3644f2ba75ed4ddc0a83d9c03c diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent index 4d163c8943fd..78b85198ad1e 160000 --- a/sources/pmm-agent/src/github.com/percona/pmm-agent +++ b/sources/pmm-agent/src/github.com/percona/pmm-agent @@ -1 +1 @@ -Subproject commit 4d163c8943fdf6370de0d6218f11bc9e4df81fd9 +Subproject commit 78b85198ad1e2c319d4012ef5ae338f389e2000a From a0237a431063370d7db33957d659d8f454a22c48 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 12:42:43 +0000 Subject: [PATCH 26/30] rewind submodules --- sources/pmm/src/github.com/percona/pmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index 29f1d11e9157..2e82337035f8 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit 29f1d11e915746184fefc3f0d1f696f14e33e9ef +Subproject commit 2e82337035f8c9274aa5dc49d57b91b0ea47377f From 8bf02df5d5a5aec02ff910de5b4d0d21042c41f3 Mon Sep 17 00:00:00 2001 From: Artem Gavrilov Date: Wed, 1 Jun 2022 14:54:15 +0200 Subject: [PATCH 27/30] PMM-10008 Move pmm-agent and pmm-admin to pmm repo (#2542) * PMM-10008 Change repository for pmm-admin and pmm-agent * PMM-10008 Fix build * PMM-10008 Fix build * PMM-10008 Fix build * PMM-10008 Fix build * PMM-10008 Switch pmm repo back to main branch --- .gitignore | 3 +- .gitmodules | 8 ----- build/bin/build-client-binary | 32 ++++++++++--------- build/bin/build-client-source | 3 +- build/bin/create-tags.py | 2 -- ci-default.yml | 12 ------- .../src/github.com/percona/pmm-admin | 1 - .../src/github.com/percona/pmm-agent | 1 - 8 files changed, 20 insertions(+), 42 deletions(-) delete mode 160000 sources/pmm-admin/src/github.com/percona/pmm-admin delete mode 160000 sources/pmm-agent/src/github.com/percona/pmm-agent diff --git a/.gitignore b/.gitignore index c9020999deb7..65175e055dea 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ tmp/ results/ .DS_Store .git-sources -.vscode +.vscode/ +.idea/ diff --git a/.gitmodules b/.gitmodules index 8c44cf195744..abb960c5d704 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,14 +6,6 @@ # PMM Client -[submodule "pmm-admin"] - path = sources/pmm-admin/src/github.com/percona/pmm-admin - url = https://github.com/percona/pmm-admin.git - branch = main -[submodule "pmm-agent"] - path = sources/pmm-agent/src/github.com/percona/pmm-agent - url = https://github.com/percona/pmm-agent.git - branch = main [submodule "node_exporter"] path = sources/node_exporter/src/github.com/prometheus/node_exporter url = https://github.com/percona/node_exporter.git diff --git a/build/bin/build-client-binary b/build/bin/build-client-binary index bc8b10d43413..1b04e4293e20 100755 --- a/build/bin/build-client-binary +++ b/build/bin/build-client-binary @@ -14,9 +14,10 @@ extract_source_tarball() { gobuild_component() { local component=$1 - local extract_path=${2:-"github.com/percona/$component"} - local component_path=$3 - local result_file=${4:-bin/$(basename ${component_path:-$extract_path})} + local parent_component=${2:-$component} + local extract_path=${3:-"github.com/percona/$parent_component"} + local component_path=$4 + local result_file=${5:-bin/$(basename ${component_path:-$extract_path})} if [ ${component} = 'azure_metrics_exporter' ]; then result_file=${result_file/_metrics/} @@ -50,9 +51,9 @@ gobuild_component() { # for 'make release' export PMM_RELEASE_VERSION=${full_pmm_version} export PMM_RELEASE_TIMESTAMP=$(date '+%s') - export PMM_RELEASE_FULLCOMMIT=$(cd sources/${component}/src/${extract_path} && git rev-parse HEAD) - export COMPONENT_VERSION=$(cd sources/${component}/src/${extract_path} && git describe --abbrev=0 --always) - export COMPONENT_BRANCH=$(cd sources/${component}/src/${extract_path} && git describe --always --contains --all) + export PMM_RELEASE_FULLCOMMIT=$(cd sources/${parent_component}/src/${extract_path} && git rev-parse HEAD) + export COMPONENT_VERSION=$(cd sources/${parent_component}/src/${extract_path} && git describe --abbrev=0 --always) + export COMPONENT_BRANCH=$(cd sources/${parent_component}/src/${extract_path} && git describe --always --contains --all) export PMM_RELEASE_BRANCH="" sudo chown -R builder:builder /home/builder/tmp @@ -63,7 +64,8 @@ gobuild_component() { mkdir -p \$binary_dir/bin mkdir -p /tmp/go/src/${extract_path} - tar -C /tmp/go/src/${extract_path} --strip-components=1 -zxpf \${source_dir}/${component}-*.tar.gz + archive=$(ls ${source_dir} | grep -e "${parent_component}-\w*\.tar\.gz") + tar -C /tmp/go/src/${extract_path} --strip-components=1 -zxpf \${source_dir}/\$archive pushd /tmp/go export GOPATH=\$(pwd -P) ${build_command} @@ -92,18 +94,18 @@ copy_component() { main() { extract_source_tarball - gobuild_component "vmagent" "github.com/VictoriaMetrics/VictoriaMetrics" "app/vmagent" - gobuild_component "node_exporter" "github.com/prometheus/node_exporter" + gobuild_component "vmagent" "" "github.com/VictoriaMetrics/VictoriaMetrics" "app/vmagent" + gobuild_component "node_exporter" "" "github.com/prometheus/node_exporter" gobuild_component "mysqld_exporter" - gobuild_component "postgres_exporter" "" "cmd/postgres_exporter" + gobuild_component "postgres_exporter" "" "" "cmd/postgres_exporter" gobuild_component "mongodb_exporter" gobuild_component "proxysql_exporter" gobuild_component "rds_exporter" gobuild_component "azure_metrics_exporter" - gobuild_component "clickhouse_exporter" "github.com/Percona-Lab/clickhouse_exporter" + gobuild_component "clickhouse_exporter" "" "github.com/Percona-Lab/clickhouse_exporter" - gobuild_component "pmm-admin" "" "" "github.com/percona/pmm-agent/bin/pmm-admin" - gobuild_component "pmm-agent" "" "" "github.com/percona/pmm-agent/bin/pmm-agent" + gobuild_component "pmm-admin" "pmm" "" "" "github.com/percona/pmm/bin/pmm-admin" + gobuild_component "pmm-agent" "pmm" "" "" "github.com/percona/pmm/bin/pmm-agent" echo ${version} > ${binary_dir}/VERSION @@ -120,8 +122,8 @@ main() { copy_component "percona-toolkit" "bin/pt-summary" copy_component "percona-toolkit" "bin/pt-mysql-summary" - gobuild_component "percona-toolkit" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary" - gobuild_component "percona-toolkit" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary" + gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-mongodb-summary" + gobuild_component "percona-toolkit" "" "github.com/percona/percona-toolkit" "src/go/pt-pg-summary" rm -rf ${binary_tarball} mkdir -p $(dirname ${binary_tarball}) || : diff --git a/build/bin/build-client-source b/build/bin/build-client-source index cbc62845db91..ca1e918d2c2a 100755 --- a/build/bin/build-client-source +++ b/build/bin/build-client-source @@ -68,8 +68,7 @@ main() { prepare_vmagent_tarball prepare_tarball pmm-submodules - prepare_tarball pmm-admin - prepare_tarball pmm-agent + prepare_tarball pmm prepare_tarball mongodb_exporter prepare_tarball mysqld_exporter prepare_tarball postgres_exporter diff --git a/build/bin/create-tags.py b/build/bin/create-tags.py index 51bf6287b2f7..cd08d21d8e82 100755 --- a/build/bin/create-tags.py +++ b/build/bin/create-tags.py @@ -6,8 +6,6 @@ REPOS = [ "sources/grafana/src/github.com/grafana/grafana", "sources/grafana-dashboards", - "sources/pmm-admin/src/github.com/percona/pmm-admin", - "sources/pmm-agent/src/github.com/percona/pmm-agent", "sources/pmm-managed/src/github.com/percona/pmm-managed", "sources/pmm-server", "sources/pmm-update/src/github.com/percona/pmm-update", diff --git a/ci-default.yml b/ci-default.yml index 91139f93d354..3d3595d68160 100644 --- a/ci-default.yml +++ b/ci-default.yml @@ -7,18 +7,6 @@ deps: component: common # CLIENT - - name: pmm-admin - branch: main - path: sources/pmm-admin/src/github.com/percona/pmm-admin - url: https://github.com/percona/pmm-admin - component: client - - - name: pmm-agent - branch: main - path: sources/pmm-agent/src/github.com/percona/pmm-agent - url: https://github.com/percona/pmm-agent - component: client - - name: node_exporter branch: main path: sources/node_exporter/src/github.com/prometheus/node_exporter diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin deleted file mode 160000 index fbd0e4925e71..000000000000 --- a/sources/pmm-admin/src/github.com/percona/pmm-admin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fbd0e4925e718a3644f2ba75ed4ddc0a83d9c03c diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent deleted file mode 160000 index 78b85198ad1e..000000000000 --- a/sources/pmm-agent/src/github.com/percona/pmm-agent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 78b85198ad1e2c319d4012ef5ae338f389e2000a From 1531f0c0ff33a1b1e9f379b0b92fdab783cb43ae Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 14:23:08 +0000 Subject: [PATCH 28/30] rewind submodules --- sources/pmm/src/github.com/percona/pmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index 2e82337035f8..81b1211338ee 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit 2e82337035f8c9274aa5dc49d57b91b0ea47377f +Subproject commit 81b1211338ee49a2fcabbb5fc1bdaf7f19016fc4 From 12744d726729ef199bcfa3f136dbcc5ea6709ca2 Mon Sep 17 00:00:00 2001 From: PMM Jenkins Date: Wed, 1 Jun 2022 15:32:41 +0000 Subject: [PATCH 29/30] rewind submodules --- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests index 050306472c38..198fb02d380c 160000 --- a/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests +++ b/sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests @@ -1 +1 @@ -Subproject commit 050306472c3883ea45d6f7af9d335768427c3918 +Subproject commit 198fb02d380cdb9ba649d3f7b927fdf518bcb6f7 From 14e666033248988d452815d8050afd0e73659714 Mon Sep 17 00:00:00 2001 From: Yaroslav Podorvanov Date: Thu, 2 Jun 2022 01:25:33 +0300 Subject: [PATCH 30/30] PMM-9968 remove pmm-admin as archived --- ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci.yml b/ci.yml index 70db45a08b1d..44e996faaa45 100644 --- a/ci.yml +++ b/ci.yml @@ -2,8 +2,5 @@ deps: - name: pmm branch: PMM-9968-pmm-admin-inventory-with-log-level - - name: pmm-admin - branch: PMM-9968-pmm-admin-inventory-with-log-level - - name: pmm-managed branch: PMM-9968-pmm-admin-inventory-with-log-level