Add pod.ip in k8s metadata (#25037) (#25062)

elastic · Apr 15, 2021 · d087086 · d087086
1 parent 2f7734e
commit d087086
Show file tree

Hide file tree

Showing 24 changed files with 163 additions and 10 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -364,6 +364,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add `wineventlog` schema to `decode_xml` processor. {issue}23910[23910] {pull}24726[24726]
 - Add new ECS 1.9 field `cloud.service.name` to `add_cloud_metadata` processor. {pull}24993[24993]
 - Libbeat: report queue capacity, output batch size, and output client count to monitoring. {pull}24700[24700]
+- Add kubernetes.pod.ip field in kubernetes metadata. {pull}25037[25037]
 
 *Auditbeat*
 

diff --git a/auditbeat/docs/fields.asciidoc b/auditbeat/docs/fields.asciidoc
@@ -12395,6 +12395,16 @@ type: keyword
 
 --
 
+*`kubernetes.pod.ip`*::
++
+--
+Kubernetes Pod IP
+
+
+type: ip
+
+--
+
 *`kubernetes.namespace`*::
 +
 --

diff --git a/auditbeat/include/fields.go b/auditbeat/include/fields.go
diff --git a/filebeat/docs/fields.asciidoc b/filebeat/docs/fields.asciidoc
@@ -87074,6 +87074,16 @@ type: keyword
 
 --
 
+*`kubernetes.pod.ip`*::
++
+--
+Kubernetes Pod IP
+
+
+type: ip
+
+--
+
 *`kubernetes.namespace`*::
 +
 --

diff --git a/filebeat/include/fields.go b/filebeat/include/fields.go
diff --git a/heartbeat/docs/fields.asciidoc b/heartbeat/docs/fields.asciidoc
@@ -9977,6 +9977,16 @@ type: keyword
 
 --
 
+*`kubernetes.pod.ip`*::
++
+--
+Kubernetes Pod IP
+
+
+type: ip
+
+--
+
 *`kubernetes.namespace`*::
 +
 --

diff --git a/heartbeat/include/fields.go b/heartbeat/include/fields.go
diff --git a/journalbeat/docs/fields.asciidoc b/journalbeat/docs/fields.asciidoc
@@ -10322,6 +10322,16 @@ type: keyword
 
 --
 
+*`kubernetes.pod.ip`*::
++
+--
+Kubernetes Pod IP
+
+
+type: ip
+
+--
+
 *`kubernetes.namespace`*::
 +
 --

diff --git a/journalbeat/include/fields.go b/journalbeat/include/fields.go
diff --git a/libbeat/autodiscover/providers/kubernetes/pod_test.go b/libbeat/autodiscover/providers/kubernetes/pod_test.go
@@ -400,6 +400,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -413,6 +414,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -436,6 +438,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -449,6 +452,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -523,6 +527,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -536,6 +541,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -559,6 +565,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -572,6 +579,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -602,6 +610,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -615,6 +624,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -841,6 +851,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -854,6 +865,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -877,6 +889,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -890,6 +903,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -947,6 +961,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -960,6 +975,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -983,6 +999,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -996,6 +1013,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -1057,6 +1075,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1070,6 +1089,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -1093,6 +1113,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1106,6 +1127,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -1169,6 +1191,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1182,6 +1205,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -1205,6 +1229,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1218,6 +1243,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -1312,6 +1338,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1325,6 +1352,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							},
@@ -1349,6 +1377,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1362,6 +1391,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -1393,6 +1423,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1406,6 +1437,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{
@@ -1437,6 +1469,7 @@ func TestEmitEvent(t *testing.T) {
 						"pod": common.MapStr{
 							"name": "filebeat",
 							"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+							"ip":   podIP,
 						},
 						"node": common.MapStr{
 							"name": "node",
@@ -1450,6 +1483,7 @@ func TestEmitEvent(t *testing.T) {
 							"pod": common.MapStr{
 								"name": "filebeat",
 								"uid":  "005f3b90-4b9d-12f8-acf0-31020a840133",
+								"ip":   podIP,
 							}, "node": common.MapStr{
 								"name": "node",
 							}, "container": common.MapStr{

diff --git a/libbeat/common/kubernetes/metadata/pod.go b/libbeat/common/kubernetes/metadata/pod.go
@@ -89,6 +89,11 @@ func (p *pod) Generate(obj kubernetes.Resource, opts ...FieldOptions) common.Map
 			out.DeepUpdate(meta)
 		}
 	}
+
+	if po.Status.PodIP != "" {
+		out.Put("pod.ip", po.Status.PodIP)
+	}
+
 	return out
 }