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

Support for Logstash 8.0.x #152

Merged
merged 8 commits into from
Aug 9, 2022

Conversation

deepdatta
Copy link
Contributor

@deepdatta deepdatta commented Aug 5, 2022

Description

Supports running the plugin with Logstash 8.x without explicitly setting ecs_compatibility=>disabled
Adds ecs compatible default templates to work with default ecs_compatibility values.

Signed-off-by: Deep Datta deedatta@amazon.com

Issues Resolved

#132

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has documentation added
  • Commits are signed as per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@deepdatta deepdatta requested a review from a team as a code owner August 5, 2022 00:07
Signed-off-by: Deep Datta <deedatta@amazon.com>
Signed-off-by: Deep Datta <deedatta@amazon.com>
Signed-off-by: Deep Datta <deedatta@amazon.com>
… of 7.13.2. Also add v8.3.2 in the test matrix for the github CI workflow.

Signed-off-by: Deep Datta <deedatta@amazon.com>
@deepdatta deepdatta force-pushed the ecs_compatibility_v8 branch from fa500d5 to bef2b2f Compare August 5, 2022 00:13
…stro.

This was causing a newly added integration test to fail for OpenDistro

Signed-off-by: Deep Datta <deedatta@amazon.com>
@@ -7,10 +7,10 @@ services:
context: ../../
dockerfile: scripts/Dockerfile
args:
- LOGSTASH_VERSION=${LOGSTASH_VERSION:-7.13.2}
Copy link
Member

Choose a reason for hiding this comment

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

why are we changing this default value to 8.x?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I made the change because its the latest version of Logstash and it might be good to test features/fixes against it given user interest in these versions as seen in issues like #149. Let me know if its better to keep the old version.

Copy link
Member

Choose a reason for hiding this comment

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

No strong opinion against this change, just that we might end up in updating this for every new version.

@VijayanB
Copy link
Member

VijayanB commented Aug 8, 2022

…se instead of storing them in the repo.

However the ecs-v8 schemas are stored since we needed to substitute the following data types that are not supported by OpenSearch
match_only_text -> text (with norms:false)
constant_keyword -> keyword
wildcard -> keyword

Signed-off-by: Deep Datta <deedatta@amazon.com>
@deepdatta
Copy link
Contributor Author

Shouldn't this be updated too? https://github.com/opensearch-project/logstash-output-opensearch/blob/main/Rakefile#L12

Thanks Vijayan for pointing this out, this file was pulling the ecs schemas at build time from the ecs GitHub release repo. I have made changes to the script to pull the ecs_v1 schemas and name them as expected by our plugin, instead of having them in our repo. However I have left the v8 schemas in the repo as I needed to modify 3 field types in them to make it compatible with OpenSearch since https://www.elastic.co/guide/en/ecs/current/ecs-faq.html#type-interop says its ok to substitute field types from the same family.

Copy link
Member

@dlvenable dlvenable left a comment

Choose a reason for hiding this comment

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

Thanks for updating the download process. This approach makes sense for v1.

Copy link
Member

@VijayanB VijayanB left a comment

Choose a reason for hiding this comment

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

LGTM! Thank you for addressing the feedback comments.

@VijayanB
Copy link
Member

VijayanB commented Aug 9, 2022

@deepdatta deepdatta merged commit 9f08019 into opensearch-project:main Aug 9, 2022
@deepdatta deepdatta linked an issue Aug 11, 2022 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support for Logstash 8.0.x
3 participants