From 154c996d086559a58d049706d4cbe70b3cc75acb Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Tue, 2 Feb 2016 16:19:40 +0000 Subject: [PATCH] couple labels were added while waiting to merge --- render/detailed/labels.go | 64 ++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/render/detailed/labels.go b/render/detailed/labels.go index af4ac20c0..28afb9228 100644 --- a/render/detailed/labels.go +++ b/render/detailed/labels.go @@ -12,37 +12,39 @@ import ( ) var labels = map[string]string{ - docker.CPUTotalUsage: "CPU", - docker.ContainerCommand: "Command", - docker.ContainerCreated: "Created", - docker.ContainerHostname: "Hostname", - docker.ContainerID: "ID", - docker.ContainerIPs: "IPs", - docker.ContainerPorts: "Ports", - docker.ContainerState: "State", - docker.ImageID: "Image ID", - docker.MemoryUsage: "Memory", - host.CPUUsage: "CPU", - host.HostName: "Hostname", - host.KernelVersion: "Kernel version", - host.Load15: "Load (15m)", - host.Load1: "Load (1m)", - host.Load5: "Load (5m)", - host.LocalNetworks: "Local Networks", - host.MemoryUsage: "Memory", - host.OS: "Operating system", - host.Uptime: "Uptime", - kubernetes.Namespace: "Namespace", - kubernetes.PodCreated: "Created", - kubernetes.PodID: "ID", - overlay.WeaveDNSHostname: "Weave DNS Hostname", - overlay.WeaveMACAddress: "Weave MAC", - process.CPUUsage: "CPU", - process.Cmdline: "Command", - process.MemoryUsage: "Memory", - process.PID: "PID", - process.PPID: "Parent PID", - process.Threads: "# Threads", + docker.CPUTotalUsage: "CPU", + docker.ContainerCommand: "Command", + docker.ContainerCreated: "Created", + docker.ContainerHostname: "Hostname", + docker.ContainerID: "ID", + docker.ContainerIPs: "IPs", + docker.ContainerPorts: "Ports", + docker.ContainerRestartCount: "Restart #", + docker.ContainerState: "State", + docker.ContainerUptime: "Uptime", + docker.ImageID: "Image ID", + docker.MemoryUsage: "Memory", + host.CPUUsage: "CPU", + host.HostName: "Hostname", + host.KernelVersion: "Kernel version", + host.Load15: "Load (15m)", + host.Load1: "Load (1m)", + host.Load5: "Load (5m)", + host.LocalNetworks: "Local Networks", + host.MemoryUsage: "Memory", + host.OS: "Operating system", + host.Uptime: "Uptime", + kubernetes.Namespace: "Namespace", + kubernetes.PodCreated: "Created", + kubernetes.PodID: "ID", + overlay.WeaveDNSHostname: "Weave DNS Hostname", + overlay.WeaveMACAddress: "Weave MAC", + process.CPUUsage: "CPU", + process.Cmdline: "Command", + process.MemoryUsage: "Memory", + process.PID: "PID", + process.PPID: "Parent PID", + process.Threads: "# Threads", } // Label maps from the internal keys to the human-readable label for a piece