Skip to content

Commit 5391118

Browse files
gregkalaposelasticmachine
authored andcommitted
[otel-data] Add more kubernetes aliases (elastic#115429)
* Add more kubernetes aliases * Update docs/changelog/115429.yaml * Review feedback --------- Co-authored-by: Elastic Machine <[email protected]>
1 parent 615345f commit 5391118

File tree

3 files changed

+90
-0
lines changed

3 files changed

+90
-0
lines changed

docs/changelog/115429.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 115429
2+
summary: "[otel-data] Add more kubernetes aliases"
3+
area: Data streams
4+
type: bug
5+
issues: []

x-pack/plugin/otel-data/src/main/resources/component-templates/[email protected]

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,45 @@ template:
5656
os.version:
5757
type: keyword
5858
ignore_above: 1024
59+
k8s.container.name:
60+
type: keyword
61+
ignore_above: 1024
62+
k8s.cronjob.name:
63+
type: keyword
64+
ignore_above: 1024
65+
k8s.daemonset.name:
66+
type: keyword
67+
ignore_above: 1024
5968
k8s.deployment.name:
6069
type: keyword
6170
ignore_above: 1024
71+
k8s.job.name:
72+
type: keyword
73+
ignore_above: 1024
6274
k8s.namespace.name:
6375
type: keyword
6476
ignore_above: 1024
77+
k8s.node.hostname:
78+
type: keyword
79+
ignore_above: 1024
6580
k8s.node.name:
6681
type: keyword
6782
ignore_above: 1024
83+
k8s.node.uid:
84+
type: keyword
85+
ignore_above: 1024
6886
k8s.pod.name:
6987
type: keyword
7088
ignore_above: 1024
7189
k8s.pod.uid:
7290
type: keyword
7391
ignore_above: 1024
92+
k8s.replicaset.name:
93+
type: keyword
94+
ignore_above: 1024
95+
k8s.statefulset.name:
96+
type: keyword
97+
ignore_above: 1024
7498
service.node.name:
7599
type: alias
76100
path: resource.attributes.service.instance.id
@@ -122,6 +146,30 @@ template:
122146
kubernetes.pod.uid:
123147
type: alias
124148
path: resource.attributes.k8s.pod.uid
149+
kubernetes.container.name:
150+
type: alias
151+
path: resource.attributes.k8s.container.name
152+
kubernetes.cronjob.name:
153+
type: alias
154+
path: resource.attributes.k8s.cronjob.name
155+
kubernetes.job.name:
156+
type: alias
157+
path: resource.attributes.k8s.job.name
158+
kubernetes.statefulset.name:
159+
type: alias
160+
path: resource.attributes.k8s.statefulset.name
161+
kubernetes.daemonset.name:
162+
type: alias
163+
path: resource.attributes.k8s.daemonset.name
164+
kubernetes.replicaset.name:
165+
type: alias
166+
path: resource.attributes.k8s.replicaset.name
167+
kubernetes.node.uid:
168+
type: alias
169+
path: resource.attributes.k8s.node.uid
170+
kubernetes.node.hostname:
171+
type: alias
172+
path: resource.attributes.k8s.node.hostname
125173
# Below are non-ECS fields that may be used by Kibana.
126174
service.language.name:
127175
type: alias

x-pack/plugin/otel-data/src/yamlRestTest/resources/rest-api-spec/test/20_logs_tests.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,3 +187,40 @@ host.name pass-through:
187187
- length: { hits.hits: 1 }
188188
- match: { hits.hits.0.fields.resource\.attributes\.host\.name: [ "localhost" ] }
189189
- match: { hits.hits.0.fields.host\.name: [ "localhost" ] }
190+
---
191+
"kubernetes.* -> resource.attributes.k8s.* aliases":
192+
- do:
193+
bulk:
194+
index: logs-generic.otel-default
195+
refresh: true
196+
body:
197+
- create: { }
198+
- "@timestamp": 2024-07-18T14:48:33.467654000Z
199+
data_stream:
200+
dataset: generic.otel
201+
namespace: default
202+
resource:
203+
attributes:
204+
k8s.container.name: myContainerName
205+
k8s.cronjob.name: myCronJobName
206+
k8s.job.name: myJobName
207+
k8s.statefulset.name: myStatefulsetName
208+
k8s.daemonset.name: myDaemonsetName
209+
k8s.replicaset.name: myReplicasetName
210+
k8s.node.uid: myNodeUid
211+
k8s.node.hostname: myNodeHostname
212+
- is_false: errors
213+
- do:
214+
search:
215+
index: logs-generic.otel-default
216+
body:
217+
fields: ["kubernetes.container.name", "kubernetes.cronjob.name", "kubernetes.job.name", "kubernetes.statefulset.name", "kubernetes.daemonset.name", "kubernetes.replicaset.name", "kubernetes.node.uid", "kubernetes.node.hostname" ]
218+
- length: { hits.hits: 1 }
219+
- match: { hits.hits.0.fields.kubernetes\.container\.name : ["myContainerName"] }
220+
- match: { hits.hits.0.fields.kubernetes\.cronjob\.name : ["myCronJobName"] }
221+
- match: { hits.hits.0.fields.kubernetes\.job\.name : ["myJobName"] }
222+
- match: { hits.hits.0.fields.kubernetes\.statefulset\.name : ["myStatefulsetName"] }
223+
- match: { hits.hits.0.fields.kubernetes\.daemonset\.name : ["myDaemonsetName"] }
224+
- match: { hits.hits.0.fields.kubernetes\.replicaset\.name : ["myReplicasetName"] }
225+
- match: { hits.hits.0.fields.kubernetes\.node\.uid : ["myNodeUid"] }
226+
- match: { hits.hits.0.fields.kubernetes\.node\.hostname : ["myNodeHostname"] }

0 commit comments

Comments
 (0)