PMM-3632 Fix bugs.

models/agent_helpers.go

@@ -181,6 +181,10 @@ func AgentAddExporter(q *reform.Querier, agentType AgentType, params *AddExporte
 		return nil, err
 	}
 
+	if _, err := AgentFindByID(q, params.PMMAgentID); err != nil {
+		return nil, err
+	}
+
 	if _, err := FindServiceByID(q, params.ServiceID); err != nil {
 		return nil, err
 	}

models/service_helpers.go

@@ -88,6 +88,21 @@ func ServicesForAgent(q *reform.Querier, agentID string) ([]*Service, error) {
 	return res, nil
 }
 
+// ServicesForNode returns all Services for Node with given ID.
+func ServicesForNode(q *reform.Querier, nodeID string) ([]*Service, error) {
+	tail := fmt.Sprintf("WHERE node_id = %s ORDER BY service_id", q.Placeholder(1)) //nolint:gosec
+	structs, err := q.SelectAllFrom(ServiceTable, tail, nodeID)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to select Services")
+	}
+
+	res := make([]*Service, len(structs))
+	for i, s := range structs {
+		res[i] = s.(*Service)
+	}
+	return res, nil
+}
+
 func checkServiceUniqueID(q *reform.Querier, id string) error {
 	if id == "" {
 		panic("empty Service ID")

services/agents/postgresql.go

@@ -34,7 +34,9 @@ func postgresqlDSN(service *models.Service, exporter *models.Agent) string {
 	q.Set("sslmode", "disable") // TODO: make it configurable
 	q.Set("connect_timeout", "5")
 
-	address := net.JoinHostPort(*service.Address, strconv.Itoa(int(*service.Port)))
+	host := pointer.GetString(service.Address)
+	port := pointer.GetUint16(service.Port)
+	address := net.JoinHostPort(host, strconv.Itoa(int(port)))
 	uri := url.URL{
 		Scheme:   "postgres",
 		User:     url.UserPassword(*exporter.Username, *exporter.Password),

services/inventory/grpc/services_server.go

@@ -37,9 +37,12 @@ func NewServicesServer(s *inventory.ServicesService) inventorypb.ServicesServer
 	return &servicesServer{s}
 }
 
-// ListServices returns a list of all Services.
+// ListServices returns a list of Services for a given filters.
 func (s *servicesServer) ListServices(ctx context.Context, req *inventorypb.ListServicesRequest) (*inventorypb.ListServicesResponse, error) {
-	services, err := s.s.List(ctx)
+	filters := inventory.ServiceFilters{
+		NodeID: req.GetNodeId(),
+	}
+	services, err := s.s.List(ctx, filters)
 	if err != nil {
 		return nil, err
 	}
@@ -53,6 +56,8 @@ func (s *servicesServer) ListServices(ctx context.Context, req *inventorypb.List
 			res.AmazonRdsMysql = append(res.AmazonRdsMysql, service)
 		case *inventorypb.MongoDBService:
 			res.Mongodb = append(res.Mongodb, service)
+		case *inventorypb.PostgreSQLService:
+			res.Postgresql = append(res.Postgresql, service)
 		default:
 			panic(fmt.Errorf("unhandled inventory Service type %T", service))
 		}
@@ -75,6 +80,8 @@ func (s *servicesServer) GetService(ctx context.Context, req *inventorypb.GetSer
 		res.Service = &inventorypb.GetServiceResponse_AmazonRdsMysql{AmazonRdsMysql: service}
 	case *inventorypb.MongoDBService:
 		res.Service = &inventorypb.GetServiceResponse_Mongodb{Mongodb: service}
+	case *inventorypb.PostgreSQLService:
+		res.Service = &inventorypb.GetServiceResponse_Postgresql{Postgresql: service}
 	default:
 		panic(fmt.Errorf("unhandled inventory Service type %T", service))
 	}

services/inventory/services.go

@@ -41,13 +41,24 @@ func NewServicesService(db *reform.DB, r registry) *ServicesService {
 	}
 }
 
+// ServiceFilters represents filters for services list.
+type ServiceFilters struct {
+	// Return only Services runs on that Node.
+	NodeID string
+}
+
 // List selects all Services in a stable order.
 //nolint:unparam
-func (ss *ServicesService) List(ctx context.Context) ([]inventorypb.Service, error) {
+func (ss *ServicesService) List(ctx context.Context, filters ServiceFilters) ([]inventorypb.Service, error) {
 	services := make([]*models.Service, 0)
 	e := ss.db.InTransaction(func(tx *reform.TX) error {
 		var err error
-		services, err = models.FindAllServices(tx.Querier)
+		switch {
+		case filters.NodeID != "":
+			services, err = models.ServicesForNode(tx.Querier, filters.NodeID)
+		default:
+			services, err = models.FindAllServices(tx.Querier)
+		}
 		if err != nil {
 			return err
 		}

services/inventory/services_test.go

@@ -59,7 +59,7 @@ func TestServices(t *testing.T) {
 		ss, teardown := setup(t)
 		defer teardown(t)
 
-		actualServices, err := ss.List(ctx)
+		actualServices, err := ss.List(ctx, ServiceFilters{})
 		require.NoError(t, err)
 		require.Len(t, actualServices, 0)
 
@@ -83,7 +83,7 @@ func TestServices(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, expectedService, actualService)
 
-		actualServices, err = ss.List(ctx)
+		actualServices, err = ss.List(ctx, ServiceFilters{})
 		require.NoError(t, err)
 		require.Len(t, actualServices, 1)
 		assert.Equal(t, expectedService, actualServices[0])
@@ -114,7 +114,7 @@ func TestServices(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, expectedMdbService, actualService)
 
-		actualServices, err = ss.List(ctx)
+		actualServices, err = ss.List(ctx, ServiceFilters{})
 		require.NoError(t, err)
 		require.Len(t, actualServices, 1)
 		assert.Equal(t, expectedMdbService, actualServices[0])
@@ -145,7 +145,7 @@ func TestServices(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, expectedPostgreSQLService, actualService)
 
-		actualServices, err = ss.List(ctx)
+		actualServices, err = ss.List(ctx, ServiceFilters{NodeID: models.PMMServerNodeID})
 		require.NoError(t, err)
 		require.Len(t, actualServices, 1)
 		assert.Equal(t, expectedPostgreSQLService, actualServices[0])