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 fields.ecs.yml to 1.12 #27770

Merged
merged 5 commits into from
Oct 1, 2021
Merged

Conversation

marc-gr
Copy link
Contributor

@marc-gr marc-gr commented Sep 7, 2021

What does this PR do?

  • fields.ecs.yml to ECS 1.12.0-dev
  • bump ecs.version in configs for modules that don't require changes.

Why is it important?

  • keep up to date with ECS changes
  • allows modules to use new ECS 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.

How to test this PR locally

cd filebeat && mage pythonIntegTest
cd x-pack/filebeat && mage pythonIntegTest

Closes #27835

@marc-gr marc-gr added enhancement in progress Pull request is currently in progress. ecs Team:Security-External Integrations backport-v7.16.0 Automated backport with mergify labels Sep 7, 2021
@marc-gr marc-gr requested a review from a team as a code owner September 7, 2021 11:01
@elasticmachine
Copy link
Collaborator

Pinging @elastic/security-external-integrations (Team:Security-External 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 Sep 7, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 7, 2021

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-09-30T09:58:37.850+0000

  • Duration: 223 min 50 sec

  • Commit: 0dccfea

Test stats 🧪

Test Results
Failed 0
Passed 54147
Skipped 5328
Total 59475

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@mergify
Copy link
Contributor

mergify bot commented Sep 16, 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-1.12 upstream/ecs-1.12
git merge upstream/master
git push upstream ecs-1.12

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.

This changes message to use match_only_text which was introduced in 7.14. I think libbeat should fall-back to text if that type is not available. We added something similar for wildcard at

case "wildcard":
noWildcards := p.EsVersion.LessThan(minVersionWildcard)
if !p.ElasticLicensed || noWildcards {
indexMapping = p.keyword(&field)
} else {
indexMapping = p.wildcard(&field)
}
.

@marc-gr marc-gr force-pushed the ecs-1.12 branch 2 times, most recently from 7f10576 to be2a882 Compare September 27, 2021 11:35
@mergify
Copy link
Contributor

mergify bot commented Sep 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 ecs-1.12 upstream/ecs-1.12
git merge upstream/master
git push upstream ecs-1.12

@marc-gr marc-gr force-pushed the ecs-1.12 branch 3 times, most recently from f85962b to e31acb9 Compare September 29, 2021 13:04
@marc-gr marc-gr removed the in progress Pull request is currently in progress. label Sep 29, 2021
Copy link
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

CHANGELOG.next.asciidoc Outdated Show resolved Hide resolved
Copy link
Contributor

@mdelapenya mdelapenya left a comment

Choose a reason for hiding this comment

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

From E2E stand point, I'd say this PR is OK, as the errors we are seeing in the build history are considered flaky

@marc-gr marc-gr merged commit cca59ba into elastic:master Oct 1, 2021
@marc-gr marc-gr deleted the ecs-1.12 branch October 1, 2021 13:34
marc-gr added a commit that referenced this pull request Oct 1, 2021
* Update fields.ecs.yml to 1.12

* Fallback to text when match_only_text is unavailable

* Add changelog entry

* Amend changelog entry

* Remove duplicated service.address field from metricbeat

(cherry picked from commit cca59ba)

# Conflicts:
#	auditbeat/include/fields.go
#	filebeat/docs/fields.asciidoc
#	filebeat/include/fields.go
#	go.mod
#	heartbeat/include/fields.go
#	journalbeat/include/fields.go
#	metricbeat/docs/fields.asciidoc
#	metricbeat/include/fields/fields.go
#	packetbeat/include/fields.go
#	winlogbeat/include/fields.go
#	x-pack/functionbeat/include/fields.go
#	x-pack/heartbeat/include/fields.go
#	x-pack/osquerybeat/include/fields.go
marc-gr added a commit that referenced this pull request Oct 4, 2021
* Update fields.ecs.yml to 1.12

* Fallback to text when match_only_text is unavailable

* Add changelog entry

* Amend changelog entry

* Remove duplicated service.address field from metricbeat

(cherry picked from commit cca59ba)

# Conflicts:
#	auditbeat/include/fields.go
#	filebeat/docs/fields.asciidoc
#	filebeat/include/fields.go
#	go.mod
#	heartbeat/include/fields.go
#	journalbeat/include/fields.go
#	metricbeat/docs/fields.asciidoc
#	metricbeat/include/fields/fields.go
#	packetbeat/include/fields.go
#	winlogbeat/include/fields.go
#	x-pack/functionbeat/include/fields.go
#	x-pack/heartbeat/include/fields.go
#	x-pack/osquerybeat/include/fields.go
marc-gr added a commit that referenced this pull request Oct 5, 2021
* Update fields.ecs.yml to 1.12

* Fallback to text when match_only_text is unavailable

* Add changelog entry

* Amend changelog entry

* Remove duplicated service.address field from metricbeat

(cherry picked from commit cca59ba)
marc-gr added a commit that referenced this pull request Oct 6, 2021
* Update fields.ecs.yml to 1.12

* Fallback to text when match_only_text is unavailable

* Add changelog entry

* Amend changelog entry

* Remove duplicated service.address field from metricbeat

(cherry picked from commit cca59ba)

Co-authored-by: Marc Guasch <marc-gr@users.noreply.github.com>
Icedroid pushed a commit to Icedroid/beats that referenced this pull request Nov 1, 2021
* Update fields.ecs.yml to 1.12

* Fallback to text when match_only_text is unavailable

* Add changelog entry

* Amend changelog entry

* Remove duplicated service.address field from metricbeat
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-v7.16.0 Automated backport with mergify ecs enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade ECS to 1.12
5 participants