[sophos] Fix add_locale handling in xg data stream - #15482
Merged
taylor-swanson merged 3 commits intoSep 26, 2025
Conversation
- Fixed handling of time zones added by add_locale (which sets event.timezone) in the Sophos XG data stream. As add_locale will set the local timezone of the agent in event.timezone, this prevented the real time zone in the log from being set as there was a check to prevent event.timezone from being overridden. - Added a pipeline test to test this scenario
taylor-swanson
added
Integration:sophos
taylor-swanson
commented
Sep 26, 2025
| { | ||
| "message": "<30>device=\"SFW\" date=2020-05-18 time=14:38:48 timezone=\"CEST\" device_name=\"XG230\" device_id=1234567890123456 log_id=041101618035 log_type=\"Anti-Spam\" log_component=\"SMTP\" log_subtype=\"Allowed\" status=\"\" priority=Information fw_rule_id=0 user_name=\"\" av_policy_name=\"None\" from_email_address=\"firewall@firewallgate.com\" to_email_address=\"Sysadmin@elasticuser.com\" email_subject=\"*ALERT* Sophos XG Firewall\" mailid=\"qkW2Y6-LxBk6U-vH-1590055245\" mailsize=19728 spamaction=\"QUEUED\" reason=\"Email has been accepted by Device and queued for scanning.\" src_domainname=\"elasticuser.com\" dst_domainname=\"\" src_ip=\"\" src_country_code=\"\" dst_ip=\"\" dst_country_code=\"\" protocol=\"TCP\" src_port=0 dst_port=0 sent_bytes=0 recv_bytes=0 quarantine_reason=\"Other\"\n", | ||
| "event": { | ||
| "timezone": "-05:00" |
Contributor
Author
There was a problem hiding this comment.
This simulates what is set by add_locale in filebeat.
Contributor
🚀 Benchmarks reportTo see the full report comment with |
taylor-swanson
marked this pull request as ready for review
September 26, 2025 16:33
|
Pinging @elastic/integration-experience (Team:Integration-Experience) |
qcorporation
approved these changes
Sep 26, 2025
qcorporation
left a comment
qcorporation
left a comment
Contributor
There was a problem hiding this comment.
Looks good, approved.
Great that you add tags on the code that you touched.
Can you add a tag for the last set, where you removed the if statement
if: ctx.event?.timezone == null
Contributor
Author
Good catch! Added. |
💚 Build Succeeded
History
|
|
Contributor
|
Package sophos - 3.15.3 containing this change is available at https://epr.elastic.co/package/sophos/3.15.3/ |
tehbooom
pushed a commit
to tehbooom/integrations
that referenced
this pull request
Nov 19, 2025
- Fixed handling of time zones added by add_locale (which sets event.timezone) in the Sophos XG data stream. As add_locale will set the local timezone of the agent in event.timezone, this prevented the real time zone in the log from being set as there was a check to prevent event.timezone from being overridden. - Added a pipeline test to test this scenario
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed commit message
Checklist
changelog.ymlfile.- [ ] I have verified that any added dashboard complies with Kibana's Dashboard good practicesHow to test this PR locally