Merge pull request #1657 from gravitl/bugfix_v0.16.2_client_metrics

adjusted check for clients on non servers

logic/metrics.go

@@ -83,6 +83,7 @@ func CollectServerMetrics(serverID string, networkNodes []models.Node) *models.M
 									TotalReceived: peers[j].ReceiveBytes,
 									TotalSent:     peers[j].TransmitBytes,
 									Connected:     true,
+									Latency:       -1, // can not determine latency on server currently
 								}
 							} else {
 								newServerMetrics.Connectivity[clients[i].ClientID] = models.Metric{

mq/handlers.go

@@ -242,7 +242,8 @@ func updateNodeMetrics(currentNode *models.Node, newMetrics *models.Metrics) boo
 		// associate ext clients with IDs
 		for i := range attachedClients {
 			extMetric := newMetrics.Connectivity[attachedClients[i].PublicKey]
-			if len(extMetric.NodeName) == 0 { // cover server clients
+			if len(extMetric.NodeName) == 0 &&
+				len(newMetrics.Connectivity[attachedClients[i].ClientID].NodeName) > 0 { // cover server clients
 				extMetric = newMetrics.Connectivity[attachedClients[i].ClientID]
 				if extMetric.TotalReceived > 0 && extMetric.TotalSent > 0 {
 					extMetric.Connected = true