From 320b9e240f08f264f5f16d5a0c6d5e2a024d3193 Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Thu, 2 Nov 2017 12:55:08 +0100 Subject: [PATCH] Abstracted the report data types. --- probe/awsecs/reporter.go | 8 ++--- probe/docker/reporter.go | 6 ++-- probe/host/reporter.go | 2 +- probe/kubernetes/reporter.go | 52 ++++++++++++++++----------------- probe/process/reporter.go | 6 ++-- render/detailed/connections.go | 8 ++--- render/detailed/node.go | 16 +++++----- render/detailed/node_test.go | 32 ++++++++++---------- render/detailed/summary_test.go | 4 +-- report/datatypes.go | 15 ++++++++++ 10 files changed, 82 insertions(+), 67 deletions(-) create mode 100644 report/datatypes.go diff --git a/probe/awsecs/reporter.go b/probe/awsecs/reporter.go index a3629c56d..5c3ee9c83 100644 --- a/probe/awsecs/reporter.go +++ b/probe/awsecs/reporter.go @@ -25,14 +25,14 @@ const ( var ( taskMetadata = report.MetadataTemplates{ Cluster: {ID: Cluster, Label: "Cluster", From: report.FromLatest, Priority: 0}, - CreatedAt: {ID: CreatedAt, Label: "Created At", From: report.FromLatest, Priority: 1, Datatype: "datetime"}, + CreatedAt: {ID: CreatedAt, Label: "Created At", From: report.FromLatest, Priority: 1, Datatype: report.DateTime}, TaskFamily: {ID: TaskFamily, Label: "Family", From: report.FromLatest, Priority: 2}, } serviceMetadata = report.MetadataTemplates{ Cluster: {ID: Cluster, Label: "Cluster", From: report.FromLatest, Priority: 0}, - CreatedAt: {ID: CreatedAt, Label: "Created At", From: report.FromLatest, Priority: 1, Datatype: "datetime"}, - ServiceDesiredCount: {ID: ServiceDesiredCount, Label: "Desired Tasks", From: report.FromLatest, Priority: 2, Datatype: "number"}, - ServiceRunningCount: {ID: ServiceRunningCount, Label: "Running Tasks", From: report.FromLatest, Priority: 3, Datatype: "number"}, + CreatedAt: {ID: CreatedAt, Label: "Created At", From: report.FromLatest, Priority: 1, Datatype: report.DateTime}, + ServiceDesiredCount: {ID: ServiceDesiredCount, Label: "Desired Tasks", From: report.FromLatest, Priority: 2, Datatype: report.Number}, + ServiceRunningCount: {ID: ServiceRunningCount, Label: "Running Tasks", From: report.FromLatest, Priority: 3, Datatype: report.Number}, } ) diff --git a/probe/docker/reporter.go b/probe/docker/reporter.go index 02068f9c7..079c9a53d 100644 --- a/probe/docker/reporter.go +++ b/probe/docker/reporter.go @@ -32,12 +32,12 @@ var ( ImageName: {ID: ImageName, Label: "Image", From: report.FromLatest, Priority: 1}, ContainerCommand: {ID: ContainerCommand, Label: "Command", From: report.FromLatest, Priority: 2}, ContainerStateHuman: {ID: ContainerStateHuman, Label: "State", From: report.FromLatest, Priority: 3}, - ContainerUptime: {ID: ContainerUptime, Label: "Uptime", From: report.FromLatest, Priority: 4, Datatype: "duration"}, + ContainerUptime: {ID: ContainerUptime, Label: "Uptime", From: report.FromLatest, Priority: 4, Datatype: report.Duration}, ContainerRestartCount: {ID: ContainerRestartCount, Label: "Restart #", From: report.FromLatest, Priority: 5}, ContainerNetworks: {ID: ContainerNetworks, Label: "Networks", From: report.FromSets, Priority: 6}, ContainerIPs: {ID: ContainerIPs, Label: "IPs", From: report.FromSets, Priority: 7}, ContainerPorts: {ID: ContainerPorts, Label: "Ports", From: report.FromSets, Priority: 8}, - ContainerCreated: {ID: ContainerCreated, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 9}, + ContainerCreated: {ID: ContainerCreated, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 9}, ContainerID: {ID: ContainerID, Label: "ID", From: report.FromLatest, Truncate: 12, Priority: 10}, } @@ -47,7 +47,7 @@ var ( } ContainerImageMetadataTemplates = report.MetadataTemplates{ - report.Container: {ID: report.Container, Label: "# Containers", From: report.FromCounters, Datatype: "number", Priority: 2}, + report.Container: {ID: report.Container, Label: "# Containers", From: report.FromCounters, Datatype: report.Number, Priority: 2}, } ContainerTableTemplates = report.TableTemplates{ diff --git a/probe/host/reporter.go b/probe/host/reporter.go index a07a12e76..c0a71c210 100644 --- a/probe/host/reporter.go +++ b/probe/host/reporter.go @@ -38,7 +38,7 @@ const ( var ( MetadataTemplates = report.MetadataTemplates{ KernelVersion: {ID: KernelVersion, Label: "Kernel Version", From: report.FromLatest, Priority: 1}, - Uptime: {ID: Uptime, Label: "Uptime", From: report.FromLatest, Priority: 2, Datatype: "duration"}, + Uptime: {ID: Uptime, Label: "Uptime", From: report.FromLatest, Priority: 2, Datatype: report.Duration}, HostName: {ID: HostName, Label: "Hostname", From: report.FromLatest, Priority: 11}, OS: {ID: OS, Label: "OS", From: report.FromLatest, Priority: 12}, LocalNetworks: {ID: LocalNetworks, Label: "Local Networks", From: report.FromSets, Priority: 13}, diff --git a/probe/kubernetes/reporter.go b/probe/kubernetes/reporter.go index bda02378d..fdb656dde 100644 --- a/probe/kubernetes/reporter.go +++ b/probe/kubernetes/reporter.go @@ -29,10 +29,10 @@ const ( var ( PodMetadataTemplates = report.MetadataTemplates{ State: {ID: State, Label: "State", From: report.FromLatest, Priority: 2}, - IP: {ID: IP, Label: "IP", From: report.FromLatest, Datatype: "ip", Priority: 3}, - report.Container: {ID: report.Container, Label: "# Containers", From: report.FromCounters, Datatype: "number", Priority: 4}, + IP: {ID: IP, Label: "IP", From: report.FromLatest, Datatype: report.IP, Priority: 3}, + report.Container: {ID: report.Container, Label: "# Containers", From: report.FromCounters, Datatype: report.Number, Priority: 4}, Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 5}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 6}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 6}, RestartCount: {ID: RestartCount, Label: "Restart #", From: report.FromLatest, Priority: 7}, } @@ -40,10 +40,10 @@ var ( ServiceMetadataTemplates = report.MetadataTemplates{ Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 3}, - PublicIP: {ID: PublicIP, Label: "Public IP", From: report.FromLatest, Datatype: "ip", Priority: 4}, - IP: {ID: IP, Label: "Internal IP", From: report.FromLatest, Datatype: "ip", Priority: 5}, - report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 6}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 3}, + PublicIP: {ID: PublicIP, Label: "Public IP", From: report.FromLatest, Datatype: report.IP, Priority: 4}, + IP: {ID: IP, Label: "Internal IP", From: report.FromLatest, Datatype: report.IP, Priority: 5}, + report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: report.Number, Priority: 6}, } ServiceMetricTemplates = PodMetricTemplates @@ -51,10 +51,10 @@ var ( DeploymentMetadataTemplates = report.MetadataTemplates{ NodeType: {ID: NodeType, Label: "Type", From: report.FromLatest, Priority: 1}, Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 3}, - ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Datatype: "number", Priority: 4}, - DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: "number", Priority: 5}, - report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 6}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 3}, + ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Datatype: report.Number, Priority: 4}, + DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: report.Number, Priority: 5}, + report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: report.Number, Priority: 6}, Strategy: {ID: Strategy, Label: "Strategy", From: report.FromLatest, Priority: 7}, } @@ -62,10 +62,10 @@ var ( ReplicaSetMetadataTemplates = report.MetadataTemplates{ Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 3}, - ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Datatype: "number", Priority: 4}, - DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: "number", Priority: 5}, - report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 6}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 3}, + ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Datatype: report.Number, Priority: 4}, + DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: report.Number, Priority: 5}, + report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: report.Number, Priority: 6}, } ReplicaSetMetricTemplates = PodMetricTemplates @@ -73,9 +73,9 @@ var ( DaemonSetMetadataTemplates = report.MetadataTemplates{ NodeType: {ID: NodeType, Label: "Type", From: report.FromLatest, Priority: 1}, Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 3}, - DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: "number", Priority: 4}, - report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 5}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 3}, + DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: report.Number, Priority: 4}, + report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: report.Number, Priority: 5}, } DaemonSetMetricTemplates = PodMetricTemplates @@ -83,10 +83,10 @@ var ( StatefulSetMetadataTemplates = report.MetadataTemplates{ NodeType: {ID: NodeType, Label: "Type", From: report.FromLatest, Priority: 1}, Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 3}, - ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Datatype: "number", Priority: 4}, - DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: "number", Priority: 5}, - report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 6}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 3}, + ObservedGeneration: {ID: ObservedGeneration, Label: "Observed Gen.", From: report.FromLatest, Datatype: report.Number, Priority: 4}, + DesiredReplicas: {ID: DesiredReplicas, Label: "Desired Replicas", From: report.FromLatest, Datatype: report.Number, Priority: 5}, + report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: report.Number, Priority: 6}, } StatefulSetMetricTemplates = PodMetricTemplates @@ -94,12 +94,12 @@ var ( CronJobMetadataTemplates = report.MetadataTemplates{ NodeType: {ID: NodeType, Label: "Type", From: report.FromLatest, Priority: 1}, Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 2}, - Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: "datetime", Priority: 3}, + Created: {ID: Created, Label: "Created", From: report.FromLatest, Datatype: report.DateTime, Priority: 3}, Schedule: {ID: Schedule, Label: "Schedule", From: report.FromLatest, Priority: 4}, - LastScheduled: {ID: LastScheduled, Label: "Last Scheduled", From: report.FromLatest, Datatype: "datetime", Priority: 5}, + LastScheduled: {ID: LastScheduled, Label: "Last Scheduled", From: report.FromLatest, Datatype: report.DateTime, Priority: 5}, Suspended: {ID: Suspended, Label: "Suspended", From: report.FromLatest, Priority: 6}, - ActiveJobs: {ID: ActiveJobs, Label: "# Jobs", From: report.FromLatest, Datatype: "number", Priority: 7}, - report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: "number", Priority: 8}, + ActiveJobs: {ID: ActiveJobs, Label: "# Jobs", From: report.FromLatest, Datatype: report.Number, Priority: 7}, + report.Pod: {ID: report.Pod, Label: "# Pods", From: report.FromCounters, Datatype: report.Number, Priority: 8}, } CronJobMetricTemplates = PodMetricTemplates diff --git a/probe/process/reporter.go b/probe/process/reporter.go index a84267a86..0f6f88ef5 100644 --- a/probe/process/reporter.go +++ b/probe/process/reporter.go @@ -23,10 +23,10 @@ const ( // Exposed for testing var ( MetadataTemplates = report.MetadataTemplates{ - PID: {ID: PID, Label: "PID", From: report.FromLatest, Datatype: "number", Priority: 1}, + PID: {ID: PID, Label: "PID", From: report.FromLatest, Datatype: report.Number, Priority: 1}, Cmdline: {ID: Cmdline, Label: "Command", From: report.FromLatest, Priority: 2}, - PPID: {ID: PPID, Label: "Parent PID", From: report.FromLatest, Datatype: "number", Priority: 3}, - Threads: {ID: Threads, Label: "# Threads", From: report.FromLatest, Datatype: "number", Priority: 4}, + PPID: {ID: PPID, Label: "Parent PID", From: report.FromLatest, Datatype: report.Number, Priority: 3}, + Threads: {ID: Threads, Label: "# Threads", From: report.FromLatest, Datatype: report.Number, Priority: 4}, } MetricTemplates = report.MetricTemplates{ diff --git a/render/detailed/connections.go b/render/detailed/connections.go index 05afcd5f4..672b73c69 100644 --- a/render/detailed/connections.go +++ b/render/detailed/connections.go @@ -22,13 +22,13 @@ const ( // Exported for testing var ( NormalColumns = []Column{ - {ID: portKey, Label: portLabel, Datatype: "number"}, - {ID: countKey, Label: countLabel, Datatype: "number", DefaultSort: true}, + {ID: portKey, Label: portLabel, Datatype: report.Number}, + {ID: countKey, Label: countLabel, Datatype: report.Number, DefaultSort: true}, } InternetColumns = []Column{ {ID: remoteKey, Label: remoteLabel}, - {ID: portKey, Label: portLabel, Datatype: "number"}, - {ID: countKey, Label: countLabel, Datatype: "number", DefaultSort: true}, + {ID: portKey, Label: portLabel, Datatype: report.Number}, + {ID: countKey, Label: countLabel, Datatype: report.Number, DefaultSort: true}, } ) diff --git a/render/detailed/node.go b/render/detailed/node.go index 59e6b0012..f18a9752c 100644 --- a/render/detailed/node.go +++ b/render/detailed/node.go @@ -137,8 +137,8 @@ var nodeSummaryGroupSpecs = []struct { Label: "Pods", Columns: []Column{ {ID: kubernetes.State, Label: "State"}, - {ID: report.Container, Label: "# Containers", Datatype: "number"}, - {ID: kubernetes.IP, Label: "IP", Datatype: "ip"}, + {ID: report.Container, Label: "# Containers", Datatype: report.Number}, + {ID: kubernetes.IP, Label: "IP", Datatype: report.IP}, }, }, }, @@ -147,7 +147,7 @@ var nodeSummaryGroupSpecs = []struct { NodeSummaryGroup: NodeSummaryGroup{ Label: "Tasks", Columns: []Column{ - {ID: awsecs.CreatedAt, Label: "Created At", Datatype: "datetime"}, + {ID: awsecs.CreatedAt, Label: "Created At", Datatype: report.DateTime}, }, }, }, @@ -156,8 +156,8 @@ var nodeSummaryGroupSpecs = []struct { NodeSummaryGroup: NodeSummaryGroup{ Label: "Containers", Columns: []Column{ - {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"}, - {ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: report.Number}, + {ID: docker.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, }, }, @@ -166,9 +166,9 @@ var nodeSummaryGroupSpecs = []struct { NodeSummaryGroup: NodeSummaryGroup{ Label: "Processes", Columns: []Column{ - {ID: process.PID, Label: "PID", Datatype: "number"}, - {ID: process.CPUUsage, Label: "CPU", Datatype: "number"}, - {ID: process.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: process.PID, Label: "PID", Datatype: report.Number}, + {ID: process.CPUUsage, Label: "CPU", Datatype: report.Number}, + {ID: process.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, }, }, diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index 19fca09b6..785bfb43f 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -105,8 +105,8 @@ func TestMakeDetailedHostNode(t *testing.T) { TopologyID: "pods", Columns: []detailed.Column{ {ID: kubernetes.State, Label: "State"}, - {ID: report.Container, Label: "# Containers", Datatype: "number"}, - {ID: kubernetes.IP, Label: "IP", Datatype: "ip"}, + {ID: report.Container, Label: "# Containers", Datatype: report.Number}, + {ID: kubernetes.IP, Label: "IP", Datatype: report.IP}, }, Nodes: []detailed.NodeSummary{podNodeSummary}, }, @@ -114,8 +114,8 @@ func TestMakeDetailedHostNode(t *testing.T) { Label: "Containers", TopologyID: "containers", Columns: []detailed.Column{ - {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"}, - {ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: report.Number}, + {ID: docker.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, Nodes: []detailed.NodeSummary{containerNodeSummary}, }, @@ -123,9 +123,9 @@ func TestMakeDetailedHostNode(t *testing.T) { Label: "Processes", TopologyID: "processes", Columns: []detailed.Column{ - {ID: process.PID, Label: "PID", Datatype: "number"}, - {ID: process.CPUUsage, Label: "CPU", Datatype: "number"}, - {ID: process.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: process.PID, Label: "PID", Datatype: report.Number}, + {ID: process.CPUUsage, Label: "CPU", Datatype: report.Number}, + {ID: process.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, Nodes: []detailed.NodeSummary{process1NodeSummary, process2NodeSummary}, }, @@ -243,9 +243,9 @@ func TestMakeDetailedContainerNode(t *testing.T) { Label: "Processes", TopologyID: "processes", Columns: []detailed.Column{ - {ID: process.PID, Label: "PID", Datatype: "number"}, - {ID: process.CPUUsage, Label: "CPU", Datatype: "number"}, - {ID: process.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: process.PID, Label: "PID", Datatype: report.Number}, + {ID: process.CPUUsage, Label: "CPU", Datatype: report.Number}, + {ID: process.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, Nodes: []detailed.NodeSummary{serverProcessNodeSummary}, }, @@ -329,7 +329,7 @@ func TestMakeDetailedPodNode(t *testing.T) { Pseudo: false, Metadata: []report.MetadataRow{ {ID: "kubernetes_state", Label: "State", Value: "running", Priority: 2}, - {ID: "container", Label: "# Containers", Value: "1", Priority: 4, Datatype: "number"}, + {ID: "container", Label: "# Containers", Value: "1", Priority: 4, Datatype: report.Number}, {ID: "kubernetes_namespace", Label: "Namespace", Value: "ping", Priority: 5}, }, Parents: []detailed.Parent{ @@ -351,8 +351,8 @@ func TestMakeDetailedPodNode(t *testing.T) { Label: "Containers", TopologyID: "containers", Columns: []detailed.Column{ - {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: "number"}, - {ID: docker.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: docker.CPUTotalUsage, Label: "CPU", Datatype: report.Number}, + {ID: docker.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, Nodes: []detailed.NodeSummary{containerNodeSummary}, }, @@ -360,9 +360,9 @@ func TestMakeDetailedPodNode(t *testing.T) { Label: "Processes", TopologyID: "processes", Columns: []detailed.Column{ - {ID: process.PID, Label: "PID", Datatype: "number"}, - {ID: process.CPUUsage, Label: "CPU", Datatype: "number"}, - {ID: process.MemoryUsage, Label: "Memory", Datatype: "number"}, + {ID: process.PID, Label: "PID", Datatype: report.Number}, + {ID: process.CPUUsage, Label: "CPU", Datatype: report.Number}, + {ID: process.MemoryUsage, Label: "Memory", Datatype: report.Number}, }, Nodes: []detailed.NodeSummary{serverProcessNodeSummary}, }, diff --git a/render/detailed/summary_test.go b/render/detailed/summary_test.go index 1065a7ee3..5d7abd62c 100644 --- a/render/detailed/summary_test.go +++ b/render/detailed/summary_test.go @@ -110,7 +110,7 @@ func TestMakeNodeSummary(t *testing.T) { Rank: fixture.Client1Name, Shape: "square", Metadata: []report.MetadataRow{ - {ID: process.PID, Label: "PID", Value: fixture.Client1PID, Priority: 1, Datatype: "number"}, + {ID: process.PID, Label: "PID", Value: fixture.Client1PID, Priority: 1, Datatype: report.Number}, }, Adjacency: report.MakeIDList(fixture.ServerProcessNodeID), }, @@ -146,7 +146,7 @@ func TestMakeNodeSummary(t *testing.T) { Linkable: true, Stack: true, Metadata: []report.MetadataRow{ - {ID: report.Container, Label: "# Containers", Value: "1", Priority: 2, Datatype: "number"}, + {ID: report.Container, Label: "# Containers", Value: "1", Priority: 2, Datatype: report.Number}, }, Adjacency: report.MakeIDList(expected.ServerContainerImageNodeID), }, diff --git a/report/datatypes.go b/report/datatypes.go new file mode 100644 index 000000000..71a0b8798 --- /dev/null +++ b/report/datatypes.go @@ -0,0 +1,15 @@ +package report + +const ( + // ISO timestamp of the format "2017-07-03T09:45:00.329067309Z" + DateTime = "datetime" + + // Duration specified in seconds, e.g. "3600" means one hour + Duration = "duration" + + // String in the IP format "182.43.147.201" + IP = "ip" + + // Integer or a floating point number + Number = "number" +)