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

[Packetbeat] ECS 1.5 update #19167

Merged
merged 5 commits into from
Jun 18, 2020

Conversation

andrewstucki
Copy link

@andrewstucki andrewstucki commented Jun 12, 2020

What does this PR do?

Updates packetbeat to use ECS categorization and related.ip fields. Also, readies the TLS protocol parser to use the new x509 fields coming in 1.6.

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.

Related issues

@andrewstucki andrewstucki requested a review from a team as a code owner June 12, 2020 16:40
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 12, 2020
@andrewstucki andrewstucki added enhancement needs_backport PR is waiting to be backported to other branches. Packetbeat Team:SIEM labels Jun 12, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/siem (Team:SIEM)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 12, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 12, 2020

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #19167 updated]

  • Start Time: 2020-06-18T14:53:41.697+0000

  • Duration: 42 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 718
Skipped 128
Total 846

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 looks good 👍 . Another person should look it over too. It needs a changelog entry.

packetbeat/pb/event.go Show resolved Hide resolved
Copy link
Contributor

@adriansr adriansr left a comment

Choose a reason for hiding this comment

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

LGTM

Left a couple of minor suggestions.

packetbeat/pb/ecs.go Show resolved Hide resolved
packetbeat/pb/event.go Outdated Show resolved Hide resolved
@andrewstucki andrewstucki merged commit 9e9aa88 into elastic:master Jun 18, 2020
andrewstucki pushed a commit to andrewstucki/beats that referenced this pull request Jun 18, 2020
* Add packetbeat changes

* Fix up tests

* Add changelog entry

* Add compile time upgrade guard as a reminder and add inline marshal tag for ecs

* Fix early termination for marshaling code

(cherry picked from commit 9e9aa88)
@andrewstucki andrewstucki added v7.9.0 and removed needs_backport PR is waiting to be backported to other branches. labels Jun 18, 2020
andrewstucki pushed a commit that referenced this pull request Jun 18, 2020
* Add packetbeat changes

* Fix up tests

* Add changelog entry

* Add compile time upgrade guard as a reminder and add inline marshal tag for ecs

* Fix early termination for marshaling code

(cherry picked from commit 9e9aa88)
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
* Add packetbeat changes

* Fix up tests

* Add changelog entry

* Add compile time upgrade guard as a reminder and add inline marshal tag for ecs

* Fix early termination for marshaling code
andrewkroh added a commit to andrewkroh/integrations that referenced this pull request Apr 13, 2022
- Remove tls.detailed.{client,server}_certificate.
- Update dashboards to use tls.{client,server}.x509.* instead of tls.detailed.{client,server}_certificate.*
- Remove mappings for 'province'. Those fields was renamed in Packetbeat 7.9 to state_or_province (per ECS) (elastic/beats#19167).
andrewkroh added a commit to elastic/integrations that referenced this pull request Apr 19, 2022
* Sort all ecs.yml by field name

[git-generate]
cd packages/network_traffic
for ds in $(ls data_stream); do yq -i '. | sort_by(.name)' data_stream/$ds/fields/ecs.yml; done
for ds in $(ls data_stream); do yq -i 'sort_keys(..)' data_stream/$ds/fields/ecs.yml; done
elastic-package format

* Add missing dns.answers.* fields

Arrays fields are not validated by elastic-package so these were missed.

* Add missing TLS field mappings

Add another TLS test case to expose more TLS fields.
Import ECS mappings for all of `tls.*`.
Convert tls.*.x509.version_number to string
Remove unused tls.*.x509.version mapping

* Remove duplicated TLS fields from Packetbeat 7.17

- Remove tls.detailed.{client,server}_certificate.
- Update dashboards to use tls.{client,server}.x509.* instead of tls.detailed.{client,server}_certificate.*
- Remove mappings for 'province'. Those fields was renamed in Packetbeat 7.9 to state_or_province (per ECS) (elastic/beats#19167).

* Add missing event.* field mappings

* Update readme

[git-generate]
cd packages/network_traffic
elastic-package build

* Add changelog entry

[git-generate]
cd packages/network_traffic
elastic-package-changelog add-next -d "Add missing field mappings to DNS and TLS data streams." --type=bug --pr 3078
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Packetbeat] Update Packetbeat to ECS 1.5
4 participants