PMM-5194 Tunnels

Gopkg.toml

@@ -14,7 +14,8 @@ required = [
 
 [[constraint]]
   name = "github.com/percona/pmm"
-  branch = "PMM-2.0"
+  # branch = "PMM-2.0"
+  branch = "PMM-5194-tunnels"
 
 [[constraint]]
   name = "github.com/percona-platform/saas"

models/database.go

@@ -413,9 +413,11 @@ var databaseSchema = [][]string{
 			PRIMARY KEY (id)
 		)`,
 	},
+
 	25: {
 		`ALTER TABLE agents ADD COLUMN mongo_db_tls_options JSONB`,
 	},
+
 	26: {
 		`ALTER TABLE ia_rules ALTER COLUMN channel_ids DROP NOT NULL`,
 	},
@@ -507,6 +509,10 @@ func SetupDB(sqlDB *sql.DB, params *SetupDBParams) (*reform.DB, error) {
 			queries = append(queries, fmt.Sprintf(`INSERT INTO schema_migrations (id) VALUES (%d)`, version))
 			for _, q := range queries {
 				q = strings.TrimSpace(q)
+				if q == "" {
+					return fmt.Errorf("empty query in version %d: missed migration number?", version)
+				}
+
 				if _, err = tx.Exec(q); err != nil {
 					return errors.Wrapf(err, "failed to execute statement:\n%s", q)
 				}

models/tunnel_model.go

@@ -0,0 +1,71 @@
+// pmm-managed
+// Copyright (C) 2017 Percona LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package models
+
+import (
+	"time"
+
+	"gopkg.in/reform.v1"
+)
+
+//go:generate reform
+
+type TunnelType string
+
+const (
+	ConnectTunnelType TunnelType = "connect"
+	ListenTunnelType  TunnelType = "listen"
+)
+
+//reform:tunnels
+type Tunnel struct {
+	TunnelID    string     `reform:"tunnel_id,pk"`
+	TunnelType  TunnelType `reform:"tunnel_type"`
+	PMMAgentID  string     `reform:"pmm_agent_id"`
+	ConnectPort uint16     `reform:"connect_port"`
+	ListenPort  uint16     `reform:"listen_port"`
+	CreatedAt   time.Time  `reform:"created_at"`
+	UpdatedAt   time.Time  `reform:"updated_at"`
+}
+
+// BeforeInsert implements reform.BeforeInserter interface.
+func (s *Tunnel) BeforeInsert() error {
+	now := Now()
+	s.CreatedAt = now
+	s.UpdatedAt = now
+	return nil
+}
+
+// BeforeUpdate implements reform.BeforeUpdater interface.
+func (s *Tunnel) BeforeUpdate() error {
+	s.UpdatedAt = Now()
+	return nil
+}
+
+// AfterFind implements reform.AfterFinder interface.
+func (s *Tunnel) AfterFind() error {
+	s.CreatedAt = s.CreatedAt.UTC()
+	s.UpdatedAt = s.UpdatedAt.UTC()
+	return nil
+}
+
+// check interfaces
+var (
+	_ reform.BeforeInserter = (*Tunnel)(nil)
+	_ reform.BeforeUpdater  = (*Tunnel)(nil)
+	_ reform.AfterFinder    = (*Tunnel)(nil)
+)

services/agents/channel/channel.go

@@ -51,6 +51,9 @@ type ServerResponse struct {
 
 // Channel encapsulates two-way communication channel between pmm-managed and pmm-agent.
 //
+// pmm-agent establishes a single gRPC connection with pmm-managed
+// and then starts a single gRPC bidirectional stream, which is represented by this type.
+//
 // All exported methods are thread-safe.
 //nolint:maligned
 type Channel struct {
@@ -70,7 +73,7 @@ type Channel struct {
 	closeErr  error
 }
 
-// New creates new two-way communication channel with given stream.
+// New creates new two-way communication channel with given gRPC bidirectional stream.
 //
 // Stream should not be used by the caller after channel is created.
 func New(stream agentpb.Agent_ConnectServer, m *SharedChannelMetrics) *Channel {

services/agents/channel/metrics.go

@@ -59,8 +59,6 @@ func (scm *SharedChannelMetrics) Describe(ch chan<- *prom.Desc) {
 func (scm *SharedChannelMetrics) Collect(ch chan<- prom.Metric) {
 	scm.mRecv.Collect(ch)
 	scm.mSend.Collect(ch)
-
-	// TODO metrics for channel's len(requests) and cap(requests)
 }
 
 // check interfaces

services/agents/channel/tunnel.go

@@ -0,0 +1,17 @@
+// pmm-managed
+// Copyright (C) 2017 Percona LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+package channel