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

Migrate fileset to ECS #8879

Merged
merged 1 commit into from
Nov 6, 2018
Merged

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Nov 1, 2018

The following fields were migrated to ECS:

  • fileset.name -> event.dataset
  • fileset.module -> event.module

Changes:

  • Update generated files
  • Update tests
  • Update changelog
  • Update migration file

@ruflin ruflin added in progress Pull request is currently in progress. ecs labels Nov 1, 2018
Copy link
Contributor

@webmat webmat left a comment

Choose a reason for hiding this comment

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

I'm good with field this rename as is.

I can't comment wrt everything that needs to change in order to make it so, however :-)

@ruflin ruflin force-pushed the fileset-ecs-migration branch 2 times, most recently from 12eadf8 to cf4d448 Compare November 6, 2018 07:34
@ruflin ruflin added review and removed in progress Pull request is currently in progress. labels Nov 6, 2018
The following fields were migrated to ECS:

* fileset.name -> event.dataset
* fileset.module -> event.module

Changes:

* Update generated files
* Update tests
* Update changelog
* Update migration file
@ruflin ruflin changed the title [WIP] Migrate fileset to ECS Migrate fileset to ECS Nov 6, 2018
@ruflin ruflin mentioned this pull request Nov 6, 2018
@ruflin
Copy link
Member Author

ruflin commented Nov 6, 2018

Test failure is not related.

Copy link
Contributor

@ph ph left a comment

Choose a reason for hiding this comment

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

@ruflin I presume we will make the changes on the dashboard in a followup PR using the ecs migration yaml file?

x-pack/filebeat/module/suricata/_meta/kibana/6/dashboard/Filebeat-Suricata-Overview.json
448:                  "key": "fileset.module",
459:                    "fileset.module": {
694:                  "key": "fileset.module",
705:                    "fileset.module": {
``

@@ -11,7 +11,17 @@
# # Copy to is useful for fields where multiple fields map to the same ECS field
# copy_to: true-if-field-should-be-copied-to-target-in-6x

Copy link
Contributor

Choose a reason for hiding this comment

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

<3 this file

@@ -176,7 +176,7 @@ def _test_expected_events(self, test_file, objects):
clean_keys(obj)

# Remove timestamp for comparison where timestamp is not part of the log line
if obj["fileset.module"] == "icinga" and obj["fileset.name"] == "startup":
if obj["event.module"] == "icinga" and obj["event.dataset"] == "startup":
Copy link
Contributor

Choose a reason for hiding this comment

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

I've seen that hack too, I think we could add a test.json inside the module to configure the assertions, to do in another PR of course.

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, would be nice to do it differently.

@ruflin
Copy link
Member Author

ruflin commented Nov 6, 2018

@ph For the dashboards: Yes plan is to hopefully be able to do it in an automated way.

@ruflin ruflin merged commit 6535112 into elastic:master Nov 6, 2018
@ruflin ruflin deleted the fileset-ecs-migration branch November 6, 2018 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants