Skip to content

Commit 0501702

Browse files
authored
Add .* to kubernetes labels and annotations in fields.yml mapping (#13226) (#13287)
* Update labels and annotations object field (cherry picked from commit 2e4d292)
1 parent ab4eff5 commit 0501702

File tree

18 files changed

+31
-26
lines changed

18 files changed

+31
-26
lines changed

CHANGELOG.next.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ https://github.com/elastic/beats/compare/v7.1.1...7.1[Check the HEAD diff]
3232

3333
- Fixed a memory leak when using the add_process_metadata processor under Windows. {pull}12100[12100]
3434
- Fixed Beat ID being reported by GET / API. {pull}12180[12180]
35+
- Fix mapping for kubernetes.labels and kubernetes.annotations in add_kubernetes_metadata. {issue}12638[12638] {pull}13226[13226]
3536

3637
*Auditbeat*
3738

auditbeat/docs/fields.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6318,7 +6318,7 @@ Kubernetes node name
63186318
63196319
--
63206320
6321-
*`kubernetes.labels`*::
6321+
*`kubernetes.labels.*`*::
63226322
+
63236323
--
63246324
type: object
@@ -6328,7 +6328,7 @@ Kubernetes labels map
63286328
63296329
--
63306330
6331-
*`kubernetes.annotations`*::
6331+
*`kubernetes.annotations.*`*::
63326332
+
63336333
--
63346334
type: object

auditbeat/include/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

filebeat/docs/fields.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6636,7 +6636,7 @@ Kubernetes node name
66366636
66376637
--
66386638
6639-
*`kubernetes.labels`*::
6639+
*`kubernetes.labels.*`*::
66406640
+
66416641
--
66426642
type: object
@@ -6646,7 +6646,7 @@ Kubernetes labels map
66466646
66476647
--
66486648
6649-
*`kubernetes.annotations`*::
6649+
*`kubernetes.annotations.*`*::
66506650
+
66516651
--
66526652
type: object

filebeat/include/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

heartbeat/docs/fields.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3757,7 +3757,7 @@ Kubernetes node name
37573757
37583758
--
37593759
3760-
*`kubernetes.labels`*::
3760+
*`kubernetes.labels.*`*::
37613761
+
37623762
--
37633763
type: object
@@ -3767,7 +3767,7 @@ Kubernetes labels map
37673767
37683768
--
37693769
3770-
*`kubernetes.annotations`*::
3770+
*`kubernetes.annotations.*`*::
37713771
+
37723772
--
37733773
type: object

heartbeat/include/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

journalbeat/docs/fields.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4161,7 +4161,7 @@ Kubernetes node name
41614161
41624162
--
41634163
4164-
*`kubernetes.labels`*::
4164+
*`kubernetes.labels.*`*::
41654165
+
41664166
--
41674167
type: object
@@ -4171,7 +4171,7 @@ Kubernetes labels map
41714171
41724172
--
41734173
4174-
*`kubernetes.annotations`*::
4174+
*`kubernetes.annotations.*`*::
41754175
+
41764176
--
41774177
type: object

journalbeat/include/fields.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libbeat/processors/add_kubernetes_metadata/_meta/fields.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,17 @@
2828
description: >
2929
Kubernetes node name
3030
31-
- name: labels
31+
- name: labels.*
3232
type: object
33+
object_type: keyword
34+
object_type_mapping_type: "*"
3335
description: >
3436
Kubernetes labels map
3537
36-
- name: annotations
38+
- name: annotations.*
3739
type: object
40+
object_type: keyword
41+
object_type_mapping_type: "*"
3842
description: >
3943
Kubernetes annotations map
4044

0 commit comments

Comments
 (0)