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

[7.x](backport #27727) [Filebeat] Add timezone config option to decode_cef and syslog input #27780

Merged
merged 1 commit into from
Sep 9, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 7, 2021

This is an automatic backport of pull request #27727 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the backport label Sep 7, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 7, 2021
@botelastic
Copy link

botelastic bot commented Sep 7, 2021

This pull request doesn't have a Team:<team> label.

@andrewkroh
Copy link
Member

@Mergifyio rebase

…27727)

CEF message that contain timestamps without a timezone were parsed as UTC. The time zone was not
configurable. This adds a `timezone` option to the decode_cef processor and cef module to allow the
time zone to be specified when a timestamp does not contain an offset or zone.

    CEF:0|Aruba Networks|ClearPass|6.8.7.120583|2002|RADIUS Accounting|1|rt=Aug 04 2021 11:31:15

Note that the CEF module receives messages using the syslog input. The syslog input does not have
a configurable time zone and always assumes timestamps without time zones are given in the machine's
local time zone. This change won't affect how the syslog envelop's time stamp is parsed by the module.

This also replaces the deprecated `import "4d63.com/tz"` with Go's relatively new built-in
`time/tzdata` package. The `timestamp` processor was updated.

While I was adding the a timezone config type I made the syslog input's timezone configurable too.

Fixes #27232

(cherry picked from commit b3497ca)
@mergify
Copy link
Contributor Author

mergify bot commented Sep 9, 2021

Command rebase: success

Branch has been successfully rebased

@ghost ghost force-pushed the mergify/bp/7.x/pr-27727 branch from 8eeb377 to 1c99541 Compare September 9, 2021 15:06
@elasticmachine
Copy link
Collaborator

💚 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-09T15:06:33.116+0000

  • Duration: 236 min 32 sec

  • Commit: 1c99541

Test stats 🧪

Test Results
Failed 0
Passed 53338
Skipped 5268
Total 58606

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 53338
Skipped 5268
Total 58606

@andrewkroh andrewkroh merged commit 9256741 into 7.x Sep 9, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-27727 branch September 9, 2021 20:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants