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.

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

Filebeat: add TLS + pipeline options to checkpoint module #18116

Closed
wants to merge 7 commits into from

Conversation

hazcod
Copy link
Contributor

@hazcod hazcod commented Apr 30, 2020

What does this PR do?

This adds a var.input type tls, which will use tcp + tls for mutual TLS authentication.

Why is it important?

Syslog udp is plaintext and does not guarantee CIA.

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.

Related issues

#17682
CC @P1llus @adriansr

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

1 similar comment
@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 30, 2020
@cla-checker-service
Copy link

cla-checker-service bot commented Apr 30, 2020

💚 CLA has been signed

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 30, 2020

❕ Build Aborted

The PR is not allowed to run in the CI yet

Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: [Pull request #18116 updated]

  • Reason: The PR is not allowed to run in the CI yet

  • Start Time: 2020-05-26T10:53:16.076+0000

  • Duration: 4 min 36 sec

  • Commit: 4fb188c

Steps errors

Expand to view the steps failures

  • Name: Error signal
    • Description: githubPrCheckApproved: The PR is not allowed to run in the CI yet. (Only users with write permission

    • Duration: 0 min 0 sec

    • Start Time: 2020-05-26T10:56:48.672+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-05-26T10:56:48.361Z] [WARN] githubApiCall: The REST API call https://api.github.com/repos/elastic/beats/pulls/18116/reviews return 0 elements
[2020-05-26T10:56:48.402Z] [INFO] githubPrCheckApproved: Title: Filebeat: add TLS + pipeline options to checkpoint module - User: hazcod - Author Association: FIRST_TIME_CONTRIBUTOR
[2020-05-26T10:56:48.678Z] ERROR: githubPrCheckApproved: The PR is not allowed to run in the CI yet
[2020-05-26T10:56:48.678Z] ERROR: githubPrCheckApproved: The PR is not allowed to run in the CI yet. (Only users with write permissions can do so.)
[2020-05-26T10:56:48.719Z] [INFO] Let's stop build #13. The PR is not allowed to run in the CI yet
[2020-05-26T10:56:48.738Z] Sleeping for 5 sec
[2020-05-26T10:56:49.866Z] Stage "Lint" skipped due to earlier failure(s)
[2020-05-26T10:56:49.923Z] Stage "Build and Test" skipped due to earlier failure(s)
[2020-05-26T10:56:50.125Z] Stage "Elastic Agent x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.127Z] Stage "Elastic Agent x-pack Windows" skipped due to earlier failure(s)
[2020-05-26T10:56:50.128Z] Stage "Elastic Agent Mac OS X" skipped due to earlier failure(s)
[2020-05-26T10:56:50.129Z] Stage "Filebeat oss" skipped due to earlier failure(s)
[2020-05-26T10:56:50.130Z] Stage "Filebeat x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.130Z] Stage "Filebeat Mac OS X" skipped due to earlier failure(s)
[2020-05-26T10:56:50.131Z] Stage "Filebeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-05-26T10:56:50.132Z] Stage "Filebeat Windows" skipped due to earlier failure(s)
[2020-05-26T10:56:50.133Z] Stage "Filebeat x-pack Windows" skipped due to earlier failure(s)
[2020-05-26T10:56:50.134Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.135Z] Stage "Auditbeat oss" skipped due to earlier failure(s)
[2020-05-26T10:56:50.135Z] Stage "Auditbeat x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.136Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.137Z] Stage "Libbeat x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.138Z] Stage "Metricbeat OSS Unit tests" skipped due to earlier failure(s)
[2020-05-26T10:56:50.139Z] Stage "Metricbeat OSS Integration tests" skipped due to earlier failure(s)
[2020-05-26T10:56:50.141Z] Stage "Metricbeat Python integration tests" skipped due to earlier failure(s)
[2020-05-26T10:56:50.142Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.143Z] Stage "Metricbeat crosscompile" skipped due to earlier failure(s)
[2020-05-26T10:56:50.144Z] Stage "Metricbeat Mac OS X" skipped due to earlier failure(s)
[2020-05-26T10:56:50.146Z] Stage "Metricbeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-05-26T10:56:50.148Z] Stage "Metricbeat Windows" skipped due to earlier failure(s)
[2020-05-26T10:56:50.149Z] Stage "Metricbeat x-pack Windows" skipped due to earlier failure(s)
[2020-05-26T10:56:50.150Z] Stage "Packetbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.150Z] Stage "dockerlogbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.151Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.151Z] Stage "Winlogbeat Windows x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.152Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.152Z] Stage "Journalbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.153Z] Stage "Generators" skipped due to earlier failure(s)
[2020-05-26T10:56:50.154Z] Stage "Kubernetes" skipped due to earlier failure(s)
[2020-05-26T10:56:50.258Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.260Z] Stage "Auditbeat oss" skipped due to earlier failure(s)
[2020-05-26T10:56:50.261Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.262Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.263Z] Stage "Packetbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.264Z] Stage "dockerlogbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.265Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.266Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.267Z] Stage "Journalbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.268Z] Stage "Generators" skipped due to earlier failure(s)
[2020-05-26T10:56:50.654Z] Failed in branch Elastic Agent x-pack
[2020-05-26T10:56:50.655Z] Failed in branch Elastic Agent x-pack Windows
[2020-05-26T10:56:50.656Z] Failed in branch Elastic Agent Mac OS X
[2020-05-26T10:56:50.656Z] Failed in branch Filebeat oss
[2020-05-26T10:56:50.657Z] Failed in branch Filebeat x-pack
[2020-05-26T10:56:50.658Z] Failed in branch Filebeat Mac OS X
[2020-05-26T10:56:50.658Z] Failed in branch Filebeat x-pack Mac OS X
[2020-05-26T10:56:50.659Z] Failed in branch Filebeat Windows
[2020-05-26T10:56:50.660Z] Failed in branch Filebeat x-pack Windows
[2020-05-26T10:56:50.660Z] Failed in branch Auditbeat x-pack
[2020-05-26T10:56:50.661Z] Failed in branch Libbeat x-pack
[2020-05-26T10:56:50.662Z] Failed in branch Metricbeat OSS Unit tests
[2020-05-26T10:56:50.662Z] Failed in branch Metricbeat OSS Integration tests
[2020-05-26T10:56:50.663Z] Failed in branch Metricbeat Python integration tests
[2020-05-26T10:56:50.664Z] Failed in branch Metricbeat crosscompile
[2020-05-26T10:56:50.664Z] Failed in branch Metricbeat Mac OS X
[2020-05-26T10:56:50.665Z] Failed in branch Metricbeat x-pack Mac OS X
[2020-05-26T10:56:50.666Z] Failed in branch Metricbeat Windows
[2020-05-26T10:56:50.666Z] Failed in branch Metricbeat x-pack Windows
[2020-05-26T10:56:50.667Z] Failed in branch Winlogbeat Windows x-pack
[2020-05-26T10:56:50.667Z] Failed in branch Kubernetes
[2020-05-26T10:56:50.931Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.933Z] Stage "Auditbeat oss" skipped due to earlier failure(s)
[2020-05-26T10:56:50.934Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.935Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-05-26T10:56:50.936Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.937Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:50.938Z] Stage "Generators" skipped due to earlier failure(s)
[2020-05-26T10:56:50.993Z] Failed in branch Packetbeat
[2020-05-26T10:56:50.995Z] Failed in branch dockerlogbeat
[2020-05-26T10:56:50.995Z] Failed in branch Journalbeat
[2020-05-26T10:56:51.194Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:51.196Z] Stage "Auditbeat oss" skipped due to earlier failure(s)
[2020-05-26T10:56:51.197Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:51.198Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-05-26T10:56:51.200Z] Stage "Generators" skipped due to earlier failure(s)
[2020-05-26T10:56:51.239Z] Failed in branch Metricbeat x-pack
[2020-05-26T10:56:51.240Z] Failed in branch Winlogbeat
[2020-05-26T10:56:51.433Z] Failed in branch Heartbeat
[2020-05-26T10:56:51.434Z] Failed in branch Libbeat
[2020-05-26T10:56:51.435Z] Failed in branch Functionbeat
[2020-05-26T10:56:51.435Z] Stage "Auditbeat oss" skipped due to earlier failure(s)
[2020-05-26T10:56:51.437Z] Stage "Generators" skipped due to earlier failure(s)
[2020-05-26T10:56:51.541Z] Failed in branch Auditbeat oss
[2020-05-26T10:56:51.542Z] Failed in branch Generators
[2020-05-26T10:56:51.837Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18116
[2020-05-26T10:56:51.942Z] [INFO] getVaultSecret: Getting secrets
[2020-05-26T10:56:52.001Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-05-26T10:56:52.697Z] + chmod 755 generate-build-data.sh
[2020-05-26T10:56:52.697Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/runs/13 ABORTED 216359
[2020-05-26T10:56:53.248Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/runs/13/steps/?limit=10000 -o steps-info.json

@jsoriano jsoriano added [zube]: In Review enhancement module review Team:SIEM and removed needs_team Indicates that the issue/PR needs a Team:* label labels Apr 30, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@jsoriano
Copy link
Member

Hey @hazcod, thanks for your contribution! You will need to sign the CLA so we can merge it https://www.elastic.co/contributor-agreement

@jsoriano jsoriano added the Filebeat Filebeat label Apr 30, 2020
@hazcod
Copy link
Contributor Author

hazcod commented Apr 30, 2020

Hmm I thought I did, will try again.
@jsoriano , seems like it came through this time.

@kvch
Copy link
Contributor

kvch commented May 4, 2020

jenkins test this

@hazcod
Copy link
Contributor Author

hazcod commented May 6, 2020

I ran mage fmt update but no git changes.

@hazcod
Copy link
Contributor Author

hazcod commented May 7, 2020

Can we get this merged?

@hazcod
Copy link
Contributor Author

hazcod commented May 22, 2020

Ping.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 26, 2020

❕ Build Aborted

The PR is not allowed to run in the CI yet

Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: [Branch indexing]

  • Reason: The PR is not allowed to run in the CI yet

  • Start Time: 2020-07-01T08:30:26.562+0000

  • Duration: 4 min 41 sec

  • Commit: 4fb188c

Steps errors

Expand to view the steps failures

  • Name: Error signal
    • Description: githubPrCheckApproved: The PR is not allowed to run in the CI yet. (Only users with write permission

    • Duration: 0 min 0 sec

    • Start Time: 2020-07-01T08:34:02.390+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-07-01T08:34:03.955Z] Stage "Build and Test" skipped due to earlier failure(s)
[2020-07-01T08:34:04.230Z] Stage "Elastic Agent x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.231Z] Stage "Elastic Agent x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.232Z] Stage "Elastic Agent Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.233Z] Stage "Filebeat oss" skipped due to earlier failure(s)
[2020-07-01T08:34:04.234Z] Stage "Filebeat x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.235Z] Stage "Filebeat Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.236Z] Stage "Filebeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.237Z] Stage "Filebeat Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.238Z] Stage "Filebeat x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.239Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.240Z] Stage "Auditbeat oss Linux" skipped due to earlier failure(s)
[2020-07-01T08:34:04.240Z] Stage "Auditbeat crosscompile" skipped due to earlier failure(s)
[2020-07-01T08:34:04.241Z] Stage "Auditbeat oss Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.242Z] Stage "Auditbeat oss Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.243Z] Stage "Auditbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.244Z] Stage "Auditbeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.245Z] Stage "Auditbeat x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.246Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.247Z] Stage "Libbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.247Z] Stage "Metricbeat OSS Unit tests" skipped due to earlier failure(s)
[2020-07-01T08:34:04.248Z] Stage "Metricbeat OSS Integration tests" skipped due to earlier failure(s)
[2020-07-01T08:34:04.249Z] Stage "Metricbeat Python integration tests" skipped due to earlier failure(s)
[2020-07-01T08:34:04.250Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.251Z] Stage "Metricbeat crosscompile" skipped due to earlier failure(s)
[2020-07-01T08:34:04.252Z] Stage "Metricbeat Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.253Z] Stage "Metricbeat x-pack Mac OS X" skipped due to earlier failure(s)
[2020-07-01T08:34:04.254Z] Stage "Metricbeat Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.255Z] Stage "Metricbeat x-pack Windows" skipped due to earlier failure(s)
[2020-07-01T08:34:04.256Z] Stage "Packetbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.256Z] Stage "dockerlogbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.257Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.258Z] Stage "Winlogbeat Windows x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.259Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.259Z] Stage "Journalbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.260Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T08:34:04.261Z] Stage "Kubernetes" skipped due to earlier failure(s)
[2020-07-01T08:34:04.358Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.359Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.360Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:04.361Z] Stage "Packetbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.362Z] Stage "dockerlogbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.362Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.363Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.364Z] Stage "Journalbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:04.365Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T08:34:04.986Z] Failed in branch Elastic Agent x-pack
[2020-07-01T08:34:04.987Z] Failed in branch Elastic Agent x-pack Windows
[2020-07-01T08:34:04.988Z] Failed in branch Elastic Agent Mac OS X
[2020-07-01T08:34:04.989Z] Failed in branch Filebeat oss
[2020-07-01T08:34:04.990Z] Failed in branch Filebeat x-pack
[2020-07-01T08:34:04.991Z] Failed in branch Filebeat Mac OS X
[2020-07-01T08:34:04.991Z] Failed in branch Filebeat x-pack Mac OS X
[2020-07-01T08:34:04.992Z] Failed in branch Filebeat Windows
[2020-07-01T08:34:04.993Z] Failed in branch Filebeat x-pack Windows
[2020-07-01T08:34:04.993Z] Failed in branch Auditbeat oss Linux
[2020-07-01T08:34:04.994Z] Failed in branch Auditbeat crosscompile
[2020-07-01T08:34:04.995Z] Failed in branch Auditbeat oss Mac OS X
[2020-07-01T08:34:04.995Z] Failed in branch Auditbeat oss Windows
[2020-07-01T08:34:04.996Z] Failed in branch Auditbeat x-pack
[2020-07-01T08:34:04.997Z] Failed in branch Auditbeat x-pack Mac OS X
[2020-07-01T08:34:04.997Z] Failed in branch Auditbeat x-pack Windows
[2020-07-01T08:34:04.998Z] Failed in branch Libbeat x-pack
[2020-07-01T08:34:04.999Z] Failed in branch Metricbeat OSS Unit tests
[2020-07-01T08:34:04.999Z] Failed in branch Metricbeat OSS Integration tests
[2020-07-01T08:34:05.000Z] Failed in branch Metricbeat Python integration tests
[2020-07-01T08:34:05.001Z] Failed in branch Metricbeat crosscompile
[2020-07-01T08:34:05.001Z] Failed in branch Metricbeat Mac OS X
[2020-07-01T08:34:05.002Z] Failed in branch Metricbeat x-pack Mac OS X
[2020-07-01T08:34:05.003Z] Failed in branch Metricbeat Windows
[2020-07-01T08:34:05.003Z] Failed in branch Metricbeat x-pack Windows
[2020-07-01T08:34:05.004Z] Failed in branch Winlogbeat Windows x-pack
[2020-07-01T08:34:05.005Z] Failed in branch Kubernetes
[2020-07-01T08:34:05.335Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.336Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.338Z] Stage "Metricbeat x-pack" skipped due to earlier failure(s)
[2020-07-01T08:34:05.340Z] Stage "Winlogbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.341Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.342Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T08:34:05.451Z] Failed in branch Packetbeat
[2020-07-01T08:34:05.453Z] Failed in branch dockerlogbeat
[2020-07-01T08:34:05.453Z] Failed in branch Journalbeat
[2020-07-01T08:34:05.685Z] Stage "Heartbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.686Z] Stage "Libbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.687Z] Stage "Functionbeat" skipped due to earlier failure(s)
[2020-07-01T08:34:05.688Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T08:34:05.727Z] Failed in branch Metricbeat x-pack
[2020-07-01T08:34:05.728Z] Failed in branch Winlogbeat
[2020-07-01T08:34:05.938Z] Failed in branch Heartbeat
[2020-07-01T08:34:05.939Z] Failed in branch Libbeat
[2020-07-01T08:34:05.939Z] Failed in branch Functionbeat
[2020-07-01T08:34:05.940Z] Stage "Generators" skipped due to earlier failure(s)
[2020-07-01T08:34:06.026Z] Failed in branch Generators
[2020-07-01T08:34:06.380Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-18116
[2020-07-01T08:34:06.525Z] [INFO] getVaultSecret: Getting secrets
[2020-07-01T08:34:06.612Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-07-01T08:34:07.635Z] + chmod 755 generate-build-data.sh
[2020-07-01T08:34:07.635Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/runs/12 ABORTED 220813
[2020-07-01T08:34:07.635Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/runs/12/steps/?limit=10000 -o steps-info.json
[2020-07-01T08:34:08.186Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-18116/runs/12/tests/?status=FAILED -o tests-errors.json

@andrewkroh
Copy link
Member

Thanks for contribution. Can you please rebase this on master to try to fix the changeset, it's really large at the moment:

Screen Shot 2020-06-05 at 8 49 50 AM

@hazcod
Copy link
Contributor Author

hazcod commented Jun 5, 2020

Hmm @andrewkroh , any idea how I would do that?
I'm trying to rebase but run against merge conflicts with files I never touched.

@@ -0,0 +1,100 @@
// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
// or more contributor license agreements. Licensed under the Elastic License;
// you may not use this file except in compliance with the Elastic License.

Choose a reason for hiding this comment

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

@hazcod / @andrewkroh : So I'm not entirely sure how these files got here, but it looks like a bunch of the x-pack inputs for filebeat were copied over into the non-x-pack folder and then the generator was run, resulting in the huge changeset.

We try and keep a strict separation between Elastic licensed code and the Apache-licensed stuff (with the Elastic licensed stuff in the x-pack directory), so these files should not be moved or copied around. Here's the commit where this happened: bb64918.

Since this is core to our project structure and our licensing model, you're likely going to need to revert that commit and fix up the rest of your contribution without it before we can accept it.

Copy link
Contributor Author

@hazcod hazcod Jun 5, 2020

Choose a reason for hiding this comment

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

Ah yes, I believe the reason was that the checkpoint module needs to be moved to be able to compile the module.

Choose a reason for hiding this comment

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

@hazcod -- so if you're modifying files in the x-pack directory you should still be able to compile/test using the x-pack entrypoint. The way these binaries work is that the Apache-licensed binary entrypoint is basically the filebeat/cmd sub-package. The x-pack/filebeat/cmd sub-package wraps the Apache-licensed entrypoint and includes all of the Elastic-licensed modules.

The Elastic-licensed binary we distribute is here: https://www.elastic.co/downloads/beats/filebeat, while the Apache-licensed binary, without the Elastic-licensed code is here: https://www.elastic.co/downloads/beats/filebeat-oss

So if you're trying to build or test changes involving the Elastic-licensed code, you'll just need to work in the x-pack/filebeat directory rather than filebeat directly. The make/mage commands for building and testing should be pretty much the same.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Seems like i compiled that wrong, I will open up a new PR this weekend.

@hazcod
Copy link
Contributor Author

hazcod commented Jul 1, 2020

Closing in favor of #19560

@hazcod hazcod closed this Jul 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants