[Auditbeat][System] Fix error handling around go-sysinfo.Host #17569
Conversation
This file contains 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
Before a system dataset is loaded, host information is loaded to populate `entity_id` fields. Error handling around it was incorrect and resulted in a panic when fetching host info failed, which afaik it's limited to errors accessing /proc/stat file.
adriansr
added
bug
review
needs_backport
|
Pinging @elastic/siem (Team:SIEM) |
adriansr
commented
Apr 7, 2020
| @@ -55,19 +55,20 @@ func NewModule(base mb.BaseModule) (mb.Module, error) { | |||
| log := logp.NewLogger(moduleName) | |||
|
|
|||
| var hostID string | |||
| hostInfo, err := sysinfo.Host() | |||
| if hostInfo != nil { | |||
There was a problem hiding this comment.
What was going on in here is when sysinfo.Host() errors, it returns a non-nil interface that wraps a nil pointer, causing the nil check to pass but a panic inside the hostInfo.Info() call below.
leehinman
approved these changes
Apr 7, 2020
kvch
approved these changes
Apr 7, 2020
adriansr
added
v7.8.0
and removed
needs_backport
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…c#17569) (elastic#17603) Before a system dataset is loaded, host information is loaded to populate `entity_id` fields. Error handling around it was incorrect and resulted in a panic when fetching host info failed, which afaik it's limited to errors accessing /proc/stat file. (cherry picked from commit 7602e79)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before a system dataset is loaded, host information is loaded to populate
entity_idfields.Error handling around it was incorrect and resulted in a panic when fetching host info failed, which afaik it's limited to errors accessing
/proc/statfile.