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

[Filebeat] Remove space from field sophos.xg.trans_src_ ip #25250

Merged
merged 1 commit into from
May 4, 2021

Conversation

legoguy1000
Copy link
Contributor

What does this PR do?

Removes the space in sophos.xg.trans_src_ ip -> sophos.xg.trans_src_ip

Why is it important?

Field has an invalid space

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.

Author's Checklist

  • [ ]

How to test this PR locally

cd beats/x-pack/filebeat
TESTING_FILEBEAT_MODULES=sophos mage -v pythonIntegTest

Related issues

Use cases

Screenshots

Logs

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 22, 2021
@legoguy1000 legoguy1000 marked this pull request as ready for review April 22, 2021 22:53
@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 22, 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

Expand to view the summary

Build stats

  • Build Cause: P1llus commented: run tests

  • Start Time: 2021-05-04T05:48:57.181+0000

  • Duration: 181 min 47 sec

  • Commit: 153f9ef

Trends 🧪

Image of Build Times

❕ Flaky test report

No test was executed to be analysed.

@elasticmachine
Copy link
Collaborator

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 Apr 23, 2021
@jamiehynds jamiehynds added the bug label Apr 23, 2021
@mergify
Copy link
Contributor

mergify bot commented Apr 26, 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 25154-sophos-field-fix upstream/25154-sophos-field-fix
git merge upstream/master
git push upstream 25154-sophos-field-fix

@legoguy1000
Copy link
Contributor Author

@andrewkroh Can you take a look at this one too. Should be a quick one.

@mergify
Copy link
Contributor

mergify bot commented Apr 27, 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 25154-sophos-field-fix upstream/25154-sophos-field-fix
git merge upstream/master
git push upstream 25154-sophos-field-fix

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, will await CI to pass then merge.

@P1llus
Copy link
Member

P1llus commented May 4, 2021

run tests

@P1llus P1llus merged commit a5079ef into elastic:master May 4, 2021
@P1llus
Copy link
Member

P1llus commented May 4, 2021

Could you backport this to 7.x, 7.12 and 7.13 branches @legoguy1000 ?

@legoguy1000 legoguy1000 deleted the 25154-sophos-field-fix branch May 4, 2021 11:44
legoguy1000 added a commit to legoguy1000/beats that referenced this pull request May 4, 2021
legoguy1000 added a commit to legoguy1000/beats that referenced this pull request May 4, 2021
legoguy1000 added a commit to legoguy1000/beats that referenced this pull request May 4, 2021
P1llus added a commit that referenced this pull request May 5, 2021
…s.xg.trans_src_ ip` (#25525)

* #25154: Remove space from field `sophos.xg.trans_src_ ip` (#25250)

(cherry picked from commit a5079ef)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Marius Iversen <marius.iversen@elastic.co>
P1llus added a commit that referenced this pull request May 5, 2021
…s.xg.trans_src_ ip` (#25526)

* #25154: Remove space from field `sophos.xg.trans_src_ ip` (#25250)

(cherry picked from commit a5079ef)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Marius Iversen <marius.iversen@elastic.co>
P1llus pushed a commit that referenced this pull request May 5, 2021
andrewkroh added a commit to andrewkroh/integrations that referenced this pull request Apr 20, 2022
andrewkroh added a commit to elastic/integrations that referenced this pull request Apr 21, 2022
Remove space from sophos.xg.trans_src_ip field name in mapping. Sync fix from elastic/beats#25250.

Do not modify event.original.

Populate `url.*` fields based on `sophos.xg.url`.

Rename `sophos.xg.reason` to `event.reason` (ECS).

Normalize all `sophos.xg.*` keys to lowercase.

Lowercase `network.transport` as per ECS.

Format `source.mac` and `destination.mac` as per ECS.

Add Sophos Firewall 18.5 log samples taken from documentation.

Set the `event.code` from the message ID (and remove `sophos.xg.messageid`).

Consolidate geoip enrichment

Consolidate related.ip processors

Consolidate lowercase network.transport/protocol

Consolidate related.user processing

Consolidate related.hash

Consolidate network.{bytes,packets} calculations

Add network.community_id

Add {url,source,destination}.domain to related.hosts

Set event.duration (ns) for WAF events using reponsetime (us)

Remove client/server mappings. This was a large amount of duplication causing increased event sizes.

Add reference link to xg syslog formats

Anti-Virus

- Set `destination.domain` from `sophos.xg.dstdomain` in anti-virus log.

- Use `sophos.xg.dst_domainname` to set `destination.domain` for Anti-Virus SMTP events.

- Use `sophos.xg.src_domainname` to set `source.domain` for Anti-Virus SMTP events.

- Set `network.protocol` for anti-virus logs.

Anti-Spam

- Set `network.protocol` for anti-spam logs.

Content Filtering

- Set `network.protocol` for Content Filtering. Use the URL scheme to derive the protocol.

Sandstorm
    
- Set `file.name` for Sandstorm events (there was a typo in the if condition).

- Set `url.domain`, `destination.domain`, and `destination.ip` for Sandstorm web events.

- Handle sha256 Sandstorm file hashes. In 17.5 and earlier the sha1sum contained the sha1 checksum of the file being analyzed. In 18.0 and later the sha1sum contains the sha256 checksum of the file.
    
System Health
    
- Convert `sophos.xg.collisions`, `sophos.xg.receiveddrops`, and `sophos.xg.transmitteddrops` to float in document `_source`.
    
Wireless Protection
    
Change `sophos.xg.clients_conn_ssid` to a long in the mapping.

* Update files

[git-generate]
cd packages/sophos
elastic-package format
elastic-package build
elastic-package test pipeline -g

* Add changelog

* Remove null-safe operator when accessing ctx

Replaces `ctx?.` with `ctx.` in all of the sophos.xg pipelines.

* Sort ecs.yml and fields.yml by name
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
… `sophos.xg.trans_src_ ip` (elastic#25525)

* elastic#25154: Remove space from field `sophos.xg.trans_src_ ip` (elastic#25250)

(cherry picked from commit 0d955a0)

* Update CHANGELOG.next.asciidoc

Co-authored-by: Marius Iversen <marius.iversen@elastic.co>
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.

[FileBeat] Sophos xg field has a space in it's name
4 participants