Skip to content

Commit bb36e72

Browse files
MichaelKatsoulisMichaelKatsoulis
authored
Move labels and annotations under kubernetes.namespace. (#27917)
* Move labels and annotations under kubernetes.namespace.
1 parent e6839ab commit bb36e72

File tree

98 files changed

+3651
-2391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+3651
-2391
lines changed

‎CHANGELOG.next.asciidoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
2323
- Remove deprecated/undocumented IncludeCreatorMetadata setting from kubernetes metadata config options {pull}28006[28006]
2424
- Remove deprecated fields from kubernetes module {pull}28046[28046]
2525
- Remove deprecated config option aws_partition. {pull}28120[28120]
26+
- Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917]
2627

2728
*Auditbeat*
2829

‎auditbeat/docs/fields.asciidoc‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17322,16 +17322,47 @@ type: ip
1732217322
1732317323
--
1732417324
17325-
*`kubernetes.namespace`*::
17325+
17326+
*`kubernetes.namespace.name`*::
1732617327
+
1732717328
--
17328-
Kubernetes namespace
17329+
Kubernetes namespace name
1732917330
1733017331
1733117332
type: keyword
1733217333
1733317334
--
1733417335
17336+
*`kubernetes.namespace.uuid`*::
17337+
+
17338+
--
17339+
Kubernetes namespace uuid
17340+
17341+
17342+
type: keyword
17343+
17344+
--
17345+
17346+
*`kubernetes.namespace.labels.*`*::
17347+
+
17348+
--
17349+
Kubernetes namespace labels map
17350+
17351+
17352+
type: object
17353+
17354+
--
17355+
17356+
*`kubernetes.namespace.annotations.*`*::
17357+
+
17358+
--
17359+
Kubernetes namespace annotations map
17360+
17361+
17362+
type: object
17363+
17364+
--
17365+
1733517366
*`kubernetes.node.name`*::
1733617367
+
1733717368
--

‎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: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85721,16 +85721,47 @@ type: ip
8572185721

8572285722
--
8572385723

85724-
*`kubernetes.namespace`*::
85724+
85725+
*`kubernetes.namespace.name`*::
8572585726
+
8572685727
--
85727-
Kubernetes namespace
85728+
Kubernetes namespace name
8572885729

8572985730

8573085731
type: keyword
8573185732

8573285733
--
8573385734

85735+
*`kubernetes.namespace.uuid`*::
85736+
+
85737+
--
85738+
Kubernetes namespace uuid
85739+
85740+
85741+
type: keyword
85742+
85743+
--
85744+
85745+
*`kubernetes.namespace.labels.*`*::
85746+
+
85747+
--
85748+
Kubernetes namespace labels map
85749+
85750+
85751+
type: object
85752+
85753+
--
85754+
85755+
*`kubernetes.namespace.annotations.*`*::
85756+
+
85757+
--
85758+
Kubernetes namespace annotations map
85759+
85760+
85761+
type: object
85762+
85763+
--
85764+
8573485765
*`kubernetes.node.name`*::
8573585766
+
8573685767
--

‎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: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14904,16 +14904,47 @@ type: ip
1490414904
1490514905
--
1490614906
14907-
*`kubernetes.namespace`*::
14907+
14908+
*`kubernetes.namespace.name`*::
1490814909
+
1490914910
--
14910-
Kubernetes namespace
14911+
Kubernetes namespace name
1491114912
1491214913
1491314914
type: keyword
1491414915
1491514916
--
1491614917
14918+
*`kubernetes.namespace.uuid`*::
14919+
+
14920+
--
14921+
Kubernetes namespace uuid
14922+
14923+
14924+
type: keyword
14925+
14926+
--
14927+
14928+
*`kubernetes.namespace.labels.*`*::
14929+
+
14930+
--
14931+
Kubernetes namespace labels map
14932+
14933+
14934+
type: object
14935+
14936+
--
14937+
14938+
*`kubernetes.namespace.annotations.*`*::
14939+
+
14940+
--
14941+
Kubernetes namespace annotations map
14942+
14943+
14944+
type: object
14945+
14946+
--
14947+
1491714948
*`kubernetes.node.name`*::
1491814949
+
1491914950
--

‎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: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15249,16 +15249,47 @@ type: ip
1524915249
1525015250
--
1525115251
15252-
*`kubernetes.namespace`*::
15252+
15253+
*`kubernetes.namespace.name`*::
1525315254
+
1525415255
--
15255-
Kubernetes namespace
15256+
Kubernetes namespace name
1525615257
1525715258
1525815259
type: keyword
1525915260
1526015261
--
1526115262
15263+
*`kubernetes.namespace.uuid`*::
15264+
+
15265+
--
15266+
Kubernetes namespace uuid
15267+
15268+
15269+
type: keyword
15270+
15271+
--
15272+
15273+
*`kubernetes.namespace.labels.*`*::
15274+
+
15275+
--
15276+
Kubernetes namespace labels map
15277+
15278+
15279+
type: object
15280+
15281+
--
15282+
15283+
*`kubernetes.namespace.annotations.*`*::
15284+
+
15285+
--
15286+
Kubernetes namespace annotations map
15287+
15288+
15289+
type: object
15290+
15291+
--
15292+
1526215293
*`kubernetes.node.name`*::
1526315294
+
1526415295
--

‎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/autodiscover/providers/kubernetes/pod.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,8 @@ func (p *pod) GenerateHints(event bus.Event) bus.Event {
186186
}
187187

188188
// Look at all the namespace level default annotations and do a merge with priority going to the pod annotations.
189-
if rawNsAnn, ok := kubeMeta["namespace_annotations"]; ok {
189+
rawNsAnn, err := kubeMeta.GetValue("namespace.annotations")
190+
if err == nil {
190191
namespaceAnnotations, _ := rawNsAnn.(common.MapStr)
191192
if len(namespaceAnnotations) != 0 {
192193
annotations.DeepUpdateNoOverwrite(namespaceAnnotations)
@@ -381,7 +382,7 @@ func (p *pod) containerPodEvents(flag string, pod *kubernetes.Pod, c *containerI
381382
"runtime": c.runtime,
382383
}
383384
if len(namespaceAnnotations) != 0 {
384-
kubemeta["namespace_annotations"] = namespaceAnnotations
385+
kubemeta.Put("namespace.annotations", namespaceAnnotations)
385386
}
386387

387388
ports := c.spec.Ports
@@ -433,7 +434,7 @@ func (p *pod) podEvent(flag string, pod *kubernetes.Pod, ports common.MapStr, in
433434
kubemeta = kubemeta.Clone()
434435
kubemeta["annotations"] = annotations
435436
if len(namespaceAnnotations) != 0 {
436-
kubemeta["namespace_annotations"] = namespaceAnnotations
437+
kubemeta.Put("namespace.annotations", namespaceAnnotations)
437438
}
438439

439440
// Don't set a port on the event

0 commit comments

Comments
 (0)