From 4ee0e792dd1d5bb4cc108a40ad36342af9ab2baa Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Thu, 5 Dec 2024 17:57:01 -0800 Subject: [PATCH 1/3] Remove deprecated fields Remove deprecated fields from the previous major release: * process.parent.pgid * process.pgid * service.node.role * service.origin.node.role * service.target.node.role --- CHANGELOG.next.md | 2 + docs/fields/field-details.asciidoc | 44 -------- experimental/generated/beats/fields.ecs.yml | 77 ------------- experimental/generated/csv/fields.csv | 5 - experimental/generated/ecs/ecs_flat.yml | 98 ----------------- experimental/generated/ecs/ecs_nested.yml | 101 ------------------ .../composable/component/process.json | 6 -- .../composable/component/service.json | 12 --- .../elasticsearch/legacy/template.json | 18 ---- generated/beats/fields.ecs.yml | 77 ------------- generated/csv/fields.csv | 5 - generated/ecs/ecs_flat.yml | 98 ----------------- generated/ecs/ecs_nested.yml | 101 ------------------ .../composable/component/process.json | 6 -- .../composable/component/service.json | 12 --- generated/elasticsearch/legacy/template.json | 18 ---- schemas/process.yml | 11 -- schemas/service.yml | 19 ---- schemas/subsets/main.yml | 2 - 19 files changed, 2 insertions(+), 710 deletions(-) diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md index b46ee2c925..5e18c30826 100644 --- a/CHANGELOG.next.md +++ b/CHANGELOG.next.md @@ -12,6 +12,8 @@ Thanks, you're awesome :-) --> #### Breaking changes +* Remove deprecated fields from previous major release; `process.pgid`, `service.node.role`, and inherited users. #999999 + #### Bugfixes #### Added diff --git a/docs/fields/field-details.asciidoc b/docs/fields/field-details.asciidoc index 6d5ba6a780..21960a05cc 100644 --- a/docs/fields/field-details.asciidoc +++ b/docs/fields/field-details.asciidoc @@ -8405,24 +8405,6 @@ Multi-fields: example: `ssh` -| extended - -// =============================================================== - -| -[[field-process-pgid]] -<> - -a| Deprecated for removal in next major version release. This field is superseded by `process.group_leader.pid`. - -Identifier of the group of processes the process belongs to. - -type: long - - - - - | extended // =============================================================== @@ -9913,32 +9895,6 @@ example: `instance-0000000016` // =============================================================== -| -[[field-service-node-role]] -<> - -a| Deprecated for removal in next major version release. This field will be superseded by `node.roles`. - -Role of a service node. - -This allows for distinction between different running roles of the same service. - -In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - -In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - -Other services could use this to distinguish between a `web` and `worker` role running as part of the service. - -type: keyword - - - -example: `background_tasks` - -| extended - -// =============================================================== - | [[field-service-node-roles]] <> diff --git a/experimental/generated/beats/fields.ecs.yml b/experimental/generated/beats/fields.ecs.yml index 3cc3a5847b..b624798519 100644 --- a/experimental/generated/beats/fields.ecs.yml +++ b/experimental/generated/beats/fields.ecs.yml @@ -6897,15 +6897,6 @@ format: string description: PE Section List virtual size. This is always the same as `physical_size`. default_field: false - - name: parent.pgid - level: extended - type: long - format: string - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - default_field: false - name: parent.pid level: core type: long @@ -7269,14 +7260,6 @@ format: string description: PE Section List virtual size. This is always the same as `physical_size`. default_field: false - - name: pgid - level: extended - type: long - format: string - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - name: pid level: core type: long @@ -8445,26 +8428,6 @@ provide uniqueness (e.g. multiple instances of the service running on the same host) - the node name can be manually set.' example: instance-0000000016 - - name: node.role - level: extended - type: keyword - ignore_above: 1024 - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - default_field: false - name: node.roles level: extended type: keyword @@ -8561,26 +8524,6 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false - - name: origin.node.role - level: extended - type: keyword - ignore_above: 1024 - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - default_field: false - name: origin.node.roles level: extended type: keyword @@ -8710,26 +8653,6 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false - - name: target.node.role - level: extended - type: keyword - ignore_above: 1024 - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - default_field: false - name: target.node.roles level: extended type: keyword diff --git a/experimental/generated/csv/fields.csv b/experimental/generated/csv/fields.csv index 2f73b45091..e6418c07e4 100644 --- a/experimental/generated/csv/fields.csv +++ b/experimental/generated/csv/fields.csv @@ -884,7 +884,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,process,process.parent.pe.sections.physical_size,long,extended,,,PE Section List physical size. 9.0.0-dev+exp,true,process,process.parent.pe.sections.var_entropy,long,extended,,,Variance for Shannon entropy calculation from the section. 9.0.0-dev+exp,true,process,process.parent.pe.sections.virtual_size,long,extended,,,PE Section List virtual size. This is always the same as `physical_size`. -9.0.0-dev+exp,true,process,process.parent.pgid,long,extended,,,Deprecated identifier of the group of processes the process belongs to. 9.0.0-dev+exp,true,process,process.parent.pid,long,core,,4242,Process id. 9.0.0-dev+exp,true,process,process.parent.real_group.id,keyword,extended,,,Unique identifier for the group on the system/platform. 9.0.0-dev+exp,true,process,process.parent.real_group.name,keyword,extended,,,Name of the group. @@ -938,7 +937,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,process,process.pe.sections.physical_size,long,extended,,,PE Section List physical size. 9.0.0-dev+exp,true,process,process.pe.sections.var_entropy,long,extended,,,Variance for Shannon entropy calculation from the section. 9.0.0-dev+exp,true,process,process.pe.sections.virtual_size,long,extended,,,PE Section List virtual size. This is always the same as `physical_size`. -9.0.0-dev+exp,true,process,process.pgid,long,extended,,,Deprecated identifier of the group of processes the process belongs to. 9.0.0-dev+exp,true,process,process.pid,long,core,,4242,Process id. 9.0.0-dev+exp,true,process,process.previous.args,keyword,extended,array,"[""/usr/bin/ssh"", ""-l"", ""user"", ""10.0.0.16""]",Array of process arguments. 9.0.0-dev+exp,true,process,process.previous.args_count,long,extended,,4,Length of the process.args array. @@ -1084,7 +1082,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,service,service.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev+exp,true,service,service.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev+exp,true,service,service.node.name,keyword,extended,,instance-0000000016,Name of the service node. -9.0.0-dev+exp,true,service,service.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev+exp,true,service,service.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev+exp,true,service,service.origin.address,keyword,extended,,172.26.0.2:5432,Address of this service. 9.0.0-dev+exp,true,service,service.origin.environment,keyword,extended,,production,Environment of the service. @@ -1092,7 +1089,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,service,service.origin.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev+exp,true,service,service.origin.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev+exp,true,service,service.origin.node.name,keyword,extended,,instance-0000000016,Name of the service node. -9.0.0-dev+exp,true,service,service.origin.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev+exp,true,service,service.origin.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev+exp,true,service,service.origin.state,keyword,core,,,Current state of the service. 9.0.0-dev+exp,true,service,service.origin.type,keyword,core,,elasticsearch,The type of the service. @@ -1104,7 +1100,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,service,service.target.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev+exp,true,service,service.target.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev+exp,true,service,service.target.node.name,keyword,extended,,instance-0000000016,Name of the service node. -9.0.0-dev+exp,true,service,service.target.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev+exp,true,service,service.target.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev+exp,true,service,service.target.state,keyword,core,,,Current state of the service. 9.0.0-dev+exp,true,service,service.target.type,keyword,core,,elasticsearch,The type of the service. diff --git a/experimental/generated/ecs/ecs_flat.yml b/experimental/generated/ecs/ecs_flat.yml index 52e90b2670..f1babdc3c0 100644 --- a/experimental/generated/ecs/ecs_flat.yml +++ b/experimental/generated/ecs/ecs_flat.yml @@ -11279,20 +11279,6 @@ process.parent.pe.sections.virtual_size: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long -process.parent.pgid: - dashed_name: process-parent-pgid - description: 'Deprecated for removal in next major version release. This field is - superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.parent.pgid - format: string - level: extended - name: pgid - normalize: [] - original_fieldset: process - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.parent.pid: dashed_name: process-parent-pid description: Process id. @@ -11906,19 +11892,6 @@ process.pe.sections.virtual_size: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long -process.pgid: - dashed_name: process-pgid - description: 'Deprecated for removal in next major version release. This field is - superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.pgid - format: string - level: extended - name: pgid - normalize: [] - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.pid: dashed_name: process-pid description: Process id. @@ -13663,29 +13636,6 @@ service.node.name: normalize: [] short: Name of the service node. type: keyword -service.node.role: - dashed_name: service-node-role - description: 'Deprecated for removal in next major version release. This field will - be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role - running as part of the service.' - example: background_tasks - flat_name: service.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - short: Deprecated role (singular) of the service node. - type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -13817,30 +13767,6 @@ service.origin.node.name: original_fieldset: service short: Name of the service node. type: keyword -service.origin.node.role: - dashed_name: service-origin-node-role - description: 'Deprecated for removal in next major version release. This field will - be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role - running as part of the service.' - example: background_tasks - flat_name: service.origin.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -14026,30 +13952,6 @@ service.target.node.name: original_fieldset: service short: Name of the service node. type: keyword -service.target.node.role: - dashed_name: service-target-node-role - description: 'Deprecated for removal in next major version release. This field will - be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role - running as part of the service.' - example: background_tasks - flat_name: service.target.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/experimental/generated/ecs/ecs_nested.yml b/experimental/generated/ecs/ecs_nested.yml index 6e1b49a8f9..baac27c746 100644 --- a/experimental/generated/ecs/ecs_nested.yml +++ b/experimental/generated/ecs/ecs_nested.yml @@ -13522,20 +13522,6 @@ process: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long - process.parent.pgid: - dashed_name: process-parent-pgid - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.parent.pgid - format: string - level: extended - name: pgid - normalize: [] - original_fieldset: process - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.parent.pid: dashed_name: process-parent-pid description: Process id. @@ -14150,19 +14136,6 @@ process: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long - process.pgid: - dashed_name: process-pgid - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.pgid - format: string - level: extended - name: pgid - normalize: [] - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.pid: dashed_name: process-pid description: Process id. @@ -16294,30 +16267,6 @@ service: normalize: [] short: Name of the service node. type: keyword - service.node.role: - dashed_name: service-node-role - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - flat_name: service.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - short: Deprecated role (singular) of the service node. - type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -16450,31 +16399,6 @@ service: original_fieldset: service short: Name of the service node. type: keyword - service.origin.node.role: - dashed_name: service-origin-node-role - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - flat_name: service.origin.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -16661,31 +16585,6 @@ service: original_fieldset: service short: Name of the service node. type: keyword - service.target.node.role: - dashed_name: service-target-node-role - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - flat_name: service.target.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/experimental/generated/elasticsearch/composable/component/process.json b/experimental/generated/elasticsearch/composable/component/process.json index 1f0700dc05..e3e31c5ea5 100644 --- a/experimental/generated/elasticsearch/composable/component/process.json +++ b/experimental/generated/elasticsearch/composable/component/process.json @@ -1257,9 +1257,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, @@ -1503,9 +1500,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, diff --git a/experimental/generated/elasticsearch/composable/component/service.json b/experimental/generated/elasticsearch/composable/component/service.json index 7cbe9ebd19..34548f507b 100644 --- a/experimental/generated/elasticsearch/composable/component/service.json +++ b/experimental/generated/elasticsearch/composable/component/service.json @@ -34,10 +34,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -72,10 +68,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -128,10 +120,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" diff --git a/experimental/generated/elasticsearch/legacy/template.json b/experimental/generated/elasticsearch/legacy/template.json index 13003e6b81..75a205ea31 100644 --- a/experimental/generated/elasticsearch/legacy/template.json +++ b/experimental/generated/elasticsearch/legacy/template.json @@ -4002,9 +4002,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, @@ -4248,9 +4245,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, @@ -4948,10 +4942,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -4986,10 +4976,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -5042,10 +5028,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" diff --git a/generated/beats/fields.ecs.yml b/generated/beats/fields.ecs.yml index 93b81e44bb..b1293b8b66 100644 --- a/generated/beats/fields.ecs.yml +++ b/generated/beats/fields.ecs.yml @@ -6847,15 +6847,6 @@ format: string description: PE Section List virtual size. This is always the same as `physical_size`. default_field: false - - name: parent.pgid - level: extended - type: long - format: string - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - default_field: false - name: parent.pid level: core type: long @@ -7219,14 +7210,6 @@ format: string description: PE Section List virtual size. This is always the same as `physical_size`. default_field: false - - name: pgid - level: extended - type: long - format: string - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - name: pid level: core type: long @@ -8395,26 +8378,6 @@ provide uniqueness (e.g. multiple instances of the service running on the same host) - the node name can be manually set.' example: instance-0000000016 - - name: node.role - level: extended - type: keyword - ignore_above: 1024 - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - default_field: false - name: node.roles level: extended type: keyword @@ -8511,26 +8474,6 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false - - name: origin.node.role - level: extended - type: keyword - ignore_above: 1024 - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - default_field: false - name: origin.node.roles level: extended type: keyword @@ -8660,26 +8603,6 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false - - name: target.node.role - level: extended - type: keyword - ignore_above: 1024 - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - default_field: false - name: target.node.roles level: extended type: keyword diff --git a/generated/csv/fields.csv b/generated/csv/fields.csv index 177908f017..934313f13e 100644 --- a/generated/csv/fields.csv +++ b/generated/csv/fields.csv @@ -877,7 +877,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,process,process.parent.pe.sections.physical_size,long,extended,,,PE Section List physical size. 9.0.0-dev,true,process,process.parent.pe.sections.var_entropy,long,extended,,,Variance for Shannon entropy calculation from the section. 9.0.0-dev,true,process,process.parent.pe.sections.virtual_size,long,extended,,,PE Section List virtual size. This is always the same as `physical_size`. -9.0.0-dev,true,process,process.parent.pgid,long,extended,,,Deprecated identifier of the group of processes the process belongs to. 9.0.0-dev,true,process,process.parent.pid,long,core,,4242,Process id. 9.0.0-dev,true,process,process.parent.real_group.id,keyword,extended,,,Unique identifier for the group on the system/platform. 9.0.0-dev,true,process,process.parent.real_group.name,keyword,extended,,,Name of the group. @@ -931,7 +930,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,process,process.pe.sections.physical_size,long,extended,,,PE Section List physical size. 9.0.0-dev,true,process,process.pe.sections.var_entropy,long,extended,,,Variance for Shannon entropy calculation from the section. 9.0.0-dev,true,process,process.pe.sections.virtual_size,long,extended,,,PE Section List virtual size. This is always the same as `physical_size`. -9.0.0-dev,true,process,process.pgid,long,extended,,,Deprecated identifier of the group of processes the process belongs to. 9.0.0-dev,true,process,process.pid,long,core,,4242,Process id. 9.0.0-dev,true,process,process.previous.args,keyword,extended,array,"[""/usr/bin/ssh"", ""-l"", ""user"", ""10.0.0.16""]",Array of process arguments. 9.0.0-dev,true,process,process.previous.args_count,long,extended,,4,Length of the process.args array. @@ -1077,7 +1075,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,service,service.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev,true,service,service.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev,true,service,service.node.name,keyword,extended,,instance-0000000016,Name of the service node. -9.0.0-dev,true,service,service.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev,true,service,service.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev,true,service,service.origin.address,keyword,extended,,172.26.0.2:5432,Address of this service. 9.0.0-dev,true,service,service.origin.environment,keyword,extended,,production,Environment of the service. @@ -1085,7 +1082,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,service,service.origin.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev,true,service,service.origin.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev,true,service,service.origin.node.name,keyword,extended,,instance-0000000016,Name of the service node. -9.0.0-dev,true,service,service.origin.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev,true,service,service.origin.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev,true,service,service.origin.state,keyword,core,,,Current state of the service. 9.0.0-dev,true,service,service.origin.type,keyword,core,,elasticsearch,The type of the service. @@ -1097,7 +1093,6 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,service,service.target.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev,true,service,service.target.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev,true,service,service.target.node.name,keyword,extended,,instance-0000000016,Name of the service node. -9.0.0-dev,true,service,service.target.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev,true,service,service.target.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev,true,service,service.target.state,keyword,core,,,Current state of the service. 9.0.0-dev,true,service,service.target.type,keyword,core,,elasticsearch,The type of the service. diff --git a/generated/ecs/ecs_flat.yml b/generated/ecs/ecs_flat.yml index 3ab5bc75d5..faa0572e75 100644 --- a/generated/ecs/ecs_flat.yml +++ b/generated/ecs/ecs_flat.yml @@ -11210,20 +11210,6 @@ process.parent.pe.sections.virtual_size: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long -process.parent.pgid: - dashed_name: process-parent-pgid - description: 'Deprecated for removal in next major version release. This field is - superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.parent.pgid - format: string - level: extended - name: pgid - normalize: [] - original_fieldset: process - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.parent.pid: dashed_name: process-parent-pid description: Process id. @@ -11837,19 +11823,6 @@ process.pe.sections.virtual_size: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long -process.pgid: - dashed_name: process-pgid - description: 'Deprecated for removal in next major version release. This field is - superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.pgid - format: string - level: extended - name: pgid - normalize: [] - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.pid: dashed_name: process-pid description: Process id. @@ -13594,29 +13567,6 @@ service.node.name: normalize: [] short: Name of the service node. type: keyword -service.node.role: - dashed_name: service-node-role - description: 'Deprecated for removal in next major version release. This field will - be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role - running as part of the service.' - example: background_tasks - flat_name: service.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - short: Deprecated role (singular) of the service node. - type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -13748,30 +13698,6 @@ service.origin.node.name: original_fieldset: service short: Name of the service node. type: keyword -service.origin.node.role: - dashed_name: service-origin-node-role - description: 'Deprecated for removal in next major version release. This field will - be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role - running as part of the service.' - example: background_tasks - flat_name: service.origin.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -13957,30 +13883,6 @@ service.target.node.name: original_fieldset: service short: Name of the service node. type: keyword -service.target.node.role: - dashed_name: service-target-node-role - description: 'Deprecated for removal in next major version release. This field will - be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role - running as part of the service.' - example: background_tasks - flat_name: service.target.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/generated/ecs/ecs_nested.yml b/generated/ecs/ecs_nested.yml index c068d535a1..a2de4f485c 100644 --- a/generated/ecs/ecs_nested.yml +++ b/generated/ecs/ecs_nested.yml @@ -13442,20 +13442,6 @@ process: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long - process.parent.pgid: - dashed_name: process-parent-pgid - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.parent.pgid - format: string - level: extended - name: pgid - normalize: [] - original_fieldset: process - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.parent.pid: dashed_name: process-parent-pid description: Process id. @@ -14070,19 +14056,6 @@ process: original_fieldset: pe short: PE Section List virtual size. This is always the same as `physical_size`. type: long - process.pgid: - dashed_name: process-pgid - description: 'Deprecated for removal in next major version release. This field - is superseded by `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to.' - flat_name: process.pgid - format: string - level: extended - name: pgid - normalize: [] - short: Deprecated identifier of the group of processes the process belongs to. - type: long process.pid: dashed_name: process-pid description: Process id. @@ -16214,30 +16187,6 @@ service: normalize: [] short: Name of the service node. type: keyword - service.node.role: - dashed_name: service-node-role - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - flat_name: service.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - short: Deprecated role (singular) of the service node. - type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -16370,31 +16319,6 @@ service: original_fieldset: service short: Name of the service node. type: keyword - service.origin.node.role: - dashed_name: service-origin-node-role - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - flat_name: service.origin.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -16581,31 +16505,6 @@ service: original_fieldset: service short: Name of the service node. type: keyword - service.target.node.role: - dashed_name: service-target-node-role - description: 'Deprecated for removal in next major version release. This field - will be superseded by `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or - `data`. - - Other services could use this to distinguish between a `web` and `worker` - role running as part of the service.' - example: background_tasks - flat_name: service.target.node.role - ignore_above: 1024 - level: extended - name: node.role - normalize: [] - original_fieldset: service - short: Deprecated role (singular) of the service node. - type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/generated/elasticsearch/composable/component/process.json b/generated/elasticsearch/composable/component/process.json index 81c4c03846..95dae57c88 100644 --- a/generated/elasticsearch/composable/component/process.json +++ b/generated/elasticsearch/composable/component/process.json @@ -1257,9 +1257,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, @@ -1503,9 +1500,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, diff --git a/generated/elasticsearch/composable/component/service.json b/generated/elasticsearch/composable/component/service.json index b9da4f32d1..4747762c28 100644 --- a/generated/elasticsearch/composable/component/service.json +++ b/generated/elasticsearch/composable/component/service.json @@ -34,10 +34,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -72,10 +68,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -128,10 +120,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" diff --git a/generated/elasticsearch/legacy/template.json b/generated/elasticsearch/legacy/template.json index 1a8d14b60e..9a6ccb1adb 100644 --- a/generated/elasticsearch/legacy/template.json +++ b/generated/elasticsearch/legacy/template.json @@ -3960,9 +3960,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, @@ -4206,9 +4203,6 @@ } } }, - "pgid": { - "type": "long" - }, "pid": { "type": "long" }, @@ -4906,10 +4900,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -4944,10 +4934,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" @@ -5000,10 +4986,6 @@ "ignore_above": 1024, "type": "keyword" }, - "role": { - "ignore_above": 1024, - "type": "keyword" - }, "roles": { "ignore_above": 1024, "type": "keyword" diff --git a/schemas/process.yml b/schemas/process.yml index abb5366d00..7dcbdce606 100644 --- a/schemas/process.yml +++ b/schemas/process.yml @@ -127,17 +127,6 @@ - type: match_only_text name: text - - name: pgid - format: string - level: extended - type: long - short: Deprecated identifier of the group of processes the process belongs to. - description: > - Deprecated for removal in next major version release. This field is superseded by - `process.group_leader.pid`. - - Identifier of the group of processes the process belongs to. - - name: command_line level: extended type: wildcard diff --git a/schemas/service.yml b/schemas/service.yml index ecfbc99ed2..0a1ae24b00 100644 --- a/schemas/service.yml +++ b/schemas/service.yml @@ -116,25 +116,6 @@ (e.g. multiple instances of the service running on the same host) - the node name can be manually set. - - name: node.role - level: extended - type: keyword - example: "background_tasks" - short: Deprecated role (singular) of the service node. - description: > - Deprecated for removal in next major version release. This field will be superseded by - `node.roles`. - - Role of a service node. - - This allows for distinction between different running roles of the same service. - - In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. - - In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. - - Other services could use this to distinguish between a `web` and `worker` role running as part of the service. - - name: node.roles level: extended type: keyword diff --git a/schemas/subsets/main.yml b/schemas/subsets/main.yml index 63b44449fc..beea72fac0 100644 --- a/schemas/subsets/main.yml +++ b/schemas/subsets/main.yml @@ -317,7 +317,6 @@ fields: name: {} pe: fields: "*" - pgid: {} pid: {} vpid: {} start: {} @@ -368,7 +367,6 @@ fields: name: {} pe: fields: "*" - pgid: {} pid: {} vpid: {} previous: From bfe092ece4e9d12e65f2ebe06a3ce997634f986e Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Thu, 5 Dec 2024 18:02:29 -0800 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.next.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md index 5e18c30826..024e496232 100644 --- a/CHANGELOG.next.md +++ b/CHANGELOG.next.md @@ -12,7 +12,7 @@ Thanks, you're awesome :-) --> #### Breaking changes -* Remove deprecated fields from previous major release; `process.pgid`, `service.node.role`, and inherited users. #999999 +* Remove deprecated fields from previous major release; `process.pgid`, `service.node.role`, and inherited users. #2410 #### Bugfixes From 35f3014468067045b335c1ee55bf90f6fbf494d6 Mon Sep 17 00:00:00 2001 From: Michael Wolf Date: Mon, 3 Feb 2025 19:55:46 -0800 Subject: [PATCH 3/3] Update generated files --- docs/fields/field-details.asciidoc | 26 +++++++ .../otel-mapping-summary.asciidoc | 2 +- experimental/generated/beats/fields.ecs.yml | 60 +++++++++++++++ experimental/generated/csv/fields.csv | 3 + experimental/generated/ecs/ecs_flat.yml | 71 ++++++++++++++++++ experimental/generated/ecs/ecs_nested.yml | 74 +++++++++++++++++++ .../composable/component/service.json | 12 +++ .../elasticsearch/legacy/template.json | 12 +++ generated/beats/fields.ecs.yml | 60 +++++++++++++++ generated/csv/fields.csv | 3 + generated/ecs/ecs_flat.yml | 71 ++++++++++++++++++ generated/ecs/ecs_nested.yml | 74 +++++++++++++++++++ .../composable/component/service.json | 12 +++ generated/elasticsearch/legacy/template.json | 12 +++ 14 files changed, 491 insertions(+), 1 deletion(-) diff --git a/docs/fields/field-details.asciidoc b/docs/fields/field-details.asciidoc index 266d7ec3f7..fee551b9ad 100644 --- a/docs/fields/field-details.asciidoc +++ b/docs/fields/field-details.asciidoc @@ -10142,6 +10142,32 @@ image:https://img.shields.io/badge/OpenTelemetry-4a5ca6?style=flat&logo=opentele // =============================================================== +| +[[field-service-node-role]] +<> + +a| Deprecated for removal in next major version release. This field will be superseded by `node.roles`. + +Role of a service node. + +This allows for distinction between different running roles of the same service. + +In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + +In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + +Other services could use this to distinguish between a `web` and `worker` role running as part of the service. + +type: keyword + + + +example: `background_tasks` + +| extended + +// =============================================================== + | [[field-service-node-roles]] <> diff --git a/docs/opentelemetry/otel-mapping-summary.asciidoc b/docs/opentelemetry/otel-mapping-summary.asciidoc index 6083c4861a..342601e1b7 100644 --- a/docs/opentelemetry/otel-mapping-summary.asciidoc +++ b/docs/opentelemetry/otel-mapping-summary.asciidoc @@ -815,7 +815,7 @@ h| Namespace | Process -^| <> +^| <> ^| https://opentelemetry.io/docs/specs/semconv/attributes-registry/process[33] ^| 15 ^| 2 diff --git a/experimental/generated/beats/fields.ecs.yml b/experimental/generated/beats/fields.ecs.yml index 0549860240..fd704c9e3b 100644 --- a/experimental/generated/beats/fields.ecs.yml +++ b/experimental/generated/beats/fields.ecs.yml @@ -8428,6 +8428,26 @@ provide uniqueness (e.g. multiple instances of the service running on the same host) - the node name can be manually set.' example: instance-0000000016 + - name: node.role + level: extended + type: keyword + ignore_above: 1024 + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + default_field: false - name: node.roles level: extended type: keyword @@ -8524,6 +8544,26 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false + - name: origin.node.role + level: extended + type: keyword + ignore_above: 1024 + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + default_field: false - name: origin.node.roles level: extended type: keyword @@ -8653,6 +8693,26 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false + - name: target.node.role + level: extended + type: keyword + ignore_above: 1024 + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + default_field: false - name: target.node.roles level: extended type: keyword diff --git a/experimental/generated/csv/fields.csv b/experimental/generated/csv/fields.csv index e6418c07e4..a851e99808 100644 --- a/experimental/generated/csv/fields.csv +++ b/experimental/generated/csv/fields.csv @@ -1082,6 +1082,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,service,service.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev+exp,true,service,service.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev+exp,true,service,service.node.name,keyword,extended,,instance-0000000016,Name of the service node. +9.0.0-dev+exp,true,service,service.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev+exp,true,service,service.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev+exp,true,service,service.origin.address,keyword,extended,,172.26.0.2:5432,Address of this service. 9.0.0-dev+exp,true,service,service.origin.environment,keyword,extended,,production,Environment of the service. @@ -1089,6 +1090,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,service,service.origin.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev+exp,true,service,service.origin.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev+exp,true,service,service.origin.node.name,keyword,extended,,instance-0000000016,Name of the service node. +9.0.0-dev+exp,true,service,service.origin.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev+exp,true,service,service.origin.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev+exp,true,service,service.origin.state,keyword,core,,,Current state of the service. 9.0.0-dev+exp,true,service,service.origin.type,keyword,core,,elasticsearch,The type of the service. @@ -1100,6 +1102,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev+exp,true,service,service.target.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev+exp,true,service,service.target.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev+exp,true,service,service.target.node.name,keyword,extended,,instance-0000000016,Name of the service node. +9.0.0-dev+exp,true,service,service.target.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev+exp,true,service,service.target.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev+exp,true,service,service.target.state,keyword,core,,,Current state of the service. 9.0.0-dev+exp,true,service,service.target.type,keyword,core,,elasticsearch,The type of the service. diff --git a/experimental/generated/ecs/ecs_flat.yml b/experimental/generated/ecs/ecs_flat.yml index 659a4a0a6e..232ace1ad6 100644 --- a/experimental/generated/ecs/ecs_flat.yml +++ b/experimental/generated/ecs/ecs_flat.yml @@ -14060,6 +14060,29 @@ service.node.name: stability: experimental short: Name of the service node. type: keyword +service.node.role: + dashed_name: service-node-role + description: 'Deprecated for removal in next major version release. This field will + be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + + Other services could use this to distinguish between a `web` and `worker` role + running as part of the service.' + example: background_tasks + flat_name: service.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + short: Deprecated role (singular) of the service node. + type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -14192,6 +14215,30 @@ service.origin.node.name: original_fieldset: service short: Name of the service node. type: keyword +service.origin.node.role: + dashed_name: service-origin-node-role + description: 'Deprecated for removal in next major version release. This field will + be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + + Other services could use this to distinguish between a `web` and `worker` role + running as part of the service.' + example: background_tasks + flat_name: service.origin.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -14378,6 +14425,30 @@ service.target.node.name: original_fieldset: service short: Name of the service node. type: keyword +service.target.node.role: + dashed_name: service-target-node-role + description: 'Deprecated for removal in next major version release. This field will + be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + + Other services could use this to distinguish between a `web` and `worker` role + running as part of the service.' + example: background_tasks + flat_name: service.target.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/experimental/generated/ecs/ecs_nested.yml b/experimental/generated/ecs/ecs_nested.yml index 047fc587bf..a6331615c2 100644 --- a/experimental/generated/ecs/ecs_nested.yml +++ b/experimental/generated/ecs/ecs_nested.yml @@ -16734,6 +16734,30 @@ service: stability: experimental short: Name of the service node. type: keyword + service.node.role: + dashed_name: service-node-role + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + flat_name: service.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + short: Deprecated role (singular) of the service node. + type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -16867,6 +16891,31 @@ service: original_fieldset: service short: Name of the service node. type: keyword + service.origin.node.role: + dashed_name: service-origin-node-role + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + flat_name: service.origin.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -17054,6 +17103,31 @@ service: original_fieldset: service short: Name of the service node. type: keyword + service.target.node.role: + dashed_name: service-target-node-role + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + flat_name: service.target.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/experimental/generated/elasticsearch/composable/component/service.json b/experimental/generated/elasticsearch/composable/component/service.json index e336b032e2..b75e677058 100644 --- a/experimental/generated/elasticsearch/composable/component/service.json +++ b/experimental/generated/elasticsearch/composable/component/service.json @@ -34,6 +34,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -69,6 +73,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -122,6 +130,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", diff --git a/experimental/generated/elasticsearch/legacy/template.json b/experimental/generated/elasticsearch/legacy/template.json index eb3aced72a..fdf0899b3c 100644 --- a/experimental/generated/elasticsearch/legacy/template.json +++ b/experimental/generated/elasticsearch/legacy/template.json @@ -4969,6 +4969,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -5004,6 +5008,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -5057,6 +5065,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", diff --git a/generated/beats/fields.ecs.yml b/generated/beats/fields.ecs.yml index 89aa27fbd8..9c72e1d110 100644 --- a/generated/beats/fields.ecs.yml +++ b/generated/beats/fields.ecs.yml @@ -8378,6 +8378,26 @@ provide uniqueness (e.g. multiple instances of the service running on the same host) - the node name can be manually set.' example: instance-0000000016 + - name: node.role + level: extended + type: keyword + ignore_above: 1024 + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + default_field: false - name: node.roles level: extended type: keyword @@ -8474,6 +8494,26 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false + - name: origin.node.role + level: extended + type: keyword + ignore_above: 1024 + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + default_field: false - name: origin.node.roles level: extended type: keyword @@ -8603,6 +8643,26 @@ same host) - the node name can be manually set.' example: instance-0000000016 default_field: false + - name: target.node.role + level: extended + type: keyword + ignore_above: 1024 + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + default_field: false - name: target.node.roles level: extended type: keyword diff --git a/generated/csv/fields.csv b/generated/csv/fields.csv index 934313f13e..e88f3df281 100644 --- a/generated/csv/fields.csv +++ b/generated/csv/fields.csv @@ -1075,6 +1075,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,service,service.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev,true,service,service.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev,true,service,service.node.name,keyword,extended,,instance-0000000016,Name of the service node. +9.0.0-dev,true,service,service.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev,true,service,service.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev,true,service,service.origin.address,keyword,extended,,172.26.0.2:5432,Address of this service. 9.0.0-dev,true,service,service.origin.environment,keyword,extended,,production,Environment of the service. @@ -1082,6 +1083,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,service,service.origin.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev,true,service,service.origin.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev,true,service,service.origin.node.name,keyword,extended,,instance-0000000016,Name of the service node. +9.0.0-dev,true,service,service.origin.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev,true,service,service.origin.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev,true,service,service.origin.state,keyword,core,,,Current state of the service. 9.0.0-dev,true,service,service.origin.type,keyword,core,,elasticsearch,The type of the service. @@ -1093,6 +1095,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description 9.0.0-dev,true,service,service.target.id,keyword,core,,d37e5ebfe0ae6c4972dbe9f0174a1637bb8247f6,Unique identifier of the running service. 9.0.0-dev,true,service,service.target.name,keyword,core,,elasticsearch-metrics,Name of the service. 9.0.0-dev,true,service,service.target.node.name,keyword,extended,,instance-0000000016,Name of the service node. +9.0.0-dev,true,service,service.target.node.role,keyword,extended,,background_tasks,Deprecated role (singular) of the service node. 9.0.0-dev,true,service,service.target.node.roles,keyword,extended,array,"[""ui"", ""background_tasks""]",Roles of the service node. 9.0.0-dev,true,service,service.target.state,keyword,core,,,Current state of the service. 9.0.0-dev,true,service,service.target.type,keyword,core,,elasticsearch,The type of the service. diff --git a/generated/ecs/ecs_flat.yml b/generated/ecs/ecs_flat.yml index 1b22b2e79d..678a7c0a84 100644 --- a/generated/ecs/ecs_flat.yml +++ b/generated/ecs/ecs_flat.yml @@ -13991,6 +13991,29 @@ service.node.name: stability: experimental short: Name of the service node. type: keyword +service.node.role: + dashed_name: service-node-role + description: 'Deprecated for removal in next major version release. This field will + be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + + Other services could use this to distinguish between a `web` and `worker` role + running as part of the service.' + example: background_tasks + flat_name: service.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + short: Deprecated role (singular) of the service node. + type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -14123,6 +14146,30 @@ service.origin.node.name: original_fieldset: service short: Name of the service node. type: keyword +service.origin.node.role: + dashed_name: service-origin-node-role + description: 'Deprecated for removal in next major version release. This field will + be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + + Other services could use this to distinguish between a `web` and `worker` role + running as part of the service.' + example: background_tasks + flat_name: service.origin.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -14309,6 +14356,30 @@ service.target.node.name: original_fieldset: service short: Name of the service node. type: keyword +service.target.node.role: + dashed_name: service-target-node-role + description: 'Deprecated for removal in next major version release. This field will + be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or `data`. + + Other services could use this to distinguish between a `web` and `worker` role + running as part of the service.' + example: background_tasks + flat_name: service.target.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/generated/ecs/ecs_nested.yml b/generated/ecs/ecs_nested.yml index dd266a319e..cc958b9e02 100644 --- a/generated/ecs/ecs_nested.yml +++ b/generated/ecs/ecs_nested.yml @@ -16654,6 +16654,30 @@ service: stability: experimental short: Name of the service node. type: keyword + service.node.role: + dashed_name: service-node-role + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + flat_name: service.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + short: Deprecated role (singular) of the service node. + type: keyword service.node.roles: dashed_name: service-node-roles description: 'Roles of a service node. @@ -16787,6 +16811,31 @@ service: original_fieldset: service short: Name of the service node. type: keyword + service.origin.node.role: + dashed_name: service-origin-node-role + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + flat_name: service.origin.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.origin.node.roles: dashed_name: service-origin-node-roles description: 'Roles of a service node. @@ -16974,6 +17023,31 @@ service: original_fieldset: service short: Name of the service node. type: keyword + service.target.node.role: + dashed_name: service-target-node-role + description: 'Deprecated for removal in next major version release. This field + will be superseded by `node.roles`. + + Role of a service node. + + This allows for distinction between different running roles of the same service. + + In the case of Kibana, the `service.node.role` could be `ui` or `background_tasks`. + + In the case of Elasticsearch, the `service.node.role` could be `master` or + `data`. + + Other services could use this to distinguish between a `web` and `worker` + role running as part of the service.' + example: background_tasks + flat_name: service.target.node.role + ignore_above: 1024 + level: extended + name: node.role + normalize: [] + original_fieldset: service + short: Deprecated role (singular) of the service node. + type: keyword service.target.node.roles: dashed_name: service-target-node-roles description: 'Roles of a service node. diff --git a/generated/elasticsearch/composable/component/service.json b/generated/elasticsearch/composable/component/service.json index 295ae8efdf..b71751b1df 100644 --- a/generated/elasticsearch/composable/component/service.json +++ b/generated/elasticsearch/composable/component/service.json @@ -34,6 +34,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -69,6 +73,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -122,6 +130,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", diff --git a/generated/elasticsearch/legacy/template.json b/generated/elasticsearch/legacy/template.json index 7a83371d3f..02f880f6ef 100644 --- a/generated/elasticsearch/legacy/template.json +++ b/generated/elasticsearch/legacy/template.json @@ -4927,6 +4927,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -4962,6 +4966,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none", @@ -5015,6 +5023,10 @@ "ignore_above": 1024, "type": "keyword" }, + "role": { + "ignore_above": 1024, + "type": "keyword" + }, "roles": { "ignore_above": 1024, "synthetic_source_keep": "none",