Skip to content

Cherry-pick #26121 to 7.x: update libbeat fields.ecs.yml file and ecsVersion to 1.10.0#26500

Merged
kaiyan-sheng merged 5 commits intoelastic:7.xfrom
kaiyan-sheng:backport_26121_7.x
Jun 29, 2021
Merged

Cherry-pick #26121 to 7.x: update libbeat fields.ecs.yml file and ecsVersion to 1.10.0#26500
kaiyan-sheng merged 5 commits intoelastic:7.xfrom
kaiyan-sheng:backport_26121_7.x

Conversation

@kaiyan-sheng
Copy link
Copy Markdown
Contributor

@kaiyan-sheng kaiyan-sheng commented Jun 25, 2021 •
edited by zube bot
Loading

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

What does this PR do?

This PR is to update the fields.ecs.yml file in libbeat, which comes from the ECS repo: https://github.com/elastic/ecs/blob/1.10/generated/beats/fields.ecs.yml
Also updated ecsVersion variable from 1.9.0 to 1.10.0.

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.

@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner June 25, 2021 03:41
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 25, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 25, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 25, 2021
@kaiyan-sheng kaiyan-sheng self-assigned this Jun 25, 2021
@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner June 25, 2021 03:49
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 25, 2021 •
edited by jenkins-beats-ci bot
Loading

❕ Build Aborted

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

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts

Expand to view the summary

Build stats

  • Build Cause: Pull request #26500 updated

  • Reason: Aborted from #7

  • Start Time: 2021-06-28T19:29:41.404+0000

  • Duration: 5 min 9 sec

  • Commit: aefd057

Trends 🧪

Image of Build Times

Log output

Expand to view the last 100 lines of log output 

