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.

Sign up for GitHub

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

Jump to bottom

[Filebeat] remove delimiter \n from log line in s3 input #19972

Merged
merged 4 commits into from
Jul 17, 2020
Merged

[Filebeat] remove delimiter \n from log line in s3 input #19972

merged 4 commits into from
Jul 17, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Jul 16, 2020 •
edited
Loading

What does this PR do?

Why is it important?

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.

How to test this PR locally

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 16, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this Jul 16, 2020
@kaiyan-sheng kaiyan-sheng added in progress Pull request is currently in progress. Team:Platforms Label for the Integrations - Platforms team labels Jul 16, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 16, 2020
ChrsMark
ChrsMark approved these changes Jul 17, 2020
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

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

lgtm!

@kaiyan-sheng kaiyan-sheng merged commit 9ca82b4 into elastic:master Jul 17, 2020
@kaiyan-sheng kaiyan-sheng deleted the delimiter_s3 branch July 17, 2020 13:35
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jul 17, 2020
Merged
v1v added a commit to v1v/beats that referenced this pull request Jul 20, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/fix-warni…
cf807c2 
…ngs-archive

* upstream/master: (274 commits)
  Test export commands in all Beats (elastic#20016)
  [Ingest Manager] Allow using drop path for agent build (elastic#20019)
  [DOCS] Remove include for deleted file in monitoring docs (elastic#20038)
  Removing xpack.monitoring.* settings (elastic#18608)
  [Heartbeat] Add service_name option for APM integration (elastic#19932)
  [Elastic Agent] Fix merging of fleet.yml. Add --staging to enroll cmd. (elastic#20026)
  Stricter stalebot configuration for PRs (elastic#20004)
  [ci] Favor direct mage invocation on CI (elastic#19960)
  Add cloudwatch input into Filebeat configure inputs documentation (elastic#19973)
  [Filebeat] remove delimiter \n from log line in s3 input (elastic#19972)
  [Metricbeat] Update MySQL dashboard (elastic#19913)
  Packetbeat process monitor: Ignore missing /proc/net/tcp6 (elastic#19945)
  [CI] fix MODULE variable cornercases (elastic#19985)
  Ignore timestamp in fortinet/clientendpoint and netscout/sightline (elastic#19998)
  add 7.9 to .backportrc.json (elastic#19952)
  Update internal links to external (elastic#19947)
  Remove Dynamic Script Compilations warning in Cisco module (elastic#19840)
  [Elastic Agent] Fix RPM and DEB packaging for Elastic Agent (elastic#19959)
  [Ingest Manager] Do not compare err with custom type (elastic#19980)
  Fix nanocore sum for non default intervals on Kubernetes Overview Dashboard (elastic#19675)
  ...
v1v added a commit to v1v/beats that referenced this pull request Jul 20, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/ci-read-o…
a6c5555 
…nly-mod

* upstream/master: (75 commits)
  Test export commands in all Beats (elastic#20016)
  [Ingest Manager] Allow using drop path for agent build (elastic#20019)
  [DOCS] Remove include for deleted file in monitoring docs (elastic#20038)
  Removing xpack.monitoring.* settings (elastic#18608)
  [Heartbeat] Add service_name option for APM integration (elastic#19932)
  [Elastic Agent] Fix merging of fleet.yml. Add --staging to enroll cmd. (elastic#20026)
  Stricter stalebot configuration for PRs (elastic#20004)
  [ci] Favor direct mage invocation on CI (elastic#19960)
  Add cloudwatch input into Filebeat configure inputs documentation (elastic#19973)
  [Filebeat] remove delimiter \n from log line in s3 input (elastic#19972)
  [Metricbeat] Update MySQL dashboard (elastic#19913)
  Packetbeat process monitor: Ignore missing /proc/net/tcp6 (elastic#19945)
  [CI] fix MODULE variable cornercases (elastic#19985)
  Ignore timestamp in fortinet/clientendpoint and netscout/sightline (elastic#19998)
  add 7.9 to .backportrc.json (elastic#19952)
  Update internal links to external (elastic#19947)
  Remove Dynamic Script Compilations warning in Cisco module (elastic#19840)
  [Elastic Agent] Fix RPM and DEB packaging for Elastic Agent (elastic#19959)
  [Ingest Manager] Do not compare err with custom type (elastic#19980)
  Fix nanocore sum for non default intervals on Kubernetes Overview Dashboard (elastic#19675)
  ...
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jul 20, 2020
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jul 20, 2020
Merged
6 tasks
kaiyan-sheng added a commit that referenced this pull request Jul 21, 2020
@kaiyan-sheng
Cherry-pick #19972 to 7.9: [Filebeat] remove delimiter \n from log li…
57bf5f8 
…ne in s3 input (#20064)

* [Filebeat] remove delimiter \n from log line in s3 input (#19972)

* remove delimiter \n from log line in s3 input

(cherry picked from commit 9ca82b4)

* backport #20041
kaiyan-sheng added a commit that referenced this pull request Jul 22, 2020
@kaiyan-sheng
Cherry-pick #19972 to 7.x: [Filebeat] remove delimiter \n from log li…
6e50a4c 
…ne in s3 input (#20063)

* [Filebeat] remove delimiter \n from log line in s3 input (#19972)

* remove delimiter \n from log line in s3 input

(cherry picked from commit 9ca82b4)

* backport #20041
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
@kaiyan-sheng @melchiormoulin
[Filebeat] remove delimiter \n from log line in s3 input (elastic#19972)
77d0165 
* remove delimiter \n from log line in s3 input
@zube zube bot removed the [zube]: Done label Oct 16, 2020
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
@kaiyan-sheng
Cherry-pick elastic#19972 to 7.9: [Filebeat] remove delimiter \n from…
bb8216d 
… log line in s3 input (elastic#20064)

* [Filebeat] remove delimiter \n from log line in s3 input (elastic#19972)

* remove delimiter \n from log line in s3 input

(cherry picked from commit 08a9f95)

* backport elastic#20041
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
in progress Pull request is currently in progress. Team:Platforms Label for the Integrations - Platforms team v7.9.0 v7.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Filebeat] S3 input module should trim the delimiter of log line
4 participants
@kaiyan-sheng @elasticmachine @ChrsMark @andresrc