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

Cherry-pick #19527 to 7.8: Update Beats to the current Sarama fork #19563

Merged
merged 2 commits into from
Jul 1, 2020
Merged

Cherry-pick #19527 to 7.8: Update Beats to the current Sarama fork #19563

merged 2 commits into from
Jul 1, 2020

Conversation

faec
Copy link
Contributor

@faec faec commented Jul 1, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #19527 to 7.8 branch. Because Beats now uses modules exclusively at head, but 7.8 still includes a vendor folder, in addition to the automated cherry pick I ran:

mage vendor
make notice

Original message:

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 [zube]: In Review backport Team:Integrations Label for the Integrations team labels Jul 1, 2020
@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 Jul 1, 2020
@faec faec requested a review from urso July 1, 2020 18:59
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 1, 2020 •
edited
Loading

💔 Tests Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19563 updated]

  • Start Time: 2020-07-01T19:00:21.452+0000

  • Duration: 77 min 1 sec

Test stats 🧪

Test Results
Failed 1
Passed 9270
Skipped 1586
Total 10857

Test errors

Expand to view the tests failures

  • Name: Build and Test / Filebeat Mac OS X / test_rotating_file_inode – test_registrar.Test

    • Age: 1
    • Duration: 5.236
    • Error Details:

Steps errors

Expand to view the steps failures

  • Name: Mage build unitTest

    • Description: mage build unitTest

    • Duration: 9 min 34 sec

    • Start Time: 2020-07-01T19:22:10.186+0000

    • log

  • Name: Recursively delete the current directory from the workspace

    • Description: script returned exit code 1

    • Duration: 1 min 39 sec

    • Start Time: 2020-07-01T19:30:58.841+0000

    • log

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 1 min 28 sec

    • Start Time: 2020-07-01T19:36:39.128+0000

    • log

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-07-01T19:33:45.837+0000

    • log

  • Name: Report to Codecov

    • Description: curl -sSLo codecov https://codecov.io/bash for i in auditbeat filebeat heartbeat libbeat metricbeat packetbeat winlogbeat journalbeat do FILE="${i}/build/coverage/full.cov" if [ -f "${FILE}" ]; then bash codecov -f "${FILE}" fi done

    • Duration: 2 min 22 sec

    • Start Time: 2020-07-01T19:30:23.901+0000

    • log

Log output

Expand to view the last 100 lines of log output 

[2020-07-01T20:16:54.948Z] + FILE=winlogbeat/build/coverage/full.cov
[2020-07-01T20:16:54.948Z] + [ -f winlogbeat/build/coverage/full.cov ]
[2020-07-01T20:16:54.948Z] + FILE=journalbeat/build/coverage/full.cov
[2020-07-01T20:16:54.948Z] + [ -f journalbeat/build/coverage/full.cov ]
[2020-07-01T20:16:55.470Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats
[2020-07-01T20:16:55.784Z] + find . -type f -name TEST*.xml -path */build/* -delete
[2020-07-01T20:16:55.797Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Lint
[2020-07-01T20:16:55.876Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Elastic-Agent-Mac-OS-X
[2020-07-01T20:16:55.949Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Winlogbeat-oss
[2020-07-01T20:16:56.022Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Elastic-Agent-x-pack
[2020-07-01T20:16:56.095Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-crosscompile
[2020-07-01T20:16:56.174Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-x-pack-Mac-OS-X
[2020-07-01T20:16:56.250Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Dockerlogbeat
[2020-07-01T20:16:56.329Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-07-01T20:16:56.414Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Journalbeat-oss
[2020-07-01T20:16:56.494Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Generators-Metricbeat-Linux
[2020-07-01T20:16:56.570Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Functionbeat-x-pack
[2020-07-01T20:16:56.644Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Elastic-Agent-x-pack-Windows
[2020-07-01T20:16:56.718Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-07-01T20:16:56.791Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-07-01T20:16:56.863Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-07-01T20:16:56.936Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Heartbeat-oss
[2020-07-01T20:16:57.009Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack-Mac-OS-X
[2020-07-01T20:16:57.082Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-x-pack
[2020-07-01T20:16:57.153Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-oss-Windows
[2020-07-01T20:16:57.225Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Libbeat-x-pack
[2020-07-01T20:16:57.303Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-x-pack-Windows
[2020-07-01T20:16:57.376Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-oss-Linux
[2020-07-01T20:16:57.450Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Filebeat-Windows
[2020-07-01T20:16:57.522Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Filebeat-x-pack-Windows
[2020-07-01T20:16:57.595Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Auditbeat-oss-Mac-OS-X
[2020-07-01T20:16:57.667Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Winlogbeat-Windows-x-pack
[2020-07-01T20:16:57.739Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Functionbeat-Mac-OS-X-x-pack
[2020-07-01T20:16:57.812Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Packetbeat-oss
[2020-07-01T20:16:57.884Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-07-01T20:16:57.957Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Heartbeat-Mac-OS-X
[2020-07-01T20:16:58.029Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-Windows
[2020-07-01T20:16:58.101Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Winlogbeat-Windows
[2020-07-01T20:16:58.173Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Filebeat-x-pack
[2020-07-01T20:16:58.246Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-07-01T20:16:58.322Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Generators-Beat-Linux
[2020-07-01T20:16:58.394Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Filebeat-oss
[2020-07-01T20:16:58.467Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Functionbeat-Windows
[2020-07-01T20:16:58.540Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Heartbeat-Windows
[2020-07-01T20:16:58.613Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Libbeat-oss
[2020-07-01T20:16:58.685Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-Python-integration-tests
[2020-07-01T20:16:58.756Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Libbeat-crosscompile
[2020-07-01T20:16:58.828Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Libbeat-stress-tests
[2020-07-01T20:16:58.900Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Generators-Metricbeat-Mac-OS-X
[2020-07-01T20:16:58.970Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests
[2020-07-01T20:16:59.041Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Generators-Beat-Mac-OS-X
[2020-07-01T20:16:59.113Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-07-01T20:16:59.471Z] + cat
[2020-07-01T20:16:59.471Z] + /usr/local/bin/runbld ./runbld-script
[2020-07-01T20:16:59.471Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-07-01T20:17:06.086Z] runbld>>> runbld started
[2020-07-01T20:17:06.086Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-07-01T20:17:08.002Z] runbld>>> The following profiles matched the job 'Beats/beats-beats-mbp/PR-19563' in order of occurrence in the config (last value wins).
[2020-07-01T20:17:09.386Z] runbld>>> Debug logging enabled.
[2020-07-01T20:17:09.386Z] runbld>>> Storing result
[2020-07-01T20:17:09.386Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-07-01T20:17:09.386Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200701201709-1C72D284
[2020-07-01T20:17:09.386Z] runbld>>> Adding system facts.
[2020-07-01T20:17:10.336Z] runbld>>> Adding vcs info for the latest commit:  d5762a15ede75a2354b4e2c5907551851392d1a4
[2020-07-01T20:17:10.336Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-07-01T20:17:10.336Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-07-01T20:17:10.336Z] Processing JUnit reports with runbld...
[2020-07-01T20:17:10.336Z] + echo 'Processing JUnit reports with runbld...'
[2020-07-01T20:17:10.909Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-07-01T20:17:10.909Z] runbld>>> DURATION: 44ms
[2020-07-01T20:17:10.909Z] runbld>>> STDOUT: 40 bytes
[2020-07-01T20:17:10.909Z] runbld>>> STDERR: 49 bytes
[2020-07-01T20:17:10.909Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-07-01T20:17:10.909Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats
[2020-07-01T20:17:12.299Z] runbld>>> Storing build metadata: 
[2020-07-01T20:17:12.299Z] runbld>>> Adding test report.
[2020-07-01T20:17:12.299Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats
[2020-07-01T20:17:13.242Z] runbld>>> Found 115 test output files
[2020-07-01T20:17:13.817Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests/metricbeat/build/TEST-go-integration-graphite.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests/metricbeat/build/TEST-go-integration-windows.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-cloudfoundry.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-07-01T20:17:14.079Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-07-01T20:17:15.467Z] runbld>>> Test output logs contained: Errors: 0 Failures: 1 Tests: 10707 Skipped: 1349
[2020-07-01T20:17:15.467Z] runbld>>> Storing result
[2020-07-01T20:17:15.467Z] runbld>>> FAILURES: 1
[2020-07-01T20:17:15.729Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-07-01T20:17:15.729Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200701201709-1C72D284
[2020-07-01T20:17:15.990Z] runbld>>> Email notification disabled by environment variable.
[2020-07-01T20:17:15.990Z] runbld>>> Slack notification disabled by environment variable.
[2020-07-01T20:17:21.541Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19563
[2020-07-01T20:17:21.647Z] [INFO] getVaultSecret: Getting secrets
[2020-07-01T20:17:21.710Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-07-01T20:17:22.503Z] + chmod 755 generate-build-data.sh
[2020-07-01T20:17:22.503Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19563/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19563/runs/2 FAILURE 4620791
[2020-07-01T20:17:22.503Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19563/runs/2/steps/?limit=10000 -o steps-info.json
[2020-07-01T20:17:25.024Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19563/runs/2/tests/?status=FAILED -o tests-errors.json

@faec
Copy link
Contributor Author

faec commented Jul 1, 2020

The only CI failure is a registrar system test that doesn't depend on the library this PR updates, going ahead with merge.

@faec faec merged commit 1afa9c9 into elastic:7.8 Jul 1, 2020
@zube zube bot removed the [zube]: Done label Oct 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@urso urso Awaiting requested review from urso

Assignees
No one assigned
Labels
backport Team:Integrations Label for the Integrations team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@faec @elasticmachine