[2021-06-28T19:32:11.813Z]  > git rev-list --no-walk d7835fbbeeca8d76d0c71cc4638de2013745c71c # timeout=10
[2021-06-28T19:32:11.843Z] Cleaning workspace
[2021-06-28T19:32:12.823Z] Timeout set to expire in 3 hr 0 min
[2021-06-28T19:32:12.835Z] The timestamps step is unnecessary when timestamps are enabled for all Pipeline builds.
[2021-06-28T19:32:12.995Z] [INFO] Number of builds to be searched 10
[2021-06-28T19:32:11.845Z]  > git rev-parse --verify HEAD # timeout=10
[2021-06-28T19:32:11.849Z] Resetting working tree
[2021-06-28T19:32:11.849Z]  > git reset --hard # timeout=10
[2021-06-28T19:32:11.939Z]  > git clean -fdx # timeout=10
[2021-06-28T19:32:13.702Z] [INFO] 'shallow' is forced to be disabled when running on PullRequests
[2021-06-28T19:32:13.713Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-26500@tmp
[2021-06-28T19:32:13.727Z] [INFO] gitCheckout: Checkout SCM PR-26500 with default customisation from the Item.
[2021-06-28T19:32:13.749Z] [INFO] Override default checkout
[2021-06-28T19:32:13.782Z] Sleeping for 10 sec
[2021-06-28T19:32:23.802Z] The recommended git tool is: git
[2021-06-28T19:32:23.877Z] using credential f6c7695a-671e-4f4f-a331-acdce44ff9ba
[2021-06-28T19:32:23.884Z] Wiping out workspace first.
[2021-06-28T19:32:23.893Z] Cloning the remote Git repository
[2021-06-28T19:32:23.893Z] Using shallow clone with depth 10
[2021-06-28T19:32:23.893Z] Avoid fetching tags
[2021-06-28T19:32:23.908Z] Cloning repository git@github.com:elastic/beats.git
[2021-06-28T19:32:23.937Z]  > git init /var/lib/jenkins/workspace/Beats_beats_PR-26500@tmp # timeout=10
[2021-06-28T19:32:23.942Z] Fetching upstream changes from git@github.com:elastic/beats.git
[2021-06-28T19:32:23.943Z]  > git --version # timeout=10
[2021-06-28T19:32:23.946Z]  > git --version # 'git version 2.17.1'
[2021-06-28T19:32:23.946Z] using GIT_SSH to set credentials GitHub user @elasticmachine SSH key
[2021-06-28T19:32:23.950Z]  > git fetch --no-tags --progress -- git@github.com:elastic/beats.git +refs/heads/*:refs/remotes/origin/* # timeout=15
[2021-06-28T19:32:47.479Z] Cleaning workspace
[2021-06-28T19:32:47.499Z] Using shallow fetch with depth 10
[2021-06-28T19:32:47.499Z] Pruning obsolete local branches
[2021-06-28T19:32:48.734Z] Merging remotes/origin/7.x commit eb6df627ab10f31c73765c939b8858c03b126d35 into PR head commit aefd05732c9746143d3bbf5dada66c349b45df10
[2021-06-28T19:32:47.459Z]  > git config remote.origin.url git@github.com:elastic/beats.git # timeout=10
[2021-06-28T19:32:47.463Z]  > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
[2021-06-28T19:32:47.473Z]  > git config remote.origin.url git@github.com:elastic/beats.git # timeout=10
[2021-06-28T19:32:47.482Z]  > git rev-parse --verify HEAD # timeout=10
[2021-06-28T19:32:47.487Z] No valid HEAD. Skipping the resetting
[2021-06-28T19:32:47.487Z]  > git clean -fdx # timeout=10
[2021-06-28T19:32:47.503Z] Fetching upstream changes from git@github.com:elastic/beats.git
[2021-06-28T19:32:47.504Z] using GIT_SSH to set credentials GitHub user @elasticmachine SSH key
[2021-06-28T19:32:47.509Z]  > git fetch --no-tags --progress --prune -- git@github.com:elastic/beats.git +refs/pull/26500/head:refs/remotes/origin/PR-26500 +refs/heads/7.x:refs/remotes/origin/7.x # timeout=15
[2021-06-28T19:32:48.737Z]  > git config core.sparsecheckout # timeout=10
[2021-06-28T19:32:48.741Z]  > git checkout -f aefd05732c9746143d3bbf5dada66c349b45df10 # timeout=15
[2021-06-28T19:32:51.271Z] Merge succeeded, producing fbea8a96d139a45b38239788b0940cc485ae29bd
[2021-06-28T19:32:51.272Z] Checking out Revision fbea8a96d139a45b38239788b0940cc485ae29bd (PR-26500)
[2021-06-28T19:32:51.379Z] Commit message: "Merge commit 'eb6df627ab10f31c73765c939b8858c03b126d35' into HEAD"
[2021-06-28T19:32:50.449Z]  > git remote # timeout=10
[2021-06-28T19:32:50.453Z]  > git config --get remote.origin.url # timeout=10
[2021-06-28T19:32:50.457Z] using GIT_SSH to set credentials GitHub user @elasticmachine SSH key
[2021-06-28T19:32:50.461Z]  > git merge eb6df627ab10f31c73765c939b8858c03b126d35 # timeout=10
[2021-06-28T19:32:51.266Z]  > git rev-parse HEAD^{commit} # timeout=10
[2021-06-28T19:32:51.275Z]  > git config core.sparsecheckout # timeout=10
[2021-06-28T19:32:51.279Z]  > git checkout -f fbea8a96d139a45b38239788b0940cc485ae29bd # timeout=15
[2021-06-28T19:32:51.381Z]  > git rev-list --no-walk d7835fbbeeca8d76d0c71cc4638de2013745c71c # timeout=10
[2021-06-28T19:32:51.402Z] Cleaning workspace
[2021-06-28T19:32:51.404Z]  > git rev-parse --verify HEAD # timeout=10
[2021-06-28T19:32:51.411Z] Resetting working tree
[2021-06-28T19:32:51.411Z]  > git reset --hard # timeout=10
[2021-06-28T19:32:51.510Z]  > git clean -fdx # timeout=10
[2021-06-28T19:32:52.412Z] Masking supported pattern matches of $GIT_USERNAME or $GIT_PASSWORD
[2021-06-28T19:32:52.950Z] + git fetch https://****:****@github.com/elastic/beats.git +refs/pull/*/head:refs/remotes/origin/pr/*
[2021-06-28T19:34:14.606Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-26500@tmp/.git
[2021-06-28T19:34:14.715Z] Archiving artifacts
[2021-06-28T19:34:15.368Z] + git rev-parse HEAD
[2021-06-28T19:34:15.687Z] + git rev-parse HEAD
[2021-06-28T19:34:15.987Z] + git rev-parse origin/pr/26500
[2021-06-28T19:34:16.032Z] [INFO] githubEnv: Found Git Build Cause: pr
[2021-06-28T19:34:16.257Z] Masking supported pattern matches of $GITHUB_TOKEN
[2021-06-28T19:34:17.064Z] [WARN] githubApiCall: The REST API call https://api.github.com/repos/elastic/beats/pulls/26500/reviews return 0 elements
[2021-06-28T19:34:17.093Z] [INFO] githubPrCheckApproved: Title: Cherry-pick #26121 to 7.x: update libbeat fields.ecs.yml file and ecsVersion to 1.10.0 - User: kaiyan-sheng - Author Association: MEMBER
[2021-06-28T19:34:18.694Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-26500/src/github.com/elastic/beats
[2021-06-28T19:34:18.709Z] [INFO] Override default checkout
[2021-06-28T19:34:18.734Z] Sleeping for 10 sec
[2021-06-28T19:34:28.775Z] The recommended git tool is: git
[2021-06-28T19:34:28.788Z] using credential f6c7695a-671e-4f4f-a331-acdce44ff9ba
[2021-06-28T19:34:28.795Z] Wiping out workspace first.
[2021-06-28T19:34:28.806Z] Cloning the remote Git repository
[2021-06-28T19:34:28.806Z] Using shallow clone with depth 10
[2021-06-28T19:34:28.806Z] Avoid fetching tags
[2021-06-28T19:34:28.813Z] Cloning repository git@github.com:elastic/beats.git
[2021-06-28T19:34:28.813Z]  > git init /var/lib/jenkins/workspace/Beats_beats_PR-26500/src/github.com/elastic/beats # timeout=10
[2021-06-28T19:34:28.819Z] Fetching upstream changes from git@github.com:elastic/beats.git
[2021-06-28T19:34:28.819Z]  > git --version # timeout=10
[2021-06-28T19:34:28.822Z]  > git --version # 'git version 2.17.1'
[2021-06-28T19:34:28.823Z] using GIT_SSH to set credentials GitHub user @elasticmachine SSH key
[2021-06-28T19:34:28.827Z]  > git fetch --no-tags --progress -- git@github.com:elastic/beats.git +refs/heads/*:refs/remotes/origin/* # timeout=15
[2021-06-28T19:34:49.022Z] Stage "Lint" skipped due to earlier failure(s)
[2021-06-28T19:34:49.047Z] Stage "Build&Test" skipped due to earlier failure(s)
[2021-06-28T19:34:49.073Z] Stage "Extended" skipped due to earlier failure(s)
[2021-06-28T19:34:49.099Z] Stage "Packaging" skipped due to earlier failure(s)
[2021-06-28T19:34:49.126Z] Stage "Packaging-Pipeline" skipped due to earlier failure(s)
[2021-06-28T19:34:49.171Z] Running in /var/lib/jenkins/workspace/Beats_beats_PR-26500/src/github.com/elastic/beats
[2021-06-28T19:34:49.563Z] Running on Jenkins in /var/lib/jenkins/workspace/Beats_beats_PR-26500
[2021-06-28T19:34:49.649Z] [INFO] getVaultSecret: Getting secrets
[2021-06-28T19:34:49.686Z] Masking supported pattern matches of $VAULT_ADDR or $VAULT_ROLE_ID or $VAULT_SECRET_ID
[2021-06-28T19:34:50.380Z] + chmod 755 generate-build-data.sh
[2021-06-28T19:34:50.380Z] + ./generate-build-data.sh https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-26500/ https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-26500/runs/6 ABORTED 308712
[2021-06-28T19:34:50.380Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-26500/runs/6/steps/?limit=10000 -o steps-info.json
[2021-06-28T19:34:50.380Z] INFO: curl https://beats-ci.elastic.co/blue/rest/organizations/jenkins/pipelines/Beats/beats/PR-26500/runs/6/tests/?status=FAILED -o tests-errors.json
[2021-06-28T19:34:50.630Z] Retry 1/3 exited 22, retrying in 1 seconds...
[2021-06-28T19:34:51.541Z] Retry 2/3 exited 22, retrying in 2 seconds...

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 28, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b backport_26121_7.x upstream/backport_26121_7.x
git merge upstream/7.x
git push upstream backport_26121_7.x

@kaiyan-sheng
Copy link
Copy Markdown
Contributor Author

kaiyan-sheng commented Jun 29, 2021

/package

@kaiyan-sheng
Copy link
Copy Markdown
Contributor Author

kaiyan-sheng commented Jun 29, 2021

Sorry I have to merge this PR with beats-ci/pr-merge still hanging. I triggered it several times and it's being like this for days...

@kaiyan-sheng kaiyan-sheng merged commit 5d2baaa into elastic:7.x Jun 29, 2021
@kaiyan-sheng kaiyan-sheng deleted the backport_26121_7.x branch June 29, 2021 22:14
@zube zube bot removed the [zube]: Done label Sep 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@kaiyan-sheng kaiyan-sheng

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

@kaiyan-sheng @elasticmachine