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

[ECS] Update ecs to 1.6.0 #20792

Merged
merged 10 commits into from
Aug 31, 2020
Merged

[ECS] Update ecs to 1.6.0 #20792

merged 10 commits into from
Aug 31, 2020

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Aug 26, 2020

What does this PR do?

Updates ecs to 1.6.0.

Why is it important?

So we can update Beats to ship data using 1.6 fields.

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

Relates to #19472

@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@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 Aug 26, 2020
@marc-gr marc-gr requested a review from a team as a code owner August 26, 2020 08:39
@marc-gr marc-gr requested a review from a team August 26, 2020 08:43
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 26, 2020

💔 Build Failed

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Started by user Marc Guasch, Replayed #10]

  • Start Time: 2020-08-31T12:12:17.953+0000

  • Duration: 72 min 13 sec

Test stats 🧪

Test Results
Failed 0
Passed 17590
Skipped 1817
Total 19407

Steps errors

Expand to view the steps failures

  • Name: Mage build test

    • Description: mage build test

    • Duration: 5 min 11 sec

    • Start Time: 2020-08-31T12:36:32.467+0000

    • log

  • Name: Install python3:3.8

    • Description:

    • Duration: 17 min 15 sec

    • Start Time: 2020-08-31T12:37:45.560+0000

    • log

  • Name: Install Go 1.14.7

    • Description: .ci/scripts/install-go.sh

    • Duration: 1 min 32 sec

    • Start Time: 2020-08-31T12:36:17.290+0000

    • log

Log output

Expand to view the last 100 lines of log output

