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

Updates the Data Prepper S3 source documentation #3813

Merged
merged 16 commits into from
Apr 25, 2023

Conversation

dlvenable
Copy link
Member

@dlvenable dlvenable commented Apr 19, 2023

Description

This PR includes the following changes:

  • Adds usage instructions
  • Includes information on how to use codecs
  • Removes irrelevant sections.
  • Adds some missing configurations
  • Adds new configurations for 2.2

Issues Resolved

N/A

Checklist

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

…ructions for usage and new features in 2.2. Includes some clean-up as well.

Signed-off-by: David Venable <[email protected]>
@dlvenable
Copy link
Member Author

@carolxob , @Naarcha-AWS : I created this PR to help with the S3 source documentation.

@Naarcha-AWS Naarcha-AWS self-assigned this Apr 20, 2023
@Naarcha-AWS
Copy link
Collaborator

@dlvenable: Added edits to the grammar and formatting. Going to pass this into Doc review now.

@Naarcha-AWS Naarcha-AWS added 4 - Doc review PR: Doc review in progress backport 2.5 PR: Backport label for 2.5 backport 2.6 PR: Backport label for 2.6 labels Apr 25, 2023
Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
@Naarcha-AWS Naarcha-AWS added 5 - Editorial review PR: Editorial review in progress and removed 4 - Doc review PR: Doc review in progress labels Apr 25, 2023
Copy link
Collaborator

@natebower natebower left a comment

Choose a reason for hiding this comment

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

@Naarcha-AWS Please see my comments and changes and tag me on just the text we add to introduce the tables so that I can approve. Thanks!

_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved
_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved
_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved
_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved
_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved
_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved

Option | Required | Type | Description
:--- |:---------|:------------| :---
type | No | String | The type of JSON. May be either `DOCUMENT` or `LINES`. Maps directly to the [Type](https://docs.aws.amazon.com/AmazonS3/latest/API/API_JSONInput.html#AmazonS3-Type-JSONInput-Type) property.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Insert the noun after "JSON". The type of JSON what?

_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved

## Example: Uncompressed logs

The following pipeline.yaml shows a minimum configuration for reading uncompressed newline-delimited logs.
Copy link
Collaborator

Choose a reason for hiding this comment

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

"the" minimum configuration?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Changed

_data-prepper/pipelines/configuration/sources/s3.md Outdated Show resolved Hide resolved
Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Copy link
Collaborator

@natebower natebower left a comment

Choose a reason for hiding this comment

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

LGTM

@natebower natebower removed the 5 - Editorial review PR: Editorial review in progress label Apr 25, 2023
@Naarcha-AWS Naarcha-AWS merged commit aa2033c into opensearch-project:main Apr 25, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 25, 2023
* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.

Signed-off-by: David Venable <[email protected]>

* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

* Apply suggestions from code review

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

---------

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
(cherry picked from commit aa2033c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 25, 2023
* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.

Signed-off-by: David Venable <[email protected]>

* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

* Apply suggestions from code review

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

---------

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
(cherry picked from commit aa2033c)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Naarcha-AWS added a commit that referenced this pull request Apr 25, 2023
* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.



* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update s3.md

* Apply suggestions from code review




* Update _data-prepper/pipelines/configuration/sources/s3.md



* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review




* Update _data-prepper/pipelines/configuration/sources/s3.md



* Update _data-prepper/pipelines/configuration/sources/s3.md



* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md



---------






(cherry picked from commit aa2033c)

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
Naarcha-AWS added a commit that referenced this pull request Apr 25, 2023
* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.



* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update s3.md

* Apply suggestions from code review




* Update _data-prepper/pipelines/configuration/sources/s3.md



* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review




* Update _data-prepper/pipelines/configuration/sources/s3.md



* Update _data-prepper/pipelines/configuration/sources/s3.md



* Update _data-prepper/pipelines/configuration/sources/s3.md




* Update _data-prepper/pipelines/configuration/sources/s3.md



---------






(cherry picked from commit aa2033c)

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
Naarcha-AWS added a commit that referenced this pull request Apr 27, 2023
* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.

Signed-off-by: David Venable <[email protected]>

* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

* Apply suggestions from code review

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

---------

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
vagimeli pushed a commit that referenced this pull request May 4, 2023
* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.

Signed-off-by: David Venable <[email protected]>

* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

* Apply suggestions from code review

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

---------

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
vagimeli added a commit that referenced this pull request May 4, 2023
harshavamsi pushed a commit to harshavamsi/documentation-website that referenced this pull request Oct 31, 2023
…3813)

* Updates the Data Prepper S3 source documentation with additional instructions for usage and new features in 2.2. Includes some clean-up as well.

Signed-off-by: David Venable <[email protected]>

* Add back in example

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

* Apply suggestions from code review

Co-authored-by: Caroline <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update s3.md

Implement Caroline's feedback

* Apply suggestions from code review

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Co-authored-by: Nathan Bower <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>

* Update _data-prepper/pipelines/configuration/sources/s3.md

Signed-off-by: Naarcha-AWS <[email protected]>

---------

Signed-off-by: David Venable <[email protected]>
Signed-off-by: Naarcha-AWS <[email protected]>
Co-authored-by: Naarcha-AWS <[email protected]>
Co-authored-by: Caroline <[email protected]>
Co-authored-by: Nathan Bower <[email protected]>
@dlvenable dlvenable deleted the s3-updates-for-2.2 branch April 5, 2024 22:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.5 PR: Backport label for 2.5 backport 2.6 PR: Backport label for 2.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants