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

update libbeat fields.ecs.yml file and ecsVersion to 1.10.0 #26121

Merged
merged 25 commits into from
Jun 25, 2021
Merged

update libbeat fields.ecs.yml file and ecsVersion to 1.10.0 #26121

merged 25 commits into from
Jun 25, 2021

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Jun 2, 2021 •
edited
Loading

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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 2, 2021
@kaiyan-sheng kaiyan-sheng self-assigned this Jun 2, 2021
@elasticmachine
Copy link
Collaborator

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

💚 Build Succeeded

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

Expand to view the summary

Build stats

  • Build Cause: kaiyan-sheng commented: /test

  • Start Time: 2021-06-24T23:09:46.280+0000

  • Duration: 75 min 19 sec

  • Commit: abeb4e1

Trends 🧪

Image of Build Times

❕ Flaky test report

No test was executed to be analysed.

@kaiyan-sheng kaiyan-sheng marked this pull request as ready for review June 3, 2021 20:06
@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner June 3, 2021 20:06
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jun 3, 2021
Closed
@mergify
Copy link
Contributor

mergify bot commented Jun 7, 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 ecs_version upstream/ecs_version
git merge upstream/master
git push upstream ecs_version

@mergify
Copy link
Contributor

mergify bot commented Jun 8, 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 ecs_version upstream/ecs_version
git merge upstream/master
git push upstream ecs_version

@kaiyan-sheng kaiyan-sheng requested a review from P1llus June 8, 2021 13:51
@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner June 8, 2021 17:05
@kaiyan-sheng
Copy link
Contributor Author

flaky test: #26181

@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Jun 9, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 9, 2021
@P1llus
Copy link
Member

P1llus commented Jun 9, 2021

/test

@kaiyan-sheng
Copy link
Contributor Author

/test

@kaiyan-sheng
Copy link
Contributor Author

CI failed because of #26239.

@kuisathaverat
Copy link
Contributor

/test

@v1v v1v mentioned this pull request Jun 16, 2021
Closed
@kaiyan-sheng
Copy link
Contributor Author

/test

@v1v
Copy link
Member

v1v commented Jun 22, 2021

/packaging

1 similar comment
@kaiyan-sheng
Copy link
Contributor Author

/packaging

@kaiyan-sheng
Copy link
Contributor Author

heartbeat CI failure: #26205

@mergify
Copy link
Contributor

mergify bot commented Jun 22, 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 ecs_version upstream/ecs_version
git merge upstream/master
git push upstream ecs_version

P1llus
P1llus approved these changes Jun 24, 2021
View reviewed changes
Copy link
Member

@P1llus P1llus left a comment

Choose a reason for hiding this comment

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

LGTM, one small comment, I remember you told me it was needed to get the PR to pass, but was unsure.

packetbeat/protos/http/event.go Show resolved Hide resolved
@kaiyan-sheng
Copy link
Contributor Author

/test

@kaiyan-sheng kaiyan-sheng merged commit fd2a235 into elastic:master Jun 25, 2021
@kaiyan-sheng kaiyan-sheng deleted the ecs_version branch June 25, 2021 03:33
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jun 25, 2021
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng added v7.14.0 and removed needs_backport PR is waiting to be backported to other branches. labels Jun 25, 2021
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Jun 28, 2021
@mdelapenya
Merge branch 'master' into archive-system-tests
b6dbec3 
* master: (32 commits)
  [Metricbeat] Change Account ID to Project ID in `gcp.billing` module (elastic#26412)
  update libbeat fields.ecs.yml file and ecsVersion to 1.10.0 (elastic#26121)
  [Filebeat] Update AWS ELB ingest pipeline (elastic#26441)
  [FIlebeat] add strict_date_optional_time_nanos date format to PanOS module (elastic#26158)
  Fix the irregular and typo on prometheus module. (elastic#25726)
  [Filebeat] Parse additonal debug data fields for Okta module (elastic#25818)
  fix: update MSSQL Server linux image's Docker registry (elastic#26440)
  Update indexing.go godocs (elastic#26408)
  Do not close filestream harvester if an unexpected error is returned when close.on_state_change.* is enabled (elastic#26411)
  Add support for copytruncate method when rotating input logs with an external tool in `filestream` input (elastic#23457)
  Allow fields with ip_range datatype (elastic#26444)
  Add Anomali ThreatStream support to threatintel module (elastic#26350)
  fix: use the right param type (elastic#26469)
  [Automation] Update elastic stack version to 8.0.0-7640093f for testing (elastic#26460)
  Set SM Filebeat modules as GA (elastic#26226)
  Fix rfc5464 date parsing in the syslog input (elastic#26419)
  Add linked account information into billing metricset (elastic#26285)
  [Filebeat] Update HA Proxy log grok patterns (elastic#25835)
  disable metricbeat logstash test_node_stats (elastic#26436)
  chore: pass BEAT_VERSION when running E2E tests (elastic#26291)
  ...
kaiyan-sheng added a commit that referenced this pull request Jun 29, 2021
@kaiyan-sheng
Cherry-pick #26121 to 7.x: update libbeat fields.ecs.yml file and ecs…
5d2baaa 
…Version to 1.10.0 (#26500)
@simitt simitt mentioned this pull request Sep 1, 2021
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@P1llus P1llus P1llus approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
Team:Integrations Label for the Integrations team v7.14.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kaiyan-sheng @elasticmachine @P1llus @kuisathaverat @v1v