PMM-5194 Tunnels

Percona-Lab · Feb 19, 2021 · 2ef779e · 2ef779e
1 parent d220fb8
commit 2ef779e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,19 +1,19 @@
 [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
 
 [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
diff --git a/sources/pmm-agent/src/github.com/percona/pmm-agent b/sources/pmm-agent/src/github.com/percona/pmm-agent
diff --git a/sources/pmm-managed/src/github.com/percona/pmm-managed b/sources/pmm-managed/src/github.com/percona/pmm-managed
diff --git a/sources/pmm/src/github.com/percona/pmm b/sources/pmm/src/github.com/percona/pmm
+6 −4		.travis.yml
+5 −4		Gopkg.lock
+2 −1		Gopkg.toml
+30 −8		agentlocal/agentlocal.go
+1 −1		commands/inventory/add_agent_external_exporter.go
+0 −98		commands/inventory/add_service_haproxy.go
+0 −49		commands/inventory/add_service_haproxy_test.go
+0 −8		commands/inventory/list_services.go
+113 −0		commands/inventory/list_tunnels.go
+5 −33		commands/list.go
+10 −10		commands/list_test.go
+29 −32		commands/management/add_external.go
+21 −24		commands/management/add_external_serverless.go
+0 −145		commands/management/add_haproxy.go
+0 −41		commands/management/add_haproxy_test.go
+1 −2		commands/management/management.go
+31 −1		commands/status.go
+2 −2		main.go
+33 −1		vendor/github.com/percona/pmm/api/agentlocalpb/json/client/agent_local/status2_responses.go
+74 −1		vendor/github.com/percona/pmm/api/agentlocalpb/json/client/agent_local/status_responses.go
+5 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/pmm_inventory_client.go
+131 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/add_tunnel_parameters.go
+302 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/add_tunnel_responses.go
+131 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/list_tunnels_parameters.go
+335 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/list_tunnels_responses.go
+131 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/remove_tunnel_parameters.go
+223 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/remove_tunnel_responses.go
+139 −0		vendor/github.com/percona/pmm/api/inventorypb/json/client/tunnels/tunnels_client.go
+0 −3		vendor/github.com/percona/pmm/api/managementpb/json/client/external/add_external_responses.go
+0 −3		vendor/github.com/percona/pmm/api/managementpb/json/client/ha_proxy/add_ha_proxy_responses.go
+3 −1		.travis.yml
+8 −4		Gopkg.lock
+2 −1		Gopkg.toml
+1 −0		actions/concurrent_runner.go
+6 −11		agentlocal/agent_local.go
+50 −33		agentlocal/agent_local_test.go
+7 −0		agentlocal/deps.go
+29 −0		agentlocal/mock_registry_test.go
+12 −2		client/channel/channel.go
+32 −5		client/client.go
+19 −10		client/client_test.go
+12 −1		client/deps.go
+8 −5		client/mock_connection_checker_test.go
+50 −0		client/mock_registry_test.go
+34 −21		commands/run.go
+3 −6		connectionchecker/connection_checker.go
+6 −6		connectionchecker/connection_checker_test.go
+2 −1		main_test.go
+1 −0		packages.dot
+264 −0		tunnels/conn/conn.go
+161 −0		tunnels/conn/conn_test.go
+162 −0		tunnels/registry.go
+62 −0		tunnels/tunnels.go
+194 −80		vendor/github.com/percona/pmm/api/agentlocalpb/agentlocal.pb.go
+10 −0		vendor/github.com/percona/pmm/api/agentlocalpb/agentlocal.validator.pb.go
+33 −1		vendor/github.com/percona/pmm/api/agentlocalpb/json/client/agent_local/status2_responses.go
+74 −1		vendor/github.com/percona/pmm/api/agentlocalpb/json/client/agent_local/status_responses.go
+31 −9		vendor/github.com/percona/pmm/api/agentpb/agent.go
+973 −600		vendor/github.com/percona/pmm/api/agentpb/agent.pb.go
+58 −0		vendor/github.com/percona/pmm/api/agentpb/agent.validator.pb.go
+805 −0		vendor/github.com/percona/pmm/api/inventorypb/tunnels.pb.go
+331 −0		vendor/github.com/percona/pmm/api/inventorypb/tunnels.pb.gw.go
+68 −0		vendor/github.com/percona/pmm/api/inventorypb/tunnels.validator.pb.go
+464 −0		vendor/golang.org/x/net/nettest/conntest.go
+347 −0		vendor/golang.org/x/net/nettest/nettest.go
+11 −0		vendor/golang.org/x/net/nettest/nettest_stub.go
+21 −0		vendor/golang.org/x/net/nettest/nettest_unix.go
+26 −0		vendor/golang.org/x/net/nettest/nettest_windows.go
+3 −2		.travis.yml
+3 −3		Gopkg.lock
+7 −1		Gopkg.toml
+1 −1		docker-compose.yml
+2 −0		main.go
+1 −31		models/agent_model.go
+66 −186		models/agent_model_test.go
+28 −0		models/database.go
+127 −0		models/tunnel_helpers.go
+64 −0		models/tunnel_model.go
+161 −0		models/tunnel_model_reform.go
+12 −2		services/agents/channel/channel.go
+17 −0		services/agents/channel/tunnel.go
+64 −31		services/agents/registry.go
+54 −0		services/agents/tunnel_registry.go
+2 −0		services/grafana/auth_server.go
+16 −90		services/grafana/client.go
+2 −27		services/grafana/client_test.go
+97 −0		services/inventory/tunnels.go
+4 −9		services/management/external.go
+0 −6		services/management/haproxy.go
+31 −9		vendor/github.com/percona/pmm/api/agentpb/agent.go
+973 −600		vendor/github.com/percona/pmm/api/agentpb/agent.pb.go
+58 −0		vendor/github.com/percona/pmm/api/agentpb/agent.validator.pb.go
+805 −0		vendor/github.com/percona/pmm/api/inventorypb/tunnels.pb.go
+331 −0		vendor/github.com/percona/pmm/api/inventorypb/tunnels.pb.gw.go
+68 −0		vendor/github.com/percona/pmm/api/inventorypb/tunnels.validator.pb.go