diff --git a/probe/kubernetes/pod.go b/probe/kubernetes/pod.go index 09a57f382..8f4fab139 100644 --- a/probe/kubernetes/pod.go +++ b/probe/kubernetes/pod.go @@ -17,6 +17,7 @@ const ( PodContainerIDs = "kubernetes_pod_container_ids" PodState = "kubernetes_pod_state" PodLabelPrefix = "kubernetes_pod_labels_" + PodIP = "kubernetes_pod_ip" ServiceIDs = "kubernetes_service_ids" ) @@ -86,12 +87,13 @@ func (p *pod) NodeName() string { func (p *pod) GetNode(probeID string) report.Node { n := report.MakeNodeWith(report.MakePodNodeID(p.Namespace(), p.Name()), map[string]string{ - PodID: p.ID(), - PodName: p.Name(), - Namespace: p.Namespace(), - PodCreated: p.Created(), - PodContainerIDs: strings.Join(p.ContainerIDs(), " "), - PodState: p.State(), + PodID: p.ID(), + PodName: p.Name(), + Namespace: p.Namespace(), + PodCreated: p.Created(), + PodContainerIDs: strings.Join(p.ContainerIDs(), " "), + PodState: p.State(), + PodIP: p.Status.PodIP, report.ControlProbeID: probeID, }) if len(p.serviceIDs) > 0 { diff --git a/probe/kubernetes/reporter.go b/probe/kubernetes/reporter.go index 7010070e1..0d6849520 100644 --- a/probe/kubernetes/reporter.go +++ b/probe/kubernetes/reporter.go @@ -18,8 +18,9 @@ var ( PodMetadataTemplates = report.MetadataTemplates{ PodID: {ID: PodID, Label: "ID", From: report.FromLatest, Priority: 1}, PodState: {ID: PodState, Label: "State", From: report.FromLatest, Priority: 2}, - Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 3}, - PodCreated: {ID: PodCreated, Label: "Created", From: report.FromLatest, Priority: 4}, + PodIP: {ID: PodIP, Label: "IP", From: report.FromLatest, Priority: 3}, + Namespace: {ID: Namespace, Label: "Namespace", From: report.FromLatest, Priority: 5}, + PodCreated: {ID: PodCreated, Label: "Created", From: report.FromLatest, Priority: 6}, } ServiceMetadataTemplates = report.MetadataTemplates{ diff --git a/render/detailed/node_test.go b/render/detailed/node_test.go index 17b6b7d09..8e2d4e411 100644 --- a/render/detailed/node_test.go +++ b/render/detailed/node_test.go @@ -319,7 +319,7 @@ func TestMakeDetailedPodNode(t *testing.T) { Metadata: []report.MetadataRow{ {ID: "kubernetes_pod_id", Label: "ID", Value: "ping/pong-b", Priority: 1}, {ID: "kubernetes_pod_state", Label: "State", Value: "running", Priority: 2}, - {ID: "kubernetes_namespace", Label: "Namespace", Value: "ping", Priority: 3}, + {ID: "kubernetes_namespace", Label: "Namespace", Value: "ping", Priority: 5}, }, }, Controls: []detailed.ControlInstance{},