Skip to content

Cherry-pick #22571 to 7.x: Upgrade to ECS 1.7.0#22938

Merged
andrewstucki merged 2 commits intoelastic:7.xfrom
andrewstucki:backport_22571_7.x
Dec 8, 2020
Merged

Cherry-pick #22571 to 7.x: Upgrade to ECS 1.7.0#22938
andrewstucki merged 2 commits intoelastic:7.xfrom
andrewstucki:backport_22571_7.x

Conversation

@andrewstucki
Copy link
Copy Markdown

@andrewstucki andrewstucki commented Dec 4, 2020

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

What does this PR do?

This adds the upcoming ECS 1.7.0 yml file and updates all references to ecs.version -- also, it adds ecs.version data to the beats that were lacking it.

It's currently in draft because the final ECS 1.7.0 release isn't cut yet. But, once it is, if anything has changed, it should just be a matter of re-importing the fields.ecs.yml file and re-running make update.

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.

* Upgrade to ECS 1.7.0

* Update changelog

* remove user.effective fields from custom fields and update functionbeat

* Run make update (not mage update) on heartbeat

* Add in dns.address and re-update all beats

* fix x-pack metricbeat host processor

* Update to released ECS 1.7

* update to fixed ECS

* Fix bad filebeat ECS name

* metricset -> fileset

* Fix up expected load balancer log

* Fix up alb expected log

(cherry picked from commit a551b25)
@andrewstucki andrewstucki requested a review from a team as a code owner December 4, 2020 20:52
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 4, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Dec 4, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Dec 4, 2020

💚 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: Pull request #22938 updated

  • Start Time: 2020-12-04T20:54:28.156+0000

  • Duration: 66 min 17 sec

Test stats 🧪

Test Results
Failed 0
Passed 16853
Skipped 1398
Total 18251

Steps errors 1

Expand to view the steps failures

filebeat-Lint - Install Go/Mage/Python/Docker/Terraform 1.14.12
  • Took 1 min 32 sec . View more details on here
  • Description: .ci/scripts/install-tools.sh

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 16853
Skipped 1398
Total 18251

@andrewstucki andrewstucki requested a review from a team December 7, 2020 18:17
Copy link
Copy Markdown
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewstucki andrewstucki merged commit 18acabc into elastic:7.x Dec 8, 2020
@zube zube bot removed the [zube]: Done label Mar 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants