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

Update Beats to the current Sarama fork #19527

Merged
merged 1 commit into from
Jul 1, 2020
Merged

Update Beats to the current Sarama fork #19527

merged 1 commit into from
Jul 1, 2020

Conversation

faec
Copy link
Contributor

@faec faec commented Jun 30, 2020

What does this PR do?

This PR updates Beats to the current version of Elastic's Sarama fork. It uses a base Sarama version of 1.26.4 with added fixes; for details of the exact Sarama state, see the README for the current fork version

This PR was created by:

go mod edit -replace github.com/Shopify/sarama=github.com/elastic/sarama@0e7b69039eec89751dfbdf17496c639909a93547

make notice

targeting the following commit:

commit 0e7b69039eec89751dfbdf17496c639909a93547 (HEAD -> beats-fork, upstream/beats-fork)
Merge: b4d980d b47eb73
Author: Fae Charlton <[email protected]>
Date:   Mon Jun 29 08:34:29 2020 -0400

    Document status and process for the Elastic fork

@faec faec added bug Team:Integrations Label for the Integrations team labels Jun 30, 2020
@faec faec requested a review from kvch June 30, 2020 20:48
@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 Jun 30, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 30, 2020 •
edited
Loading

❕ Build Aborted

There is a new build on-going so the previous on-going builds have been aborted.

Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: [faec commented: jenkins run tests]

  • Reason: Aborted from #9

  • Start Time: 2020-07-01T17:07:28.530+0000

  • Duration: 29 min 22 sec

  • Commit: 24d3c86

Log output

Expand to view the last 100 lines of log output 

[2020-07-01T17:36:47.982Z] Stage "Build and Test" skipped due to earlier failure(s)
[2020-07-01T17:36:48.206Z] Stage "Elastic Agent x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.207Z] Stage "Elastic Agent x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.208Z] Stage "Elastic Agent Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.209Z] Stage "Filebeat oss" skipped due to earlier failure(s)
[2020-07-01T17:36:48.210Z] Stage "Filebeat x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.211Z] Stage "Filebeat Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.212Z] Stage "Filebeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.213Z] Stage "Filebeat Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.214Z] Stage "Filebeat x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.214Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.215Z] Stage "Auditbeat oss Linux" skipped due to earlier failure(s)
[2020-07-01T17:36:48.216Z] Stage "Auditbeat crosscompile" skipped due to earlier failure(s)
[2020-07-01T17:36:48.217Z] Stage "Auditbeat oss Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.218Z] Stage "Auditbeat oss Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.219Z] Stage "Auditbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.220Z] Stage "Auditbeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.221Z] Stage "Auditbeat x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.222Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.223Z] Stage "Libbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.224Z] Stage "Metricbeat OSS Unit tests" skipped due to earlier failure(s)
[2020-07-01T17:36:48.225Z] Stage "Metricbeat OSS Integration tests" skipped due to earlier failure(s)
[2020-07-01T17:36:48.225Z] Stage "Metricbeat Python integration tests" skipped due to earlier failure(s)
[2020-07-01T17:36:48.226Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.227Z] Stage "Metricbeat crosscompile" skipped due to earlier failure(s)
[2020-07-01T17:36:48.228Z] Stage "Metricbeat Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.229Z] Stage "Metricbeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-07-01T17:36:48.230Z] Stage "Metricbeat Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.231Z] Stage "Metricbeat x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T17:36:48.232Z] Stage "Packetbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.233Z] Stage "dockerlogbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.234Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.234Z] Stage "Winlogbeat Windows x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.235Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.236Z] Stage "Journalbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.237Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T17:36:48.237Z] Stage "Kubernetes" skipped due to earlier failure(s)
[2020-07-01T17:36:48.330Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.333Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.334Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:48.335Z] Stage "Packetbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.336Z] Stage "dockerlogbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.337Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.338Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.339Z] Stage "Journalbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:48.340Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T17:36:48.965Z] Failed in branch Elastic Agent x-pack
[2020-07-01T17:36:48.966Z] Failed in branch Elastic Agent x-pack Windows
[2020-07-01T17:36:48.966Z] Failed in branch Elastic Agent Mac OS X
[2020-07-01T17:36:48.969Z] Failed in branch Filebeat oss
[2020-07-01T17:36:48.970Z] Failed in branch Filebeat x-pack
[2020-07-01T17:36:48.970Z] Failed in branch Filebeat Mac OS X
[2020-07-01T17:36:48.971Z] Failed in branch Filebeat x-pack Mac OS X
[2020-07-01T17:36:48.972Z] Failed in branch Filebeat Windows
[2020-07-01T17:36:48.972Z] Failed in branch Filebeat x-pack Windows
[2020-07-01T17:36:48.973Z] Failed in branch Auditbeat oss Linux
[2020-07-01T17:36:48.974Z] Failed in branch Auditbeat crosscompile
[2020-07-01T17:36:48.974Z] Failed in branch Auditbeat oss Mac OS X
[2020-07-01T17:36:48.975Z] Failed in branch Auditbeat oss Windows
[2020-07-01T17:36:48.976Z] Failed in branch Auditbeat x-pack
[2020-07-01T17:36:48.976Z] Failed in branch Auditbeat x-pack Mac OS X
[2020-07-01T17:36:48.977Z] Failed in branch Auditbeat x-pack Windows
[2020-07-01T17:36:48.978Z] Failed in branch Libbeat x-pack
[2020-07-01T17:36:48.978Z] Failed in branch Metricbeat OSS Unit tests
[2020-07-01T17:36:48.979Z] Failed in branch Metricbeat OSS Integration tests
[2020-07-01T17:36:48.980Z] Failed in branch Metricbeat Python integration tests
[2020-07-01T17:36:48.980Z] Failed in branch Metricbeat crosscompile
[2020-07-01T17:36:48.981Z] Failed in branch Metricbeat Mac OS X
[2020-07-01T17:36:48.982Z] Failed in branch Metricbeat x-pack Mac OS X
[2020-07-01T17:36:48.982Z] Failed in branch Metricbeat Windows
[2020-07-01T17:36:48.983Z] Failed in branch Metricbeat x-pack Windows
[2020-07-01T17:36:48.984Z] Failed in branch Winlogbeat Windows x-pack
[2020-07-01T17:36:48.984Z] Failed in branch Kubernetes
[2020-07-01T17:36:49.249Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.250Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.251Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T17:36:49.252Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.253Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.254Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T17:36:49.317Z] Failed in branch Packetbeat
[2020-07-01T17:36:49.318Z] Failed in branch dockerlogbeat
[2020-07-01T17:36:49.319Z] Failed in branch Journalbeat
[2020-07-01T17:36:49.504Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.506Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.507Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T17:36:49.508Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T17:36:49.551Z] Failed in branch Metricbeat x-pack
[2020-07-01T17:36:49.552Z] Failed in branch Winlogbeat
[2020-07-01T17:36:49.723Z] Failed in branch Heartbeat
[2020-07-01T17:36:49.724Z] Failed in branch Libbeat
[2020-07-01T17:36:49.725Z] Failed in branch Functionbeat
[2020-07-01T17:36:49.725Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T17:36:49.808Z] Failed in branch Generators
[2020-07-01T17:36:50.098Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19527
[2020-07-01T17:36:50.205Z] [INFO] getVaultSecret: Getting secrets
[2020-07-01T17:36:50.267Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-07-01T17:36:51.071Z] + chmod 755 generate-build-data.sh
[2020-07-01T17:36:51.071Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19527/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19527/runs/8 ABORTED 1762283
[2020-07-01T17:36:51.071Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19527/runs/8/steps/?limit=10000 -o steps-info.json
[2020-07-01T17:36:51.322Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19527/runs/8/tests/?status=FAILED -o tests-errors.json

kvch
kvch approved these changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@kvch kvch left a comment

Choose a reason for hiding this comment

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

After you fix the errors coming from the Lint job, merge it.

@andresrc
Copy link
Contributor

andresrc commented Jul 1, 2020

jenkins, test this please

@andresrc
Copy link
Contributor

andresrc commented Jul 1, 2020

jenkins run the tests please

@kvch
Copy link
Contributor

kvch commented Jul 1, 2020

jenkins run tests

1 similar comment
@faec
Copy link
Contributor Author

faec commented Jul 1, 2020

jenkins run tests

@faec
Copy link
Contributor Author

faec commented Jul 1, 2020

jenkins run tests

@faec
Copy link
Contributor Author

faec commented Jul 1, 2020

After offline discussion with @urso and @andresrc, merging this before waiting for all tests -- testing infrastructure is having a rough time today and has caused several delays, but tests pass locally, no completed tests are failing, and we need to unblock the backport for the impending 7.8 update.

@faec faec merged commit cf46a2a into elastic:master Jul 1, 2020
@faec faec deleted the sarama-fork branch July 1, 2020 18:37
@faec faec mentioned this pull request Jul 1, 2020
Merged
@faec faec added the v7.8.1 label Jul 1, 2020
@faec faec mentioned this pull request Jul 1, 2020
Closed
@faec faec added the v8.0.0 label Jul 1, 2020
faec added a commit that referenced this pull request Jul 1, 2020
@faec
Cherry-pick #19527 to 7.8: Update Beats to the current Sarama fork (#…
1afa9c9 
…19563)

* Update Beats to the current Sarama fork

(cherry picked from commit cf46a2a)

* mage vendor / make notice
@faec faec mentioned this pull request Jul 2, 2020
Merged
@faec faec added the v7.9.0 label Jul 2, 2020
@jsoriano jsoriano mentioned this pull request Jul 22, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvch kvch kvch approved these changes

Assignees
No one assigned
Labels
bug Team:Integrations Label for the Integrations team v7.8.1 v7.9.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@faec @elasticmachine @andresrc @kvch