[2020-08-31T13:23:51.742Z] + tar -xpf source.tgz
[2020-08-31T13:24:02.081Z] + rm source.tgz
[2020-08-31T13:24:02.098Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats
[2020-08-31T13:24:02.122Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Lint
[2020-08-31T13:24:02.219Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Elastic-Agent-x-pack
[2020-08-31T13:24:02.314Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Winlogbeat-oss
[2020-08-31T13:24:02.414Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/dockerlogbeat
[2020-08-31T13:24:02.511Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-crosscompile
[2020-08-31T13:24:02.605Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Journalbeat
[2020-08-31T13:24:02.708Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Generators-Metricbeat-Linux
[2020-08-31T13:24:02.802Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Functionbeat-x-pack
[2020-08-31T13:24:02.901Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Libbeat-oss
[2020-08-31T13:24:02.991Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Elastic-Agent-x-pack-Windows
[2020-08-31T13:24:03.096Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Packetbeat-Linux
[2020-08-31T13:24:03.192Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-08-31T13:24:03.290Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Heartbeat-oss
[2020-08-31T13:24:03.391Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-oss-Windows
[2020-08-31T13:24:03.483Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-x-pack-Windows
[2020-08-31T13:24:03.574Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-x-pack
[2020-08-31T13:24:03.666Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Elastic-Agent-Mac-OS-X
[2020-08-31T13:24:03.754Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Heartbeat-Windows
[2020-08-31T13:24:03.847Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Filebeat-x-pack-Windows
[2020-08-31T13:24:03.947Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Winlogbeat-Windows-x-pack
[2020-08-31T13:24:04.107Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Winlogbeat-Windows
[2020-08-31T13:24:04.214Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-oss-Linux
[2020-08-31T13:24:04.321Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-08-31T13:24:04.415Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Filebeat-Windows
[2020-08-31T13:24:04.503Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Libbeat-x-pack
[2020-08-31T13:24:04.596Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Functionbeat-Windows
[2020-08-31T13:24:04.686Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-oss-Mac-OS-X
[2020-08-31T13:24:04.807Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-08-31T13:24:04.917Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Packetbeat-Windows
[2020-08-31T13:24:05.029Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Heartbeat-Mac-OS-X
[2020-08-31T13:24:05.133Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Filebeat-Mac-OS-X
[2020-08-31T13:24:05.226Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Auditbeat-x-pack-Mac-OS-X
[2020-08-31T13:24:05.332Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-08-31T13:24:05.450Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Generators-Metricbeat-Mac-OS-X
[2020-08-31T13:24:05.553Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Functionbeat-Mac-OS-X-x-pack
[2020-08-31T13:24:05.644Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-08-31T13:24:05.751Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Generators-Beat-Linux
[2020-08-31T13:24:05.848Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Packetbeat-Mac-OS-X
[2020-08-31T13:24:05.948Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Generators-Beat-Mac-OS-X
[2020-08-31T13:24:06.057Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack-Mac-OS-X
[2020-08-31T13:24:06.155Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Filebeat-x-pack
[2020-08-31T13:24:06.268Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Filebeat-oss
[2020-08-31T13:24:06.373Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-Windows
[2020-08-31T13:24:06.471Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests
[2020-08-31T13:24:06.568Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-OSS-Python-Integration-tests
[2020-08-31T13:24:06.662Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-08-31T13:24:07.090Z] + cat
[2020-08-31T13:24:07.090Z] + /usr/local/bin/runbld ./runbld-script --job-name elastic+beats+pull-request
[2020-08-31T13:24:07.090Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-08-31T13:24:13.693Z] runbld>>> runbld started
[2020-08-31T13:24:13.693Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-08-31T13:24:16.254Z] runbld>>> The following profiles matched the job 'elastic+beats+pull-request' in order of occurrence in the config (last value wins).
[2020-08-31T13:24:16.254Z] runbld>>> Matches in the system config:
[2020-08-31T13:24:16.254Z] runbld>>> - Matched ^elastic\+beats
[2020-08-31T13:24:16.254Z] runbld>>> - Matched ^elastic\+beats\+pull-request
[2020-08-31T13:24:17.241Z] runbld>>> Debug logging enabled.
[2020-08-31T13:24:17.241Z] runbld>>> Storing result
[2020-08-31T13:24:17.524Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-08-31T13:24:17.524Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200831132417-D1215135
[2020-08-31T13:24:17.524Z] runbld>>> Adding system facts.
[2020-08-31T13:24:18.544Z] runbld>>> Adding vcs info for the latest commit:  96cad3accdec6822fc69cc2689df7be188dd456c
[2020-08-31T13:24:18.544Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-08-31T13:24:18.544Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-08-31T13:24:18.544Z] Processing JUnit reports with runbld...
[2020-08-31T13:24:18.544Z] + echo 'Processing JUnit reports with runbld...'
[2020-08-31T13:24:19.133Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-08-31T13:24:19.133Z] runbld>>> DURATION: 24ms
[2020-08-31T13:24:19.133Z] runbld>>> STDOUT: 40 bytes
[2020-08-31T13:24:19.133Z] runbld>>> STDERR: 49 bytes
[2020-08-31T13:24:19.133Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-08-31T13:24:19.133Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats_PR-20792
[2020-08-31T13:24:20.101Z] runbld>>> Storing build metadata: 
[2020-08-31T13:24:20.101Z] runbld>>> Adding test report.
[2020-08-31T13:24:20.101Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats
[2020-08-31T13:24:20.705Z] runbld>>> Found 138 test output files
[2020-08-31T13:24:22.671Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-08-31T13:24:22.671Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-08-31T13:24:22.671Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-08-31T13:24:22.671Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-08-31T13:24:22.671Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-08-31T13:24:23.264Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests/metricbeat/build/TEST-go-integration-graphite.xml
[2020-08-31T13:24:23.264Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats_PR-20792/src/github.com/elastic/beats/Metricbeat-OSS-Go-Integration-tests/metricbeat/build/TEST-go-integration-windows.xml
[2020-08-31T13:24:23.531Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 19254 Skipped: 1557
[2020-08-31T13:24:23.812Z] runbld>>> Storing result
[2020-08-31T13:24:23.812Z] runbld>>> FAILURES: 0
[2020-08-31T13:24:24.086Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-08-31T13:24:24.086Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1597739501209/t/20200831132417-D1215135
[2020-08-31T13:24:24.086Z] runbld>>> Email notification disabled by environment variable.
[2020-08-31T13:24:24.086Z] runbld>>> Slack notification disabled by environment variable.
[2020-08-31T13:24:29.812Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-20792
[2020-08-31T13:24:29.931Z] [INFO] getVaultSecret: Getting secrets
[2020-08-31T13:24:30.004Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-08-31T13:24:30.899Z] + chmod 755 generate-build-data.sh
[2020-08-31T13:24:30.899Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20792/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20792/runs/11 FAILURE 4332681
[2020-08-31T13:24:30.899Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20792/runs/11/steps/?limit=10000 -o steps-info.json
[2020-08-31T13:24:34.127Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20792/runs/11/tests/?status=FAILED -o tests-errors.json
[2020-08-31T13:24:35.038Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-20792/runs/11/log/ -o pipeline-log.txt

@marc-gr marc-gr added the in progress Pull request is currently in progress. label Aug 26, 2020
@marc-gr marc-gr added review and removed in progress Pull request is currently in progress. labels Aug 27, 2020
Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

LGTM

@marc-gr marc-gr merged commit ef457ea into elastic:master Aug 31, 2020
@marc-gr marc-gr deleted the update-ecs branch August 31, 2020 13:48
marc-gr added a commit to marc-gr/beats that referenced this pull request Sep 2, 2020
* Update ecs to 1.6.0

* Update fields.ecs.yml and re generate fields files

* Remove filebeat duplicated cloud.project.id

* Remove filebeat duplicated log.file.path

* Remove repeated cloud.project.id from remaining beats

* Remove duplicated x509.* fields from metricbeat

* Remove duplicated x509.* fields in packetbeat

* Remove duplicated field log.file.path from winlogbeat

* Add missing exports tests and better error message

* Run make fmt

(cherry picked from commit ef457ea)
marc-gr added a commit that referenced this pull request Sep 2, 2020
* Update ecs to 1.6.0

* Update fields.ecs.yml and re generate fields files

* Remove filebeat duplicated cloud.project.id

* Remove filebeat duplicated log.file.path

* Remove repeated cloud.project.id from remaining beats

* Remove duplicated x509.* fields from metricbeat

* Remove duplicated x509.* fields in packetbeat

* Remove duplicated field log.file.path from winlogbeat

* Add missing exports tests and better error message

* Run make fmt

(cherry picked from commit ef457ea)
v1v added a commit to v1v/beats that referenced this pull request Sep 2, 2020
…ne-2.0

* upstream/master: (87 commits)
  [packaging] Normalise GCP bucket folder structure (elastic#20903)
  [Metricbeat] Add billing metricset into googlecloud module (elastic#20812)
  Include python docs in devguide index (elastic#20917)
  Avoid generating incomplete configurations in autodiscover (elastic#20898)
  Improve docs of leaderelection configuration (elastic#20601)
  Document how to set the ES host and Kibana URLs in Ingest Manager (elastic#20874)
  docs: Update beats for APM (elastic#20881)
  Adding cborbeat to community beats (elastic#20884)
  Bump kibana version to 7.9.0 in x-pack/metricbeat (elastic#20899)
  Kubernetes state_daemonset metricset for Metricbeat (elastic#20649)
  [Filebeat][zeek] Add new x509 fields to zeek (elastic#20867)
  [Filebeat][Gsuite] Add note about admin in gsuite docs (elastic#20855)
  Ensure kind cluster has RFC1123 compliant name (elastic#20627)
  Setup python paths in test runner configuration (elastic#20832)
  docs: Add  `processor.event` info to Logstash output (elastic#20721)
  docs: update cipher suites (elastic#20697)
  [ECS] Update ecs to 1.6.0 (elastic#20792)
  Fix path in hits docs (elastic#20447)
  Update filebeat azure module documentation (elastic#20815)
  Remove duplicate ListGroupsForUsers in aws/cloudtrail (elastic#20788)
  ...
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
* Update ecs to 1.6.0

* Update fields.ecs.yml and re generate fields files

* Remove filebeat duplicated cloud.project.id

* Remove filebeat duplicated log.file.path

* Remove repeated cloud.project.id from remaining beats

* Remove duplicated x509.* fields from metricbeat

* Remove duplicated x509.* fields in packetbeat

* Remove duplicated field log.file.path from winlogbeat

* Add missing exports tests and better error message

* Run make fmt
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.

3 participants