From fc3fc72205ec97cf163cdf59a423244f92a0fc08 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Mon, 19 Sep 2016 15:08:51 +0200 Subject: [PATCH] Fix ip column width in connections table, avoid truncating long ips --- .../node-details/node-details-table.js | 3 ++- render/detailed/connections.go | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/client/app/scripts/components/node-details/node-details-table.js b/client/app/scripts/components/node-details/node-details-table.js index 11bceaf5e..6a5b0aafd 100644 --- a/client/app/scripts/components/node-details/node-details-table.js +++ b/client/app/scripts/components/node-details/node-details-table.js @@ -20,13 +20,14 @@ const CW = { const COLUMN_WIDTHS = { - count: '70px', + count: '60px', docker_container_created: CW.XL, docker_container_restart_count: CW.M, docker_container_state_human: CW.XXL, docker_container_uptime: '85px', docker_cpu_total_usage: CW.M, docker_memory_usage: CW.M, + remote: CW.L, open_files_count: CW.M, pid: CW.M, port: CW.S, diff --git a/render/detailed/connections.go b/render/detailed/connections.go index 2d20615e8..bd38be545 100644 --- a/render/detailed/connections.go +++ b/render/detailed/connections.go @@ -11,11 +11,13 @@ import ( ) const ( - portKey = "port" - portLabel = "Port" - countKey = "count" - countLabel = "Count" - number = "number" + portKey = "port" + portLabel = "Port" + countKey = "count" + countLabel = "Count" + remoteKey = "remote" + remoteLabel = "Remote" + number = "number" ) // Exported for testing @@ -25,7 +27,7 @@ var ( {ID: countKey, Label: countLabel, DefaultSort: true}, } InternetColumns = []Column{ - {ID: "foo", Label: "Remote"}, + {ID: remoteKey, Label: remoteLabel}, {ID: portKey, Label: portLabel}, {ID: countKey, Label: countLabel, DefaultSort: true}, } @@ -140,7 +142,7 @@ func (c *connectionCounters) rows(r report.Report, ns report.Nodes, includeLocal if includeLocal { connection.Metadata = append(connection.Metadata, report.MetadataRow{ - ID: "foo", + ID: remoteKey, Value: row.localAddr, Datatype: number, })