Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Cherry-pick #13226 to 7.3] Add .* to kubernetes labels and annotations in fields.yml mapping #13283

Merged
merged 3 commits into from
Aug 27, 2019
Merged

[Cherry-pick #13226 to 7.3] Add .* to kubernetes labels and annotations in fields.yml mapping #13283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6df0452
Add `.*` to kubernetes labels and annotations in fields.yml mapping …
kaiyan-sheng Aug 16, 2019
3cc1782
Fix changelog
kaiyan-sheng Aug 17, 2019
75a1e65
Merge branch '7.3' into backport_13226_7.3
kaiyan-sheng Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix `@timestamp` being duplicated in events if `@timestamp` is set in a
processor (or by any code utilizing `PutValue()` on a `beat.Event`).
- Fix install-service.ps1's ability to set Windows service's delay start configuration. {pull}13173[13173]
- Fix `decode_base64_field` processor. {pull}13092[13092], {pull}13144[13144]
- Fix mapping for kubernetes.labels and kubernetes.annotations in add_kubernetes_metadata. {issue}12638[12638] {pull}13226[13226]
- Fix `decode_base64_field` processor. {pull}13092[13092] {pull}13144[13144]

*Auditbeat*

Expand Down
4 changes: 2 additions & 2 deletions auditbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6451,7 +6451,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -6461,7 +6461,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions filebeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7370,7 +7370,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -7380,7 +7380,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion filebeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions heartbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3890,7 +3890,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -3900,7 +3900,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions journalbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4294,7 +4294,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -4304,7 +4304,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion journalbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions libbeat/processors/add_kubernetes_metadata/_meta/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,17 @@
description: >
Kubernetes node name

- name: labels
- name: labels.*
type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes labels map

- name: annotations
- name: annotations.*
type: object
object_type: keyword
object_type_mapping_type: "*"
description: >
Kubernetes annotations map

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13555,7 +13555,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -13565,7 +13565,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/include/fields/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packetbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5866,7 +5866,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -5876,7 +5876,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions winlogbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3784,7 +3784,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -3794,7 +3794,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion winlogbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions x-pack/functionbeat/docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3601,7 +3601,7 @@ type: keyword

--

*`kubernetes.labels`*::
*`kubernetes.labels.*`*::
+
--
Kubernetes labels map
Expand All @@ -3611,7 +3611,7 @@ type: object

--

*`kubernetes.annotations`*::
*`kubernetes.annotations.*`*::
+
--
Kubernetes annotations map
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/include/fields.go
View file
Open in desktop

Large diffs are not rendered by default.