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

Fix s3 input when there is a blank line in the log file #25357

Merged
merged 4 commits into from
Apr 28, 2021
Merged

Fix s3 input when there is a blank line in the log file #25357

merged 4 commits into from
Apr 28, 2021

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Apr 28, 2021

What does this PR do?

When there is an empty line in a log file, s3 input shouldn't abort the rest of the file. This PR is to skip the empty line and continue to ingest the rest of the log file.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 28, 2021
@kaiyan-sheng kaiyan-sheng self-assigned this Apr 28, 2021
@kaiyan-sheng kaiyan-sheng added the Team:Integrations Label for the Integrations team label Apr 28, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 28, 2021
@kaiyan-sheng kaiyan-sheng added bug needs_backport PR is waiting to be backported to other branches. labels Apr 28, 2021
@mergify
Copy link
Contributor

mergify bot commented Apr 28, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b s3_input_skip_line upstream/s3_input_skip_line
git merge upstream/master
git push upstream s3_input_skip_line

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 28, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #25357 updated

  • Start Time: 2021-04-28T20:29:33.437+0000

  • Duration: 105 min 11 sec

  • Commit: f03bb15

Test stats 🧪

Test Results
Failed 0
Passed 7009
Skipped 1193
Total 8202

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 7009
Skipped 1193
Total 8202

@ChrsMark
Copy link
Member

Please resolve the conflict before merging.

@kaiyan-sheng
Copy link
Contributor Author

/test

@kaiyan-sheng kaiyan-sheng merged commit e8c73c4 into elastic:master Apr 28, 2021
@kaiyan-sheng kaiyan-sheng deleted the s3_input_skip_line branch April 28, 2021 22:36
@kaiyan-sheng kaiyan-sheng added v7.14.0 and removed needs_backport PR is waiting to be backported to other branches. labels Apr 28, 2021
kaiyan-sheng added a commit that referenced this pull request Apr 29, 2021
kaiyan-sheng added a commit that referenced this pull request Apr 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Team:Integrations Label for the Integrations team v7.13.0 v7.14.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

S3 collector aborts when there is a blank line in the log file
3 participants