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

change type of max_bytes to ByteType #26699

Merged
merged 2 commits into from
Jul 7, 2021
Merged

change type of max_bytes to ByteType #26699

merged 2 commits into from
Jul 7, 2021

Conversation

leehinman
Copy link
Contributor

@leehinman leehinman commented Jul 2, 2021 •
edited
Loading

What does this PR do?

This changes the type of MaxBytes in parsers to cfgtype.ByteType.

Why is it important?

Without this change MaxBytes in awss3 input could only be numbers even
though it was of type cfgtype.ByteType

This allows for both numbers and humanize values in the config files
for max_bytes

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

cd libbeat/reader/parser && go test

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 2, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 2, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 3, 2021 •
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 #26699 updated

  • Start Time: 2021-07-06T13:38:32.129+0000

  • Duration: 131 min 15 sec

  • Commit: 59c01df

Test stats 🧪

Test Results
Failed 0
Passed 48592
Skipped 5395
Total 53987

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 48592
Skipped 5395
Total 53987

@v1v
Copy link
Member

v1v commented Jul 4, 2021

/test

@leehinman leehinman requested a review from kvch July 4, 2021 21:39
@mergify
Copy link
Contributor

mergify bot commented Jul 6, 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 max_bytes_bytesize upstream/max_bytes_bytesize
git merge upstream/master
git push upstream max_bytes_bytesize

leehinman added 2 commits July 6, 2021 08:37
@leehinman
change type of max_bytes to ByteType
cb22352 
allows for both number and humanize values in the config.
Without this max_bytes in awss3 input could only be numbers.
@leehinman
update changelog
59c01df
@leehinman leehinman force-pushed the max_bytes_bytesize branch from 6b70d89 to 59c01df Compare July 6, 2021 13:38
@leehinman leehinman merged commit 2af8ab9 into elastic:master Jul 7, 2021
mergify bot pushed a commit that referenced this pull request Jul 7, 2021
@leehinman
change type of max_bytes to ByteType (#26699)
f9f9f74 
* change type of max_bytes to ByteType

allows for both number and humanize values in the config.
Without this max_bytes in awss3 input could only be numbers.

(cherry picked from commit 2af8ab9)
@mergify mergify bot mentioned this pull request Jul 7, 2021
Merged
leehinman added a commit that referenced this pull request Jul 7, 2021
@mergify @leehinman
change type of max_bytes to ByteType (#26699) (#26761)
0c223cd 
* change type of max_bytes to ByteType

allows for both number and humanize values in the config.
Without this max_bytes in awss3 input could only be numbers.

(cherry picked from commit 2af8ab9)

Co-authored-by: Lee Hinman <57081003+leehinman@users.noreply.github.com>
@leehinman leehinman added the backport-v7.15.0 Automated backport with mergify label Jul 7, 2021
mergify bot pushed a commit that referenced this pull request Jul 7, 2021
@leehinman
change type of max_bytes to ByteType (#26699)
e2949c8 
* change type of max_bytes to ByteType

allows for both number and humanize values in the config.
Without this max_bytes in awss3 input could only be numbers.

(cherry picked from commit 2af8ab9)
@mergify mergify bot mentioned this pull request Jul 7, 2021
Merged
@leehinman leehinman deleted the max_bytes_bytesize branch July 7, 2021 21:18
leehinman added a commit that referenced this pull request Jul 8, 2021
@mergify @leehinman
[7.x](backport #26699) change type of max_bytes to ByteType (#26773)
d379a94 
* change type of max_bytes to ByteType (#26699)

* change type of max_bytes to ByteType

allows for both number and humanize values in the config.
Without this max_bytes in awss3 input could only be numbers.

(cherry picked from commit 2af8ab9)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Lee Hinman <57081003+leehinman@users.noreply.github.com>
v1v added a commit to v1v/beats that referenced this pull request Jul 8, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/use-debian-9
1d835f9 
* upstream/master: (430 commits)
  CI: increase timeout (elastic#26764)
  Heartbeat: add datastream fields to synthetics (elastic#26774)
  Osquerybeat: Change the query timeout from 3 secs to 60 secs (elastic#26775)
  Remove experimental warning for inputs with variables. (elastic#26762)
  Add latest k8s versions in testing (elastic#26729)
  change type of max_bytes to ByteType (elastic#26699)
  [Elastic Agent] Fix broken enrollment command (elastic#26749)
  Update agent managed manifest to include enrolment token variable (elastic#26756)
  Filebeat: Ensure module pipelines compatibility with previous versions of Elasticsearch (elastic#26737)
  Forward port changelog for 7.13.3 (elastic#26731) to master (elastic#26754)
  Upgrade PyYAML dependency used for tests (elastic#26746)
  Add agent fleet enrolment k8s manifest (elastic#26566)
  CI: retry the step only (elastic#26736)
  Osquerybeat: Fix the configuration poll interval setting (elastic#26739)
  [Filebeat] Replace copy_from with templated value (elastic#26631)
  Reduce the verbosity of the debug log for monitoring (elastic#26583)
  Add instructions on testing metricbeat kubernetes module (elastic#26643)
  Revert "[CI] fight the flakiness with some retry option in the CI only for the Pull Requests (elastic#26617)" (elastic#26704)
  Packaging: linux/armv7 is not supported (elastic#26706)
  Cyberarkpas: Link to official docs on how to setup TLS (elastic#26614)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

@kvch kvch kvch approved these changes

Assignees
No one assigned
Labels
backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@leehinman @elasticmachine @v1v @kvch @andrewkroh