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

Cherry-pick #25357 to 7.x: Fix s3 input when there is a blank line in the log file #25414

Merged
merged 1 commit into from
Apr 29, 2021
Merged

Cherry-pick #25357 to 7.x: Fix s3 input when there is a blank line in the log file #25414

merged 1 commit into from
Apr 29, 2021

Conversation

kaiyan-sheng
Copy link
Contributor

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

Cherry-pick of PR #25357 to 7.x branch. Original message:

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

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

* add changelog

(cherry picked from commit e8c73c4)
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

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

💚 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 #25414 opened

  • Start Time: 2021-04-28T22:37:40.783+0000

  • Duration: 52 min 46 sec

  • Commit: d53d648

Test stats 🧪

Test Results
Failed 0
Passed 6980
Skipped 1193
Total 8173

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 6980
Skipped 1193
Total 8173

@kaiyan-sheng kaiyan-sheng merged commit 83c0c2f into elastic:7.x Apr 29, 2021
@kaiyan-sheng kaiyan-sheng deleted the backport_25357_7.x branch April 29, 2021 00:54
@zube zube bot removed the [zube]: Done label Jul 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants