From 4c55ea675f2c3bc17a319961ff960d54377259c5 Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Thu, 5 Aug 2021 09:30:54 +0200 Subject: [PATCH 1/6] rewind submodules --- .gitmodules | 10 +++++----- sources/grafana/src/github.com/grafana/grafana | 2 +- .../src/github.com/Percona-Lab/pmm-api-tests | 2 +- sources/pmm-managed/src/github.com/percona/pmm-managed | 2 +- sources/pmm/src/github.com/percona/pmm | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitmodules b/.gitmodules index c73358ed24e8..7b318d4df31f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "pmm"] path = sources/pmm/src/github.com/percona/pmm url = https://github.com/percona/pmm - branch = PMM-2.0 + branch = PMM-8459-disable-updates # PMM Client @@ -57,7 +57,7 @@ [submodule "pmm-managed"] path = sources/pmm-managed/src/github.com/percona/pmm-managed url = https://github.com/percona/pmm-managed - branch = PMM-2.0 + branch = PMM-8459-disable-updates [submodule "dbaas-controller"] path = sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller url = https://github.com/percona-platform/dbaas-controller @@ -77,17 +77,17 @@ [submodule "grafana-dashboards"] path = sources/grafana-dashboards url = https://github.com/percona/grafana-dashboards - branch = main + branch = PMM-2.0 [submodule "grafana"] path = sources/grafana/src/github.com/grafana/grafana url = https://github.com/percona-platform/grafana - branch = master + branch = PMM-8509-check-updates ## PMM Tests [submodule "pmm-api-tests"] path = sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests url = https://github.com/Percona-Lab/pmm-api-tests - branch = master + branch = PMM-8459-disable-updates [submodule "pmm-qa"] path = sources/pmm-qa/src/github.com/percona/pmm-qa url = https://github.com/percona/pmm-qa diff --git a/sources/grafana/src/github.com/grafana/grafana b/sources/grafana/src/github.com/grafana/grafana index 15ec5e5b3b65..cfed13e51340 160000 --- a/sources/grafana/src/github.com/grafana/grafana +++ b/sources/grafana/src/github.com/grafana/grafana @@ -1 +1 @@ -Subproject commit 15ec5e5b3b65afdee15dec373157ce102e231d33 +Subproject commit cfed13e513405edfdb7ea6c0b584f8a108b11d07 diff --git a/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests b/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests index 7d6d1c6dabf0..88fd1db50c83 160000 --- a/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests +++ b/sources/pmm-api-tests/src/github.com/Percona-Lab/pmm-api-tests @@ -1 +1 @@ -Subproject commit 7d6d1c6dabf0c808360e9068b8cedef966623864 +Subproject commit 88fd1db50c83cf94e50f5c2d53c6cc3210afa17c diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index 37a2eb1493ed..5fbdea7a7ef4 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 37a2eb1493ed1d727a738c0c7a62fb6489717ee5 +Subproject commit 5fbdea7a7ef4701b484e0e7db82a03a517592247 diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index 154612d18048..535d3c161596 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit 154612d1804801c414c4811d6613a41ab514f8ca +Subproject commit 535d3c161596534976cf8357a1eaead9975a2baa From 891aa992930e81cf6148d355d0e5300e4812bcf4 Mon Sep 17 00:00:00 2001 From: Jiri Ctvrtka Date: Thu, 5 Aug 2021 09:32:56 +0200 Subject: [PATCH 2/6] rewind submodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 7b318d4df31f..6c76054efe73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -77,7 +77,7 @@ [submodule "grafana-dashboards"] path = sources/grafana-dashboards url = https://github.com/percona/grafana-dashboards - branch = PMM-2.0 + branch = main [submodule "grafana"] path = sources/grafana/src/github.com/grafana/grafana url = https://github.com/percona-platform/grafana From 122b6d7eed9fb2985925d3727c00770ae6a69e0a Mon Sep 17 00:00:00 2001 From: Tiago Mota Santos Date: Tue, 10 Aug 2021 11:50:01 +0100 Subject: [PATCH 3/6] PMM-8509 Update submodules --- .gitmodules | 2 +- sources/grafana-dashboards | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6c76054efe73..9e84dd852129 100644 --- a/.gitmodules +++ b/.gitmodules @@ -77,7 +77,7 @@ [submodule "grafana-dashboards"] path = sources/grafana-dashboards url = https://github.com/percona/grafana-dashboards - branch = main + branch = PMM-8509-check-updates [submodule "grafana"] path = sources/grafana/src/github.com/grafana/grafana url = https://github.com/percona-platform/grafana diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards index ff6cefaa276c..a2eb6db90dad 160000 --- a/sources/grafana-dashboards +++ b/sources/grafana-dashboards @@ -1 +1 @@ -Subproject commit ff6cefaa276cfa00ca26045edd629e9a1e66db0c +Subproject commit a2eb6db90dad9a9e051168e982b3932528d33847 From b3e454b489724022c8c740b58cb64427d582aadf Mon Sep 17 00:00:00 2001 From: Tiago Mota Santos Date: Wed, 11 Aug 2021 16:29:40 +0100 Subject: [PATCH 4/6] PMM-8509 Update submodules --- sources/grafana-dashboards | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards index a2eb6db90dad..841014210f53 160000 --- a/sources/grafana-dashboards +++ b/sources/grafana-dashboards @@ -1 +1 @@ -Subproject commit a2eb6db90dad9a9e051168e982b3932528d33847 +Subproject commit 841014210f536a2278b1be966b207cf6bc442935 From fec771dff152c994a309da9959731158867d79ac Mon Sep 17 00:00:00 2001 From: Tiago Mota Santos Date: Thu, 12 Aug 2021 09:11:52 +0100 Subject: [PATCH 5/6] PMM-8509 Update submodules --- sources/grafana-dashboards | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/grafana-dashboards b/sources/grafana-dashboards index 841014210f53..b496cd442a61 160000 --- a/sources/grafana-dashboards +++ b/sources/grafana-dashboards @@ -1 +1 @@ -Subproject commit 841014210f536a2278b1be966b207cf6bc442935 +Subproject commit b496cd442a61938e9b69b0fcd04052e831b01a36 From 70a0041f1f89b93659ca8cb16022ecdea5618f6e Mon Sep 17 00:00:00 2001 From: Tiago Mota Santos Date: Thu, 12 Aug 2021 15:19:18 +0100 Subject: [PATCH 6/6] PMM-8509 Update submodules --- sources/node_exporter/src/github.com/prometheus/node_exporter | 2 +- sources/pmm-admin/src/github.com/percona/pmm-admin | 2 +- sources/pmm-agent/src/github.com/percona/pmm-agent | 2 +- sources/pmm-server | 2 +- sources/pmm-ui-tests/src/github.com/percona/pmm-ui-tests | 2 +- sources/pmm-update/src/github.com/percona/pmm-update | 2 +- .../postgres_exporter/src/github.com/percona/postgres_exporter | 2 +- .../proxysql_exporter/src/github.com/percona/proxysql_exporter | 2 +- sources/qan-api2/src/github.com/percona/qan-api2 | 2 +- sources/rds_exporter/src/github.com/percona/rds_exporter | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sources/node_exporter/src/github.com/prometheus/node_exporter b/sources/node_exporter/src/github.com/prometheus/node_exporter index 829843dcf217..f69d9dc8cf53 160000 --- a/sources/node_exporter/src/github.com/prometheus/node_exporter +++ b/sources/node_exporter/src/github.com/prometheus/node_exporter @@ -1 +1 @@ -Subproject commit 829843dcf217508bdc4578ecc531076ce7883ed3 +Subproject commit f69d9dc8cf53dc94bd9146c0f3d76777d4c09970 diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin index 87111b4f9941..7aa417cd9db7 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 87111b4f994180bcfdec5cc911cca373e6817b79 +Subproject commit 7aa417cd9db7091a018032112b0f1d98665934fa diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent index 562b750791db..22d3dec79e93 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 562b750791db94a29ccc3eb3acf137a0e6277f35 +Subproject commit 22d3dec79e93b92de77a9fb8ff2b74b3d8d5d47d diff --git a/sources/pmm-server b/sources/pmm-server index 98be7f6f6935..635d5cf68f41 160000 --- a/sources/pmm-server +++ b/sources/pmm-server @@ -1 +1 @@ -Subproject commit 98be7f6f69352cbbff87a693e93071310503d1c4 +Subproject commit 635d5cf68f41634c0d0bc43b552fb62ebab1ec4d 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 cb4d760f6054..b953309d43f9 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 cb4d760f6054b54ab79965270e9af1eee4a99910 +Subproject commit b953309d43f9ff0fbc4de039caa5053056cadcfc diff --git a/sources/pmm-update/src/github.com/percona/pmm-update b/sources/pmm-update/src/github.com/percona/pmm-update index 77eb2d99590c..5ec7f7f4e023 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 77eb2d99590c3161c2317569a06cf9fd61dd9b7e +Subproject commit 5ec7f7f4e023089f70cdad14dc32f241ed2b6647 diff --git a/sources/postgres_exporter/src/github.com/percona/postgres_exporter b/sources/postgres_exporter/src/github.com/percona/postgres_exporter index 5ddfc7de832c..ad4379d0cf81 160000 --- a/sources/postgres_exporter/src/github.com/percona/postgres_exporter +++ b/sources/postgres_exporter/src/github.com/percona/postgres_exporter @@ -1 +1 @@ -Subproject commit 5ddfc7de832ccf8afdaa51529cc9bf04f2c7f16b +Subproject commit ad4379d0cf8178642e217a91bbbc7566140793a0 diff --git a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter index e7a52e4d9e38..3a4a4a8dbf86 160000 --- a/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter +++ b/sources/proxysql_exporter/src/github.com/percona/proxysql_exporter @@ -1 +1 @@ -Subproject commit e7a52e4d9e38cd2c08b0f31c1b3d1385758798c2 +Subproject commit 3a4a4a8dbf8616bc801bfd2f6b8a420e195f9b4e diff --git a/sources/qan-api2/src/github.com/percona/qan-api2 b/sources/qan-api2/src/github.com/percona/qan-api2 index 8b5f56b520c7..ca1bb2c15c16 160000 --- a/sources/qan-api2/src/github.com/percona/qan-api2 +++ b/sources/qan-api2/src/github.com/percona/qan-api2 @@ -1 +1 @@ -Subproject commit 8b5f56b520c79d44dba5826ca8f888ea24bd10bd +Subproject commit ca1bb2c15c1691feecabff968cb2d841ae5769e1 diff --git a/sources/rds_exporter/src/github.com/percona/rds_exporter b/sources/rds_exporter/src/github.com/percona/rds_exporter index ef4de27c3f77..abe6afa670b9 160000 --- a/sources/rds_exporter/src/github.com/percona/rds_exporter +++ b/sources/rds_exporter/src/github.com/percona/rds_exporter @@ -1 +1 @@ -Subproject commit ef4de27c3f77a0060574260623243cf3dbdac60a +Subproject commit abe6afa670b9f61e88c9bd87f1bf509a729b4e68