From 2ef779e5460d8e478436ec88fcf191036567393a Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Fri, 19 Feb 2021 18:21:44 +0300 Subject: [PATCH] PMM-5194 Tunnels --- .gitmodules | 12 ++++++++---- sources/pmm-admin/src/github.com/percona/pmm-admin | 2 +- sources/pmm-agent/src/github.com/percona/pmm-agent | 2 +- .../pmm-managed/src/github.com/percona/pmm-managed | 2 +- sources/pmm/src/github.com/percona/pmm | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4438d6fe5978..2e26134ffa9b 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-5194-tunnels # PMM Client @@ -9,11 +9,11 @@ [submodule "pmm-admin"] path = sources/pmm-admin/src/github.com/percona/pmm-admin url = https://github.com/percona/pmm-admin.git - branch = master + branch = PMM-5194-tunnels [submodule "pmm-agent"] path = sources/pmm-agent/src/github.com/percona/pmm-agent url = https://github.com/percona/pmm-agent.git - branch = master + branch = PMM-5194-tunnels [submodule "node_exporter"] path = sources/node_exporter/src/github.com/prometheus/node_exporter url = https://github.com/percona/node_exporter.git @@ -53,7 +53,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-5194-tunnels [submodule "dbaas-controller"] path = sources/dbaas-controller/src/github.com/percona-platform/dbaas-controller url = https://github.com/percona-platform/dbaas-controller @@ -63,6 +63,10 @@ path = sources/qan-api2/src/github.com/percona/qan-api2 url = https://github.com/percona/qan-api2 branch = master +[submodule "qan-app"] + path = sources/qan-app/src/github.com/percona/qan-app + url = https://github.com/percona/qan-app + branch = PMM-2.0 [submodule "pmm-update"] path = sources/pmm-update/src/github.com/percona/pmm-update url = https://github.com/percona/pmm-update diff --git a/sources/pmm-admin/src/github.com/percona/pmm-admin b/sources/pmm-admin/src/github.com/percona/pmm-admin index bc209f9162da..53f6551ac2ac 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 bc209f9162da3805d0490a9bc36084a7b19ed62b +Subproject commit 53f6551ac2acdcb72ad7a5dd92569b1f58e454b5 diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent index 08539bacac8e..ab13593719f2 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 08539bacac8e9f140d712c3e8cdff99b847932f6 +Subproject commit ab13593719f2a16dd7e9a0f2a1f544870a0c6424 diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed index 50a515f0ddb1..a98489ae4301 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 50a515f0ddb1477056507ae75860d4897ae624e7 +Subproject commit a98489ae430190f6145c9828f8c9fe171e545f84 diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm index baf33d36ecf1..4a47e69663fb 160000 --- a/sources/pmm/src/github.com/percona/pmm +++ b/sources/pmm/src/github.com/percona/pmm @@ -1 +1 @@ -Subproject commit baf33d36ecf1651f70c0acae1be11c61d3f30b2c +Subproject commit 4a47e69663fbf943789a2168b24d3f6f3c870cb2