github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-19 04:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1912 from weaveworks/1844-visually-duplicate-rows

Browse Source 
Add label_minor to tooltips in connections table
This commit is contained in:
Simon
2016-10-19 15:03:38 +02:00
committed by GitHub
parent 3829784967 2ca23507de
commit f6e81cf4d6
9 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render/detailed/connections.go
+12 -9
View File
@@ -43,11 +43,12 @@ type ConnectionsSummary struct {
// Connection is a row in the connections table.
type Connection struct {
ID string `json:"id"` // ID of this element in the UI. Must be unique for a given ConnectionsSummary.
NodeID string `json:"nodeId"` // ID of a node in the topology. Optional, must be set if linkable is true.
Label string `json:"label"`
Linkable bool `json:"linkable"`
Metadata []report.MetadataRow `json:"metadata,omitempty"`
ID string `json:"id"` // ID of this element in the UI. Must be unique for a given ConnectionsSummary.
NodeID string `json:"nodeId"` // ID of a node in the topology. Optional, must be set if linkable is true.
Label string `json:"label"`
LabelMinor string `json:"labelMinor,omitempty"`
Linkable bool `json:"linkable"`
Metadata []report.MetadataRow `json:"metadata,omitempty"`
}
type connectionsByID []Connection
@@ -128,13 +129,15 @@ func (c *connectionCounters) rows(r report.Report, ns report.Nodes, includeLocal
// MakeNodeID(ns[row.remoteNodeID]). As we don't need the whole summary.
summary, _ := MakeNodeSummary(r, ns[row.remoteNodeID])
connection := Connection{
ID: fmt.Sprintf("%s-%s-%s-%s", row.remoteNodeID, row.remoteAddr, row.localAddr, row.port),
NodeID: summary.ID,
Label: summary.Label,
Linkable: true,
ID: fmt.Sprintf("%s-%s-%s-%s", row.remoteNodeID, row.remoteAddr, row.localAddr, row.port),
NodeID: summary.ID,
Label: summary.Label,
LabelMinor: summary.LabelMinor,
Linkable: true,
}
if row.remoteAddr != "" {
connection.Label = row.remoteAddr
connection.LabelMinor = ""
}
if includeLocal {
connection.Metadata = append(connection.Metadata,
render/detailed/node_test.go
+15 -12
View File
@@ -153,10 +153,11 @@ func TestMakeDetailedHostNode(t *testing.T) {
Columns: detailed.NormalColumns,
Connections: []detailed.Connection{
{
ID: connectionID(fixture.ServerHostNodeID, ""),
NodeID: fixture.ServerHostNodeID,
Label: "server",
Linkable: true,
ID: connectionID(fixture.ServerHostNodeID, ""),
NodeID: fixture.ServerHostNodeID,
Label: "server",
LabelMinor: "hostname.com",
Linkable: true,
Metadata: []report.MetadataRow{
{
ID: "port",
@@ -259,10 +260,11 @@ func TestMakeDetailedContainerNode(t *testing.T) {
Columns: detailed.NormalColumns,
Connections: []detailed.Connection{
{
ID: connectionID(fixture.ClientContainerNodeID, ""),
NodeID: fixture.ClientContainerNodeID,
Label: "client",
Linkable: true,
ID: connectionID(fixture.ClientContainerNodeID, ""),
NodeID: fixture.ClientContainerNodeID,
Label: "client",
LabelMinor: "client.hostname.com",
Linkable: true,
Metadata: []report.MetadataRow{
{
ID: "port",
@@ -375,10 +377,11 @@ func TestMakeDetailedPodNode(t *testing.T) {
Columns: detailed.NormalColumns,
Connections: []detailed.Connection{
{
ID: connectionID(fixture.ClientPodNodeID, ""),
NodeID: fixture.ClientPodNodeID,
Label: "pong-a",
Linkable: true,
ID: connectionID(fixture.ClientPodNodeID, ""),
NodeID: fixture.ClientPodNodeID,
Label: "pong-a",
LabelMinor: "1 container",
Linkable: true,
Metadata: []report.MetadataRow{
{
ID: "port",
render/detailed/summary.go
+1 -1
View File
@@ -45,7 +45,7 @@ type Column struct {
type NodeSummary struct {
ID string `json:"id"`
Label string `json:"label"`
LabelMinor string `json:"label_minor"`
LabelMinor string `json:"labelMinor"`
Rank string `json:"rank"`
Shape string `json:"shape,omitempty"`
Stack bool `json:"stack,omitempty"`