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.

Sign up for GitHub

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

Jump to bottom

Fix panic when MaxRetryInterval is specified, but RetryInterval is not #35820

Merged
merged 2 commits into from
Jun 20, 2023
Merged

Fix panic when MaxRetryInterval is specified, but RetryInterval is not #35820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a10c44a
Fix panic when MaxRetryInterval is specified, but RetryInterval is not
tibordp Jun 19, 2023
03141eb
add changelog
tibordp Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]
- 'add_cloud_metadata' processor - update azure metadata api version to get missing `cloud.account.id` field
- Make sure k8s watchers are closed when closing k8s meta processor. {pull}35630[35630]
- Upgraded apache arrow library used in x-pack/libbeat/reader/parquet from v11 to v12.0.1 in order to fix cross-compilation issues {pull}35640[35640]
- Fix panic when MaxRetryInterval is specified, but RetryInterval is not {pull}35820[35820]

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion libbeat/publisher/queue/diskqueue/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ func SettingsForUserConfig(config *config.C) (Settings, error) {
settings.RetryInterval = *userConfig.RetryInterval
}
if userConfig.MaxRetryInterval != nil {
settings.MaxRetryInterval = *userConfig.RetryInterval
settings.MaxRetryInterval = *userConfig.MaxRetryInterval
}

return settings, nil
Expand Down