Skip to content

Commit

Permalink
Add process.group fields to generated schemas (elastic#2335)
Browse files Browse the repository at this point in the history
Add process.group fields as the effective group for the process schema. process.group was (probably mistakenly) being excluded from the schema, as it wasn't part of schemas/subsets/main.yml. The other related process group fields are already included in the schema (real_group, saved_group), and process.group is defined with field re-use in group.yml.

---------

Co-authored-by: Alexandra Konrad <[email protected]>
  • Loading branch information
mjwolf and trisch-me authored May 22, 2024
1 parent 247d128 commit 4b2c7c6
Show file tree
Hide file tree
Showing 14 changed files with 169 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Thanks, you're awesome :-) -->
* Advanced `process.env_vars` to GA. #2315
* Advanced `process.io` and `process.tty` fields to GA. #2317
* Added `threat.indicator.id`. #2324
* Added `process.group` to generated schemas. #2335

#### Improvements

Expand Down
12 changes: 12 additions & 0 deletions experimental/generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5496,6 +5496,18 @@
start).'
example: 137
default_field: false
- name: group.id
level: extended
type: keyword
ignore_above: 1024
description: Unique identifier for the group on the system/platform.
default_field: false
- name: group.name
level: extended
type: keyword
ignore_above: 1024
description: Name of the group.
default_field: false
- name: group_leader.args
level: extended
type: keyword
Expand Down
2 changes: 2 additions & 0 deletions experimental/generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -690,6 +690,8 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
8.12.0-dev+exp,true,process,process.executable,keyword,extended,,/usr/bin/ssh,Absolute path to the process executable.
8.12.0-dev+exp,true,process,process.executable.text,match_only_text,extended,,/usr/bin/ssh,Absolute path to the process executable.
8.12.0-dev+exp,true,process,process.exit_code,long,extended,,137,The exit code of the process.
8.12.0-dev+exp,true,process,process.group.id,keyword,extended,,,Unique identifier for the group on the system/platform.
8.12.0-dev+exp,true,process,process.group.name,keyword,extended,,,Name of the group.
8.12.0-dev+exp,true,process,process.group_leader.args,keyword,extended,array,"[""/usr/bin/ssh"", ""-l"", ""user"", ""10.0.0.16""]",Array of process arguments.
8.12.0-dev+exp,true,process,process.group_leader.args_count,long,extended,,4,Length of the process.args array.
8.12.0-dev+exp,true,process,process.group_leader.command_line,wildcard,extended,,/usr/bin/ssh -l user 10.0.0.16,Full command line that started the process.
Expand Down
22 changes: 22 additions & 0 deletions experimental/generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8930,6 +8930,28 @@ process.exit_code:
normalize: []
short: The exit code of the process.
type: long
process.group.id:
dashed_name: process-group-id
description: Unique identifier for the group on the system/platform.
flat_name: process.group.id
ignore_above: 1024
level: extended
name: id
normalize: []
original_fieldset: group
short: Unique identifier for the group on the system/platform.
type: keyword
process.group.name:
dashed_name: process-group-name
description: Name of the group.
flat_name: process.group.name
ignore_above: 1024
level: extended
name: name
normalize: []
original_fieldset: group
short: Name of the group.
type: keyword
process.group_leader.args:
dashed_name: process-group-leader-args
description: 'Array of process arguments, starting with the absolute path to the
Expand Down
22 changes: 22 additions & 0 deletions experimental/generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11140,6 +11140,28 @@ process:
normalize: []
short: The exit code of the process.
type: long
process.group.id:
dashed_name: process-group-id
description: Unique identifier for the group on the system/platform.
flat_name: process.group.id
ignore_above: 1024
level: extended
name: id
normalize: []
original_fieldset: group
short: Unique identifier for the group on the system/platform.
type: keyword
process.group.name:
dashed_name: process-group-name
description: Name of the group.
flat_name: process.group.name
ignore_above: 1024
level: extended
name: name
normalize: []
original_fieldset: group
short: Name of the group.
type: keyword
process.group_leader.args:
dashed_name: process-group-leader-args
description: 'Array of process arguments, starting with the absolute path to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,18 @@
"exit_code": {
"type": "long"
},
"group": {
"properties": {
"id": {
"ignore_above": 1024,
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"group_leader": {
"properties": {
"args": {
Expand Down
12 changes: 12 additions & 0 deletions experimental/generated/elasticsearch/legacy/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -3202,6 +3202,18 @@
"exit_code": {
"type": "long"
},
"group": {
"properties": {
"id": {
"ignore_above": 1024,
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"group_leader": {
"properties": {
"args": {
Expand Down
12 changes: 12 additions & 0 deletions generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5446,6 +5446,18 @@
start).'
example: 137
default_field: false
- name: group.id
level: extended
type: keyword
ignore_above: 1024
description: Unique identifier for the group on the system/platform.
default_field: false
- name: group.name
level: extended
type: keyword
ignore_above: 1024
description: Name of the group.
default_field: false
- name: group_leader.args
level: extended
type: keyword
Expand Down
2 changes: 2 additions & 0 deletions generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,8 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
8.12.0-dev,true,process,process.executable,keyword,extended,,/usr/bin/ssh,Absolute path to the process executable.
8.12.0-dev,true,process,process.executable.text,match_only_text,extended,,/usr/bin/ssh,Absolute path to the process executable.
8.12.0-dev,true,process,process.exit_code,long,extended,,137,The exit code of the process.
8.12.0-dev,true,process,process.group.id,keyword,extended,,,Unique identifier for the group on the system/platform.
8.12.0-dev,true,process,process.group.name,keyword,extended,,,Name of the group.
8.12.0-dev,true,process,process.group_leader.args,keyword,extended,array,"[""/usr/bin/ssh"", ""-l"", ""user"", ""10.0.0.16""]",Array of process arguments.
8.12.0-dev,true,process,process.group_leader.args_count,long,extended,,4,Length of the process.args array.
8.12.0-dev,true,process,process.group_leader.command_line,wildcard,extended,,/usr/bin/ssh -l user 10.0.0.16,Full command line that started the process.
Expand Down
22 changes: 22 additions & 0 deletions generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8861,6 +8861,28 @@ process.exit_code:
normalize: []
short: The exit code of the process.
type: long
process.group.id:
dashed_name: process-group-id
description: Unique identifier for the group on the system/platform.
flat_name: process.group.id
ignore_above: 1024
level: extended
name: id
normalize: []
original_fieldset: group
short: Unique identifier for the group on the system/platform.
type: keyword
process.group.name:
dashed_name: process-group-name
description: Name of the group.
flat_name: process.group.name
ignore_above: 1024
level: extended
name: name
normalize: []
original_fieldset: group
short: Name of the group.
type: keyword
process.group_leader.args:
dashed_name: process-group-leader-args
description: 'Array of process arguments, starting with the absolute path to the
Expand Down
22 changes: 22 additions & 0 deletions generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11060,6 +11060,28 @@ process:
normalize: []
short: The exit code of the process.
type: long
process.group.id:
dashed_name: process-group-id
description: Unique identifier for the group on the system/platform.
flat_name: process.group.id
ignore_above: 1024
level: extended
name: id
normalize: []
original_fieldset: group
short: Unique identifier for the group on the system/platform.
type: keyword
process.group.name:
dashed_name: process-group-name
description: Name of the group.
flat_name: process.group.name
ignore_above: 1024
level: extended
name: name
normalize: []
original_fieldset: group
short: Name of the group.
type: keyword
process.group_leader.args:
dashed_name: process-group-leader-args
description: 'Array of process arguments, starting with the absolute path to
Expand Down
12 changes: 12 additions & 0 deletions generated/elasticsearch/composable/component/process.json
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,18 @@
"exit_code": {
"type": "long"
},
"group": {
"properties": {
"id": {
"ignore_above": 1024,
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"group_leader": {
"properties": {
"args": {
Expand Down
12 changes: 12 additions & 0 deletions generated/elasticsearch/legacy/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -3160,6 +3160,18 @@
"exit_code": {
"type": "long"
},
"group": {
"properties": {
"id": {
"ignore_above": 1024,
"type": "keyword"
},
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
},
"group_leader": {
"properties": {
"args": {
Expand Down
4 changes: 4 additions & 0 deletions schemas/subsets/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@ fields:
args: {}
args_count: {}
executable: {}
group:
fields:
id: {}
name: {}
real_group:
fields:
id: {}
Expand Down

0 comments on commit 4b2c7c6

Please sign in to comment.