diff --git a/agent/pkg/controllers/service_map_controller_test.go b/agent/pkg/controllers/service_map_controller_test.go index c87bdbb96..b990530e9 100644 --- a/agent/pkg/controllers/service_map_controller_test.go +++ b/agent/pkg/controllers/service_map_controller_test.go @@ -101,16 +101,18 @@ func (s *ServiceMapControllerSuite) TestGet() { // response nodes aNode := servicemap.ServiceMapNode{ - Id: 1, - Name: TCPEntryA.Name, - Entry: TCPEntryA, - Count: 1, + Id: 1, + Name: TCPEntryA.Name, + Entry: TCPEntryA, + Resolved: true, + Count: 1, } bNode := servicemap.ServiceMapNode{ - Id: 2, - Name: TCPEntryB.Name, - Entry: TCPEntryB, - Count: 1, + Id: 2, + Name: TCPEntryB.Name, + Entry: TCPEntryB, + Resolved: true, + Count: 1, } assert.Contains(response.Nodes, aNode) assert.Contains(response.Nodes, bNode) diff --git a/agent/pkg/servicemap/models.go b/agent/pkg/servicemap/models.go index 9550c70d9..ba0639b3b 100644 --- a/agent/pkg/servicemap/models.go +++ b/agent/pkg/servicemap/models.go @@ -18,10 +18,11 @@ type ServiceMapResponse struct { } type ServiceMapNode struct { - Id int `json:"id"` - Name string `json:"name"` - Entry *tapApi.TCP `json:"entry"` - Count int `json:"count"` + Id int `json:"id"` + Name string `json:"name"` + Entry *tapApi.TCP `json:"entry"` + Count int `json:"count"` + Resolved bool `json:"resolved"` } type ServiceMapEdge struct { diff --git a/agent/pkg/servicemap/servicemap.go b/agent/pkg/servicemap/servicemap.go index 954772d45..c4afa9420 100644 --- a/agent/pkg/servicemap/servicemap.go +++ b/agent/pkg/servicemap/servicemap.go @@ -227,10 +227,11 @@ func (s *defaultServiceMap) GetNodes() []ServiceMapNode { var nodes []ServiceMapNode for i, n := range s.graph.Nodes { nodes = append(nodes, ServiceMapNode{ - Id: n.id, - Name: string(i), - Entry: n.entry, - Count: n.count, + Id: n.id, + Name: string(i), + Resolved: n.entry.Name != UnresolvedNodeName, + Entry: n.entry, + Count: n.count, }) } return nodes @@ -243,16 +244,18 @@ func (s *defaultServiceMap) GetEdges() []ServiceMapEdge { for _, p := range s.graph.Edges[u][v].data { edges = append(edges, ServiceMapEdge{ Source: ServiceMapNode{ - Id: s.graph.Nodes[u].id, - Name: string(u), - Entry: s.graph.Nodes[u].entry, - Count: s.graph.Nodes[u].count, + Id: s.graph.Nodes[u].id, + Name: string(u), + Entry: s.graph.Nodes[u].entry, + Resolved: s.graph.Nodes[u].entry.Name != UnresolvedNodeName, + Count: s.graph.Nodes[u].count, }, Destination: ServiceMapNode{ - Id: s.graph.Nodes[v].id, - Name: string(v), - Entry: s.graph.Nodes[v].entry, - Count: s.graph.Nodes[v].count, + Id: s.graph.Nodes[v].id, + Name: string(v), + Entry: s.graph.Nodes[v].entry, + Resolved: s.graph.Nodes[v].entry.Name != UnresolvedNodeName, + Count: s.graph.Nodes[v].count, }, Count: p.count, Protocol: p.protocol,