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 #19019 to 7.x: Make user.id a string in system/users, in line with ECS #19204

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Cherry-pick #19019 to 7.x: Make user.id a string in system/users, in line with ECS #19204

merged 1 commit into from
Jun 30, 2020

Conversation

fearful-symmetry
Copy link
Contributor

@fearful-symmetry fearful-symmetry commented Jun 15, 2020 •
edited by zube bot
Loading

Cherry-pick of PR #19019 to 7.x branch. Original message:

What does this PR do?

This is a quick change to make the user.id field in the system/users metricset a keyword, which is what ECS wants: https://www.elastic.co/guide/en/ecs/current/ecs-user.html

Why is it important?

Metricset should be ECS compliant.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@fearful-symmetry
Make user.id a string in system/users, in line with ECS (elastic#19019)
326c374 
* user.id must be a string

* changelog entry

* make it a breaking change

(cherry picked from commit de57f06)
@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 15, 2020
@fearful-symmetry fearful-symmetry requested a review from a team June 15, 2020 18:10
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 15, 2020 •
edited
Loading

❕ Build Aborted

Either there was a build timeout or someone aborted the build.'}

Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: [Branch indexing]

  • Start Time: 2020-06-27T17:28:46.227+0000

  • Duration: 123 min 15 sec

Test stats 🧪

Test Results
Failed 0
Passed 3707
Skipped 822
Total 4529

Log output

Expand to view the last 100 lines of log output 

[2020-06-27T19:31:25.440Z] + git config --get user.email
[2020-06-27T19:31:25.440Z] + [ -z  ]
[2020-06-27T19:31:25.440Z] + git config user.email [email protected]
[2020-06-27T19:31:25.440Z] + git config user.name beatsmachine
[2020-06-27T19:31:25.854Z] + .ci/scripts/terraform-cleanup.sh x-pack/metricbeat
[2020-06-27T19:31:25.854Z] + DIRECTORY=x-pack/metricbeat
[2020-06-27T19:31:25.854Z] + FAILED=0
[2020-06-27T19:31:25.854Z] ++ find x-pack/metricbeat -name terraform.tfstate
[2020-06-27T19:31:25.854Z] + exit 0
[2020-06-27T19:31:26.235Z] + curl -sSLo codecov https://codecov.io/bash
[2020-06-27T19:31:26.495Z] + FILE=auditbeat/build/coverage/full.cov
[2020-06-27T19:31:26.495Z] + [ -f auditbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.495Z] + FILE=filebeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f filebeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.496Z] + FILE=heartbeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f heartbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.496Z] + FILE=libbeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f libbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.496Z] + FILE=metricbeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f metricbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.496Z] + FILE=packetbeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f packetbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.496Z] + FILE=winlogbeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f winlogbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.496Z] + FILE=journalbeat/build/coverage/full.cov
[2020-06-27T19:31:26.496Z] + [ -f journalbeat/build/coverage/full.cov ]
[2020-06-27T19:31:26.906Z] Failed in branch Metricbeat x-pack
[2020-06-27T19:31:38.915Z] Body did not finish within grace period; terminating with extreme prejudice
[2020-06-27T19:31:38.997Z] Error when executing always post condition:
[2020-06-27T19:31:38.998Z] org.jenkinsci.plugins.workflow.steps.FlowInterruptedException
[2020-06-27T19:31:38.998Z] 	at org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution.cancel(TimeoutStepExecution.java:165)
[2020-06-27T19:31:38.998Z] 	at org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution.access$100(TimeoutStepExecution.java:38)
[2020-06-27T19:31:38.998Z] 	at org.jenkinsci.plugins.workflow.steps.TimeoutStepExecution$1.run(TimeoutStepExecution.java:139)
[2020-06-27T19:31:38.998Z] 	at jenkins.security.ImpersonatingScheduledExecutorService$1.run(ImpersonatingScheduledExecutorService.java:58)
[2020-06-27T19:31:38.998Z] 	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511)
[2020-06-27T19:31:38.998Z] 	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
[2020-06-27T19:31:38.998Z] 	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180)
[2020-06-27T19:31:38.998Z] 	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293)
[2020-06-27T19:31:38.998Z] 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
[2020-06-27T19:31:38.998Z] 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
[2020-06-27T19:31:38.998Z] 	at java.lang.Thread.run(Thread.java:748)
[2020-06-27T19:31:38.998Z] 
[2020-06-27T19:31:39.058Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats
[2020-06-27T19:31:39.371Z] + find . -type f -name TEST*.xml -path */build/* -delete
[2020-06-27T19:31:39.383Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Lint
[2020-06-27T19:31:39.471Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-OSS-Unit-tests
[2020-06-27T19:31:39.557Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-OSS-Integration-tests
[2020-06-27T19:31:39.632Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-Windows
[2020-06-27T19:31:39.720Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack-Windows
[2020-06-27T19:31:39.795Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-crosscompile
[2020-06-27T19:31:39.887Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-Python-integration-tests
[2020-06-27T19:31:39.983Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Filebeat-x-pack-Mac-OS-X
[2020-06-27T19:31:40.063Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-Mac-OS-X
[2020-06-27T19:31:40.160Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack-Mac-OS-X
[2020-06-27T19:31:40.259Z] Running in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack
[2020-06-27T19:31:40.625Z] + cat
[2020-06-27T19:31:40.625Z] + /usr/local/bin/runbld ./runbld-script
[2020-06-27T19:31:40.625Z] Picked up JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF8
[2020-06-27T19:31:47.226Z] runbld>>> runbld started
[2020-06-27T19:31:47.226Z] runbld>>> 1.6.12/f45d832f2ba0aa2722ab4ec1fda8ad140f027f8b
[2020-06-27T19:31:48.179Z] runbld>>> The following profiles matched the job 'Beats/beats-beats-mbp/PR-19204' in order of occurrence in the config (last value wins).
[2020-06-27T19:31:49.562Z] runbld>>> Debug logging enabled.
[2020-06-27T19:31:49.562Z] runbld>>> Storing result
[2020-06-27T19:31:49.562Z] runbld>>> Store result: created {:total 2, :successful 2, :failed 0} 1
[2020-06-27T19:31:49.562Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200627193149-6274FEFD
[2020-06-27T19:31:49.826Z] runbld>>> Adding system facts.
[2020-06-27T19:31:50.403Z] runbld>>> Adding vcs info for the latest commit:  e91ee43926d5f8323f13250509120cbeee8dfda7
[2020-06-27T19:31:50.403Z] runbld>>> >>>>>>>>>>>> SCRIPT EXECUTION BEGIN >>>>>>>>>>>>
[2020-06-27T19:31:50.403Z] runbld>>> Adding /usr/lib/jvm/java-8-openjdk-amd64/bin to the path.
[2020-06-27T19:31:50.404Z] Processing JUnit reports with runbld...
[2020-06-27T19:31:50.663Z] + echo 'Processing JUnit reports with runbld...'
[2020-06-27T19:31:50.923Z] runbld>>> <<<<<<<<<<<< SCRIPT EXECUTION END <<<<<<<<<<<<
[2020-06-27T19:31:50.923Z] runbld>>> DURATION: 23ms
[2020-06-27T19:31:50.923Z] runbld>>> STDOUT: 40 bytes
[2020-06-27T19:31:50.923Z] runbld>>> STDERR: 49 bytes
[2020-06-27T19:31:50.923Z] runbld>>> WRAPPED PROCESS: SUCCESS (0)
[2020-06-27T19:31:50.923Z] runbld>>> Searching for build metadata in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats
[2020-06-27T19:31:52.307Z] runbld>>> Storing build metadata: 
[2020-06-27T19:31:52.307Z] runbld>>> Adding test report.
[2020-06-27T19:31:52.307Z] runbld>>> Searching for junit test output files with the pattern: TEST-.*\.xml$ in: /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats
[2020-06-27T19:31:53.691Z] runbld>>> Found 35 test output files
[2020-06-27T19:31:53.691Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-iis.xml
[2020-06-27T19:31:53.691Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-istio.xml
[2020-06-27T19:31:53.692Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-activemq.xml
[2020-06-27T19:31:53.952Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-tomcat.xml
[2020-06-27T19:31:53.952Z] runbld>>> No testsuite node found in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204/src/github.com/elastic/beats/Metricbeat-x-pack/x-pack/metricbeat/build/TEST-go-integration-openmetrics.xml
[2020-06-27T19:31:54.525Z] runbld>>> Test output logs contained: Errors: 0 Failures: 0 Tests: 4529 Skipped: 710
[2020-06-27T19:31:54.784Z] runbld>>> Storing result
[2020-06-27T19:31:54.784Z] runbld>>> FAILURES: 0
[2020-06-27T19:31:55.043Z] runbld>>> Store result: updated {:total 2, :successful 2, :failed 0} 2
[2020-06-27T19:31:55.043Z] runbld>>> BUILD: https://c150076387b5421f9154dfbf536e5c60.us-west1.gcp.cloud.es.io:9243/build-1587637540455/t/20200627193149-6274FEFD
[2020-06-27T19:31:55.043Z] runbld>>> Email notification disabled by environment variable.
[2020-06-27T19:31:55.043Z] runbld>>> Slack notification disabled by environment variable.
[2020-06-27T19:32:00.596Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats-beats-mbp_PR-19204
[2020-06-27T19:32:00.788Z] [INFO] getVaultSecret: Getting secrets
[2020-06-27T19:32:00.858Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2020-06-27T19:32:01.668Z] + chmod 755 generate-build-data.sh
[2020-06-27T19:32:01.668Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19204/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19204/runs/7 ABORTED 7395173
[2020-06-27T19:32:01.668Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19204/runs/7/steps/?limit=10000 -o steps-info.json
[2020-06-27T19:32:02.579Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats-beats-mbp/PR-19204/runs/7/tests/?status=FAILED -o tests-errors.json

@fearful-symmetry fearful-symmetry merged commit 415c6d1 into elastic:7.x Jun 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@fearful-symmetry @elasticmachine @ChrsMark