From bd3ececb1110d163c750239fe650a513f942b606 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 18 Oct 2016 15:24:37 +0000 Subject: [PATCH 1/3] Increase timestamp precision --- probe/docker/container.go | 2 +- probe/kubernetes/meta.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/probe/docker/container.go b/probe/docker/container.go index a373d5b16..ca11c3883 100644 --- a/probe/docker/container.go +++ b/probe/docker/container.go @@ -372,7 +372,7 @@ func (c *container) env() map[string]string { func (c *container) getBaseNode() report.Node { result := report.MakeNodeWith(report.MakeContainerNodeID(c.ID()), map[string]string{ ContainerID: c.ID(), - ContainerCreated: c.container.Created.Format(time.RFC822), + ContainerCreated: c.container.Created.Format(time.RFC3339Nano), ContainerCommand: c.container.Path + " " + strings.Join(c.container.Args, " "), ImageID: c.Image(), ContainerHostname: c.Hostname(), diff --git a/probe/kubernetes/meta.go b/probe/kubernetes/meta.go index 4f56f39e1..d8109867e 100644 --- a/probe/kubernetes/meta.go +++ b/probe/kubernetes/meta.go @@ -43,7 +43,7 @@ func (m meta) Namespace() string { } func (m meta) Created() string { - return m.ObjectMeta.CreationTimestamp.Format(time.RFC822) + return m.ObjectMeta.CreationTimestamp.Format(time.RFC3339Nano) } func (m meta) Labels() map[string]string { From 43f4da0ecc2d7190fc01dc6ea02f413db97cd06a Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 18 Oct 2016 17:06:54 +0000 Subject: [PATCH 2/3] Fix tests --- probe/docker/container_test.go | 2 +- probe/kubernetes/reporter_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/probe/docker/container_test.go b/probe/docker/container_test.go index 6d5428755..7a15f7822 100644 --- a/probe/docker/container_test.go +++ b/probe/docker/container_test.go @@ -70,7 +70,7 @@ func TestContainer(t *testing.T) { } want := report.MakeNodeWith("ping;", map[string]string{ "docker_container_command": " ", - "docker_container_created": "01 Jan 01 00:00 UTC", + "docker_container_created": "0001-01-01T00:00:00Z", "docker_container_id": "ping", "docker_container_name": "pong", "docker_image_id": "baz", diff --git a/probe/kubernetes/reporter_test.go b/probe/kubernetes/reporter_test.go index ad4d5c8b0..8d5117616 100644 --- a/probe/kubernetes/reporter_test.go +++ b/probe/kubernetes/reporter_test.go @@ -202,7 +202,7 @@ func TestReporter(t *testing.T) { {pod2ID, serviceID, map[string]string{ kubernetes.Name: "pong-b", kubernetes.Namespace: "ping", - kubernetes.Created: pod1.Created(), + kubernetes.Created: pod2.Created(), }}, } { node, ok := rpt.Pod.Nodes[pod.id] @@ -231,7 +231,7 @@ func TestReporter(t *testing.T) { for k, want := range map[string]string{ kubernetes.Name: "pongservice", kubernetes.Namespace: "ping", - kubernetes.Created: pod1.Created(), + kubernetes.Created: service1.Created(), } { if have, ok := node.Latest.Lookup(k); !ok || have != want { t.Errorf("Expected service %s latest %q: %q, got %q", serviceID, k, want, have) From a0f1b25a0b44b273bf0622146803cc28fff908dd Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Thu, 20 Oct 2016 13:17:34 +0200 Subject: [PATCH 3/3] Give datetime more space in the table --- .../app/scripts/components/node-details/node-details-table.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f07d45a7..0b1f4094a 100644 --- a/client/app/scripts/components/node-details/node-details-table.js +++ b/client/app/scripts/components/node-details/node-details-table.js @@ -30,7 +30,7 @@ const XS_LABEL = { const COLUMN_WIDTHS = { count: CW.XS, container: CW.XS, - docker_container_created: CW.XL, + docker_container_created: CW.XXL, docker_container_restart_count: CW.M, docker_container_state_human: CW.XXL, docker_container_uptime: '85px',