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

Add max_number_of_messages into aws filebeat fileset vars #22057

Merged
merged 2 commits into from
Oct 22, 2020
Merged

Add max_number_of_messages into aws filebeat fileset vars #22057

merged 2 commits into from
Oct 22, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Oct 21, 2020 •
edited
Loading

What does this PR do?

This PR is to add max_number_of_messages config parameter to each filebeat fileset under aws so this config can be used not only by the input itself, also with all the filesets.

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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 21, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this Oct 21, 2020
@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. review Team:Platforms Label for the Integrations - Platforms team labels Oct 21, 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 Oct 21, 2020
@kaiyan-sheng kaiyan-sheng mentioned this pull request Oct 21, 2020
Merged
5 tasks
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 21, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 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 #22057 updated]

  • Start Time: 2020-10-22T15:17:46.188+0000

  • Duration: 64 min 1 sec

Test stats 🧪

Test Results
Failed 0
Passed 1947
Skipped 259
Total 2206

ChrsMark
ChrsMark approved these changes Oct 22, 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. Will this need a changelog?

@kaiyan-sheng
Copy link
Contributor Author

@ChrsMark I don't think so 😬 This should be a part of #21993. Thanks for the review 👍

@kaiyan-sheng kaiyan-sheng merged commit 5d07709 into elastic:master Oct 22, 2020
@kaiyan-sheng kaiyan-sheng deleted the max_number_of_messages_fb branch October 22, 2020 17:34
@kaiyan-sheng kaiyan-sheng mentioned this pull request Oct 22, 2020
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng added v7.11.0 and removed needs_backport PR is waiting to be backported to other branches. labels Oct 22, 2020
kaiyan-sheng added a commit that referenced this pull request Oct 23, 2020
@kaiyan-sheng
Add max_number_of_messages into aws filebeat fileset vars (#22057) (#…
1bf6f4a 
…22105)

(cherry picked from commit 5d07709)
v1v added a commit to v1v/beats that referenced this pull request Oct 26, 2020
@v1v
Merge branch 'feature/support-flaky-test-analyser' of github.com:v1v/…
290ff18 
…beats into feature/support-flaky-test-analyser

* 'feature/support-flaky-test-analyser' of github.com:v1v/beats: (40 commits)
  [CI] support windows-10 (elastic#19804)
  Use default config when creating the input (elastic#22126)
  Change x509 mappings from file. to tls.server. (elastic#22097)
  Add fleet settings image (elastic#22065)
  Edit 7.9.3 changelog (elastic#22117)
  Edit 6.8.13 release notes (elastic#22120)
  Incorporate librpm fix feedback (elastic#22098)
  [libbeat] Add more disk queue unit tests and fix a size-check bug (elastic#22107)
  docs: move kerberos include (elastic#22109)
  Check context.Canceled and fix s3 input config (elastic#22036)
  Add max_number_of_messages into aws filebeat fileset vars (elastic#22057)
  Remove suricata.eve.timestamp alias (elastic#22095)
  [Ingest Manager] Use symlink path for reexecutions (elastic#21835)
  chore: use ubuntu 18 as linux agent (elastic#22084)
  docs: Prepare Changelog for 7.9.3 (elastic#22073) (elastic#22075)
  docs: Prepare Changelog for 6.8.13 (elastic#22072) (elastic#22079)
  [build][packaging] Add resilience when docker build (elastic#22050)
  Fix the url of reviewdog (elastic#21981)
  revert WSS process reporting for windows (elastic#22055)
  Fix typo (elastic#19585) (elastic#22061)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 26, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/beats-tes…
1605aef 
…ter-commit

* upstream/master: (25 commits)
  [CI] set env variable for the params (elastic#22143)
  Fix zeek connection pipeline (elastic#22151)
  Fix Google Cloud Function configuration file issues (elastic#22156)
  Remove old TODO on kubernetes node update (elastic#22074)
  [CI] Enable winlogbeat (elastic#22142)
  [CI] support windows-10 (elastic#19804)
  Use default config when creating the input (elastic#22126)
  Change x509 mappings from file. to tls.server. (elastic#22097)
  Add fleet settings image (elastic#22065)
  Edit 7.9.3 changelog (elastic#22117)
  Edit 6.8.13 release notes (elastic#22120)
  Incorporate librpm fix feedback (elastic#22098)
  [libbeat] Add more disk queue unit tests and fix a size-check bug (elastic#22107)
  docs: move kerberos include (elastic#22109)
  Check context.Canceled and fix s3 input config (elastic#22036)
  Add max_number_of_messages into aws filebeat fileset vars (elastic#22057)
  Remove suricata.eve.timestamp alias (elastic#22095)
  [Ingest Manager] Use symlink path for reexecutions (elastic#21835)
  chore: use ubuntu 18 as linux agent (elastic#22084)
  docs: Prepare Changelog for 7.9.3 (elastic#22073) (elastic#22075)
  ...
@jsoriano jsoriano mentioned this pull request Nov 18, 2020
Merged
6 tasks
jsoriano pushed a commit to jsoriano/beats that referenced this pull request Nov 18, 2020
@kaiyan-sheng @jsoriano
Add fips_enabled into aws fileset manifests (elastic#22057)
edcefb2 
(partial cherry pick from commit 5d07709)
jsoriano added a commit that referenced this pull request Nov 18, 2020
@jsoriano @kaiyan-sheng
Cherry-pick #22057 to 7.10: Fix missing variable loading aws pipelines (
cd8d059 
#22645)

Add fips_enabled into aws fileset manifests (#22057)

(partial cherry pick from commit 5d07709)

Co-authored-by: kaiyan-sheng <[email protected]>
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
review Team:Platforms Label for the Integrations - Platforms team v7.10.1 v7.11.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kaiyan-sheng @elasticmachine @ChrsMark @jsoriano