Skip to content

Commit 388642e

Browse files
ebeahanjsorianokaiyan-sheng
authored
Stage 1 experimental changes for RFC 0012 - orchestrator fieldset (#1292) (#1296)
Co-authored-by: Jaime Soriano Pastor <jaime.soriano@elastic.co> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
1 parent cc1953e commit 388642e

File tree

9 files changed

+461
-1
lines changed

9 files changed

+461
-1
lines changed

CHANGELOG.next.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Thanks, you're awesome :-) -->
1616

1717
#### Added
1818

19+
* Add `orchestrator` fieldset to experimental schema. #1292
20+
1921
#### Improvements
2022

2123
### Tooling and Artifact Changes

experimental/generated/beats/fields.ecs.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,6 +4120,74 @@
41204120
type: keyword
41214121
ignore_above: 1024
41224122
description: Observer version.
4123+
- name: orchestrator
4124+
title: Orchestrator
4125+
group: 2
4126+
description: Fields that describe the resources which container orchestrators
4127+
manage or act upon.
4128+
type: group
4129+
fields:
4130+
- name: api_version
4131+
level: extended
4132+
type: keyword
4133+
ignore_above: 1024
4134+
description: API version being used to carry out the action
4135+
example: v1beta1
4136+
default_field: false
4137+
- name: cluster.name
4138+
level: extended
4139+
type: keyword
4140+
ignore_above: 1024
4141+
description: Name of the cluster.
4142+
default_field: false
4143+
- name: cluster.url
4144+
level: extended
4145+
type: keyword
4146+
ignore_above: 1024
4147+
description: URL of the API used to manage the cluster.
4148+
default_field: false
4149+
- name: cluster.version
4150+
level: extended
4151+
type: keyword
4152+
ignore_above: 1024
4153+
description: The version of the cluster.
4154+
default_field: false
4155+
- name: namespace
4156+
level: extended
4157+
type: keyword
4158+
ignore_above: 1024
4159+
description: Namespace in which the action is taking place.
4160+
example: kube-system
4161+
default_field: false
4162+
- name: organization
4163+
level: extended
4164+
type: keyword
4165+
ignore_above: 1024
4166+
description: Organization affected by the event (for multi-tenant orchestrator
4167+
setups).
4168+
example: elastic
4169+
default_field: false
4170+
- name: resource.name
4171+
level: extended
4172+
type: keyword
4173+
ignore_above: 1024
4174+
description: Name of the resource being acted upon.
4175+
example: test-pod-cdcws
4176+
default_field: false
4177+
- name: resource.type
4178+
level: extended
4179+
type: keyword
4180+
ignore_above: 1024
4181+
description: Type of resource being acted upon.
4182+
example: service
4183+
default_field: false
4184+
- name: type
4185+
level: extended
4186+
type: keyword
4187+
ignore_above: 1024
4188+
description: Orchestrator cluster type (e.g. kubernetes, nomad or cloudfoundry).
4189+
example: kubernetes
4190+
default_field: false
41234191
- name: organization
41244192
title: Organization
41254193
group: 2

experimental/generated/csv/fields.csv

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,15 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
471471
1.10.0-dev+exp,true,observer,observer.type,keyword,core,,firewall,The type of the observer the data is coming from.
472472
1.10.0-dev+exp,true,observer,observer.vendor,keyword,core,,Symantec,Vendor name of the observer.
473473
1.10.0-dev+exp,true,observer,observer.version,keyword,core,,,Observer version.
474+
1.10.0-dev+exp,true,orchestrator,orchestrator.api_version,keyword,extended,,v1beta1,API version being used to carry out the action
475+
1.10.0-dev+exp,true,orchestrator,orchestrator.cluster.name,keyword,extended,,,Name of the cluster.
476+
1.10.0-dev+exp,true,orchestrator,orchestrator.cluster.url,keyword,extended,,,URL of the API used to manage the cluster.
477+
1.10.0-dev+exp,true,orchestrator,orchestrator.cluster.version,keyword,extended,,,The version of the cluster.
478+
1.10.0-dev+exp,true,orchestrator,orchestrator.namespace,keyword,extended,,kube-system,Namespace in which the action is taking place.
479+
1.10.0-dev+exp,true,orchestrator,orchestrator.organization,keyword,extended,,elastic,Organization affected by the event (for multi-tenant orchestrator setups).
480+
1.10.0-dev+exp,true,orchestrator,orchestrator.resource.name,keyword,extended,,test-pod-cdcws,Name of the resource being acted upon.
481+
1.10.0-dev+exp,true,orchestrator,orchestrator.resource.type,keyword,extended,,service,Type of resource being acted upon.
482+
1.10.0-dev+exp,true,orchestrator,orchestrator.type,keyword,extended,,kubernetes,"Orchestrator cluster type (e.g. kubernetes, nomad or cloudfoundry)."
474483
1.10.0-dev+exp,true,organization,organization.id,keyword,extended,,,Unique identifier for the organization.
475484
1.10.0-dev+exp,true,organization,organization.name,wildcard,extended,,,Organization name.
476485
1.10.0-dev+exp,true,organization,organization.name.text,text,extended,,,Organization name.

experimental/generated/ecs/ecs_flat.yml

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6144,6 +6144,102 @@ observer.version:
61446144
normalize: []
61456145
short: Observer version.
61466146
type: keyword
6147+
orchestrator.api_version:
6148+
dashed_name: orchestrator-api-version
6149+
description: API version being used to carry out the action
6150+
example: v1beta1
6151+
flat_name: orchestrator.api_version
6152+
ignore_above: 1024
6153+
level: extended
6154+
name: api_version
6155+
normalize: []
6156+
short: API version being used to carry out the action
6157+
type: keyword
6158+
orchestrator.cluster.name:
6159+
dashed_name: orchestrator-cluster-name
6160+
description: Name of the cluster.
6161+
flat_name: orchestrator.cluster.name
6162+
ignore_above: 1024
6163+
level: extended
6164+
name: cluster.name
6165+
normalize: []
6166+
short: Name of the cluster.
6167+
type: keyword
6168+
orchestrator.cluster.url:
6169+
dashed_name: orchestrator-cluster-url
6170+
description: URL of the API used to manage the cluster.
6171+
flat_name: orchestrator.cluster.url
6172+
ignore_above: 1024
6173+
level: extended
6174+
name: cluster.url
6175+
normalize: []
6176+
short: URL of the API used to manage the cluster.
6177+
type: keyword
6178+
orchestrator.cluster.version:
6179+
dashed_name: orchestrator-cluster-version
6180+
description: The version of the cluster.
6181+
flat_name: orchestrator.cluster.version
6182+
ignore_above: 1024
6183+
level: extended
6184+
name: cluster.version
6185+
normalize: []
6186+
short: The version of the cluster.
6187+
type: keyword
6188+
orchestrator.namespace:
6189+
dashed_name: orchestrator-namespace
6190+
description: Namespace in which the action is taking place.
6191+
example: kube-system
6192+
flat_name: orchestrator.namespace
6193+
ignore_above: 1024
6194+
level: extended
6195+
name: namespace
6196+
normalize: []
6197+
short: Namespace in which the action is taking place.
6198+
type: keyword
6199+
orchestrator.organization:
6200+
dashed_name: orchestrator-organization
6201+
description: Organization affected by the event (for multi-tenant orchestrator setups).
6202+
example: elastic
6203+
flat_name: orchestrator.organization
6204+
ignore_above: 1024
6205+
level: extended
6206+
name: organization
6207+
normalize: []
6208+
short: Organization affected by the event (for multi-tenant orchestrator setups).
6209+
type: keyword
6210+
orchestrator.resource.name:
6211+
dashed_name: orchestrator-resource-name
6212+
description: Name of the resource being acted upon.
6213+
example: test-pod-cdcws
6214+
flat_name: orchestrator.resource.name
6215+
ignore_above: 1024
6216+
level: extended
6217+
name: resource.name
6218+
normalize: []
6219+
short: Name of the resource being acted upon.
6220+
type: keyword
6221+
orchestrator.resource.type:
6222+
dashed_name: orchestrator-resource-type
6223+
description: Type of resource being acted upon.
6224+
example: service
6225+
flat_name: orchestrator.resource.type
6226+
ignore_above: 1024
6227+
level: extended
6228+
name: resource.type
6229+
normalize: []
6230+
short: Type of resource being acted upon.
6231+
type: keyword
6232+
orchestrator.type:
6233+
dashed_name: orchestrator-type
6234+
description: Orchestrator cluster type (e.g. kubernetes, nomad or cloudfoundry).
6235+
example: kubernetes
6236+
flat_name: orchestrator.type
6237+
ignore_above: 1024
6238+
level: extended
6239+
name: type
6240+
normalize: []
6241+
short: Orchestrator cluster type (e.g. kubernetes, nomad or cloudfoundry).
6242+
type: keyword
61476243
organization.id:
61486244
dashed_name: organization-id
61496245
description: Unique identifier for the organization.

experimental/generated/ecs/ecs_nested.yml

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7395,6 +7395,113 @@ observer:
73957395
short: Fields describing an entity observing the event from outside the host.
73967396
title: Observer
73977397
type: group
7398+
orchestrator:
7399+
description: Fields that describe the resources which container orchestrators manage
7400+
or act upon.
7401+
fields:
7402+
orchestrator.api_version:
7403+
dashed_name: orchestrator-api-version
7404+
description: API version being used to carry out the action
7405+
example: v1beta1
7406+
flat_name: orchestrator.api_version
7407+
ignore_above: 1024
7408+
level: extended
7409+
name: api_version
7410+
normalize: []
7411+
short: API version being used to carry out the action
7412+
type: keyword
7413+
orchestrator.cluster.name:
7414+
dashed_name: orchestrator-cluster-name
7415+
description: Name of the cluster.
7416+
flat_name: orchestrator.cluster.name
7417+
ignore_above: 1024
7418+
level: extended
7419+
name: cluster.name
7420+
normalize: []
7421+
short: Name of the cluster.
7422+
type: keyword
7423+
orchestrator.cluster.url:
7424+
dashed_name: orchestrator-cluster-url
7425+
description: URL of the API used to manage the cluster.
7426+
flat_name: orchestrator.cluster.url
7427+
ignore_above: 1024
7428+
level: extended
7429+
name: cluster.url
7430+
normalize: []
7431+
short: URL of the API used to manage the cluster.
7432+
type: keyword
7433+
orchestrator.cluster.version:
7434+
dashed_name: orchestrator-cluster-version
7435+
description: The version of the cluster.
7436+
flat_name: orchestrator.cluster.version
7437+
ignore_above: 1024
7438+
level: extended
7439+
name: cluster.version
7440+
normalize: []
7441+
short: The version of the cluster.
7442+
type: keyword
7443+
orchestrator.namespace:
7444+
dashed_name: orchestrator-namespace
7445+
description: Namespace in which the action is taking place.
7446+
example: kube-system
7447+
flat_name: orchestrator.namespace
7448+
ignore_above: 1024
7449+
level: extended
7450+
name: namespace
7451+
normalize: []
7452+
short: Namespace in which the action is taking place.
7453+
type: keyword
7454+
orchestrator.organization:
7455+
dashed_name: orchestrator-organization
7456+
description: Organization affected by the event (for multi-tenant orchestrator
7457+
setups).
7458+
example: elastic
7459+
flat_name: orchestrator.organization
7460+
ignore_above: 1024
7461+
level: extended
7462+
name: organization
7463+
normalize: []
7464+
short: Organization affected by the event (for multi-tenant orchestrator setups).
7465+
type: keyword
7466+
orchestrator.resource.name:
7467+
dashed_name: orchestrator-resource-name
7468+
description: Name of the resource being acted upon.
7469+
example: test-pod-cdcws
7470+
flat_name: orchestrator.resource.name
7471+
ignore_above: 1024
7472+
level: extended
7473+
name: resource.name
7474+
normalize: []
7475+
short: Name of the resource being acted upon.
7476+
type: keyword
7477+
orchestrator.resource.type:
7478+
dashed_name: orchestrator-resource-type
7479+
description: Type of resource being acted upon.
7480+
example: service
7481+
flat_name: orchestrator.resource.type
7482+
ignore_above: 1024
7483+
level: extended
7484+
name: resource.type
7485+
normalize: []
7486+
short: Type of resource being acted upon.
7487+
type: keyword
7488+
orchestrator.type:
7489+
dashed_name: orchestrator-type
7490+
description: Orchestrator cluster type (e.g. kubernetes, nomad or cloudfoundry).
7491+
example: kubernetes
7492+
flat_name: orchestrator.type
7493+
ignore_above: 1024
7494+
level: extended
7495+
name: type
7496+
normalize: []
7497+
short: Orchestrator cluster type (e.g. kubernetes, nomad or cloudfoundry).
7498+
type: keyword
7499+
group: 2
7500+
name: orchestrator
7501+
prefix: orchestrator.
7502+
short: Fields relevant to container orchestrators.
7503+
title: Orchestrator
7504+
type: group
73987505
organization:
73997506
description: 'The organization fields enrich data with information about the company
74007507
or entity the data is associated with.

experimental/generated/elasticsearch/7/template.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2161,6 +2161,54 @@
21612161
}
21622162
}
21632163
},
2164+
"orchestrator": {
2165+
"properties": {
2166+
"api_version": {
2167+
"ignore_above": 1024,
2168+
"type": "keyword"
2169+
},
2170+
"cluster": {
2171+
"properties": {
2172+
"name": {
2173+
"ignore_above": 1024,
2174+
"type": "keyword"
2175+
},
2176+
"url": {
2177+
"ignore_above": 1024,
2178+
"type": "keyword"
2179+
},
2180+
"version": {
2181+
"ignore_above": 1024,
2182+
"type": "keyword"
2183+
}
2184+
}
2185+
},
2186+
"namespace": {
2187+
"ignore_above": 1024,
2188+
"type": "keyword"
2189+
},
2190+
"organization": {
2191+
"ignore_above": 1024,
2192+
"type": "keyword"
2193+
},
2194+
"resource": {
2195+
"properties": {
2196+
"name": {
2197+
"ignore_above": 1024,
2198+
"type": "keyword"
2199+
},
2200+
"type": {
2201+
"ignore_above": 1024,
2202+
"type": "keyword"
2203+
}
2204+
}
2205+
},
2206+
"type": {
2207+
"ignore_above": 1024,
2208+
"type": "keyword"
2209+
}
2210+
}
2211+
},
21642212
"organization": {
21652213
"properties": {
21662214
"id": {

0 commit comments

Comments
 (0)