Skip to content
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.

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

Add event.dataset field #9408

Merged
merged 1 commit into from
Dec 14, 2018
Merged

Add event.dataset field #9408

merged 1 commit into from
Dec 14, 2018

Conversation

andrewvc
Copy link
Contributor

@andrewvc andrewvc commented Dec 5, 2018

This brings us closer to ECS compliance by adding the event.dataset field.

All heartbeat events are considered part of the 'uptime' dataset, even though their data may differ.

The key thing defining this dataset is the presence of the monitor.status field.

@andrewvc andrewvc added enhancement needs_backport PR is waiting to be backported to other branches. Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team labels Dec 5, 2018
@andrewvc andrewvc requested a review from ruflin December 5, 2018 21:13
@elasticmachine
Copy link
Collaborator

Pinging @elastic/uptime

@ruflin ruflin mentioned this pull request Dec 6, 2018
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Needs a changelog entry.

@andrewvc andrewvc self-assigned this Dec 7, 2018
dev-tools/ecs-migration.yml Outdated Show resolved Hide resolved
@ruflin
Copy link
Contributor

ruflin commented Dec 10, 2018

I sugget we do different PR's for the different fields which should be mapped to ECS. Could you open a meta Github issue to track the fields that need change?

@andrewvc
Copy link
Contributor Author

@ruflin just removed the extra commit for monitor.url and added the changelog.

Am I good to merge? (was the previously LGTM approval enough BTW?).

@andrewvc
Copy link
Contributor Author

jenkins, retest this please

(build timed out waiting for an OSX box to become available)

@ruflin
Copy link
Contributor

ruflin commented Dec 13, 2018

The two tests / builds that were failing here can be ignored. I'm already working on fixing them / making them more stable.

@ruflin
Copy link
Contributor

ruflin commented Dec 13, 2018

If you want a green CI, try to rebase as tests should now be fixed in master. Mac builds will still be slow.

@andrewvc andrewvc force-pushed the add-ecs-fields branch 3 times, most recently from 0e16448 to 9a9e12e Compare December 13, 2018 23:33
@andrewvc andrewvc force-pushed the add-ecs-fields branch 3 times, most recently from 9a9e12e to 9e62892 Compare December 14, 2018 02:51
@andrewvc
Copy link
Contributor Author

jenkins, retest this please

This brings us closer to ECS compliance by adding the event.dataset field.

All heartbeat events are considered part of the 'uptime' dataset, even though their data may differ.

The key thing defining this dataset is the presence of the `monitor.status` field
@ruflin
Copy link
Contributor

ruflin commented Dec 14, 2018

@andrewvc Still good to go. Ignore the failures please.

@andrewvc andrewvc merged commit 5e54acb into elastic:master Dec 14, 2018
andrewvc added a commit to andrewvc/beats that referenced this pull request Dec 14, 2018
This brings us closer to ECS compliance by adding the event.dataset field.

All heartbeat events are considered part of the 'uptime' dataset, even though their data may differ.

The key thing defining this dataset is the presence of the `monitor.status` field

(cherry picked from commit 5e54acb)
@andrewvc andrewvc added v6.6.0 and removed needs_backport PR is waiting to be backported to other branches. labels Dec 14, 2018
@andrewvc andrewvc mentioned this pull request Dec 18, 2018
7 tasks
andrewvc added a commit that referenced this pull request Dec 20, 2018
* Add event.dataset field (#9408)

This brings us closer to ECS compliance by adding the event.dataset field.

All heartbeat events are considered part of the 'uptime' dataset, even though their data may differ.

The key thing defining this dataset is the presence of the `monitor.status` field

(cherry picked from commit 5e54acb)

* Fix test failures by cleaning more keys

* Add event.dataset to common fields
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Heartbeat Team:obs-ds-hosted-services Label for the Observability Hosted Services team v6.6.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants