Skip to content

model: ECS for 6.x #1609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 41 commits into from
Dec 17, 2018
Merged

model: ECS for 6.x #1609

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a6af765
add ECS aliases
graphaelli Nov 28, 2018
701050d
exclude aliases
graphaelli Nov 30, 2018
ceeffdb
copy ECS fields where required
graphaelli Nov 29, 2018
99c19c7
take ownership of host.name
graphaelli Nov 30, 2018
75a4085
update request url fields
graphaelli Nov 30, 2018
4c40f12
map meta.cloud.*
graphaelli Dec 3, 2018
bb6dd7b
Merge remote-tracking branch 'elastic/6.x' into ecs-6.x
graphaelli Dec 5, 2018
e122d1d
account for new fields
graphaelli Dec 5, 2018
3a7330a
add fields missing from migration log + test
graphaelli Dec 5, 2018
4c4f153
copy context.process.argv to process.args
graphaelli Dec 5, 2018
4702718
alias host.hostname to context.system.hostname, instead of host.name
graphaelli Dec 6, 2018
1b24cdd
fix process.args exception
graphaelli Dec 6, 2018
5f5110f
add event.timezone
graphaelli Dec 7, 2018
bbd74c5
Update changelog for 6.5 (#1626) (#1627)
simitt Dec 6, 2018
1623c46
Merge pull request #1613 from kuisathaverat/legacy-paths (#1633)
graphaelli Dec 10, 2018
a1691ff
[6.x] package docker container images with mage (#1632)
graphaelli Dec 10, 2018
db16a71
<update beats here>
graphaelli Dec 10, 2018
8430094
regenerate fields doc with updated script
graphaelli Dec 10, 2018
3ce04c0
add non-indexed fields
graphaelli Dec 10, 2018
bd15cba
add exceptions for all non-indexed fields
graphaelli Dec 11, 2018
eb87599
sync with latest ECS
graphaelli Dec 11, 2018
c72fbd1
remove fields from processors
graphaelli Dec 11, 2018
fe3f320
sort
graphaelli Dec 11, 2018
444fbf8
consolidate context.http
graphaelli Dec 11, 2018
81303c6
add more non-indexed fields
graphaelli Dec 11, 2018
2948e80
alias user.ip and user_agent.original.text
graphaelli Dec 12, 2018
8e8880b
Merge remote-tracking branch 'elastic/6.x' into ecs-6.x
graphaelli Dec 12, 2018
b444e4b
alias observer.listening -> listening
graphaelli Dec 12, 2018
6301a52
Merge remote-tracking branch 'elastic/6.x' into ecs-6.x
graphaelli Dec 13, 2018
9526e03
restore host metadata fields that are not conflicting
graphaelli Dec 13, 2018
7c83ca4
account for beats ecs migrations
graphaelli Dec 13, 2018
da90de7
alias client.ip -> context.user.ip
graphaelli Dec 13, 2018
5ebf75e
alias http.response.status_code -> context.response.status_code
graphaelli Dec 13, 2018
629356d
alias http.response.finished -> context.response.finished
graphaelli Dec 13, 2018
c45b98d
mapping complete?
graphaelli Dec 13, 2018
2a8fecf
pep8
graphaelli Dec 13, 2018
1004b8f
alias process.args -> context.process.argv instead of copying
graphaelli Dec 13, 2018
a548225
Merge remote-tracking branch 'elastic/6.x' into ecs-6.x
graphaelli Dec 14, 2018
cd12363
remove process.args
graphaelli Dec 14, 2018
304bcc7
unit test ECS transformations on transactions
graphaelli Dec 14, 2018
fb54f5e
remove context.tags -> labels copy
graphaelli Dec 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions _meta/ecs-migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,27 @@
- from: beat.version
to: agent.server.version

- from: meta.cloud.availability_zone
to: cloud.availability_zone

- from: meta.cloud.instance_id
to: cloud.instance.id

- from: meta.cloud.instance_name
to: cloud.instance.name

- from: meta.cloud.machine_type
to: cloud.machine.type

- from: meta.cloud.project_id
to: cloud.project.id

- from: meta.cloud.provider
to: cloud.provider

- from: meta.cloud.region
to: cloud.region

- from: context.service.agent.name
to: agent.name

Expand Down
32 changes: 32 additions & 0 deletions _meta/fields.common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,38 @@
type: alias
path: context.service.agent.version

- name: cloud
type: group
dynamic: false
fields:
- name: availability_zone
type: alias
path: meta.cloud.availability_zone

- name: instance.id
type: alias
path: meta.cloud.instance_id

- name: instance.name
type: alias
path: meta.cloud.instance_name

- name: machine.type
type: alias
path: meta.cloud.machine_type

- name: project.id
type: alias
path: meta.cloud.project_id

- name: provider
type: alias
path: meta.cloud.provider

- name: region
type: alias
path: meta.cloud.region

- name: container
type: group
dynamic: false
Expand Down
50 changes: 50 additions & 0 deletions docs/fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,56 @@ type: alias
--


*`meta.cloud.availability_zone`*::
+
--
type: alias

--

*`meta.cloud.instance_id`*::
+
--
type: alias

--

*`meta.cloud.instance_name`*::
+
--
type: alias

--

*`meta.cloud.machine_type`*::
+
--
type: alias

--

*`meta.cloud.project_id`*::
+
--
type: alias

--

*`meta.cloud.provider`*::
+
--
type: alias

--

*`meta.cloud.region`*::
+
--
type: alias

--


*`docker.container.id`*::
+
--
Expand Down
2 changes: 1 addition & 1 deletion include/fields.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions tests/system/test_ecs_mappings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ def test_ecs_migration(self):
"listening",
"kubernetes.annotations", "kubernetes.container.image", "kubernetes.container.name", "kubernetes.labels",
"kubernetes.namespace", "kubernetes.node.name", "kubernetes.pod.name", "kubernetes.pod.uid",
"meta.cloud.availability_zone", "meta.cloud.instance_id", "meta.cloud.instance_name",
"meta.cloud.machine_type", "meta.cloud.project_id", "meta.cloud.provider", "meta.cloud.region",
"parent.id",
"processor.event", "processor.name",
"sourcemap.bundle_filepath", "sourcemap.service.name", "sourcemap.service.version",
Expand Down