Add registration ID to osquery history #1982
Merged
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
RebeccaMahany
commented
Dec 6, 2024
| @@ -57,7 +58,7 @@ func generateLauncherInfoTable(configStore types.GetterSetter, LauncherHistorySt | |||
| return nil, err | |||
| } | |||
|
|
|||
| osqueryInstance, err := history.LatestInstance() | |||
| osqueryInstance, err := history.LatestInstanceByRegistrationID(types.DefaultRegistrationID) | |||
There was a problem hiding this comment.
I don't think we want to return multiple rows for this table -- I'm not sure how K2 will handle that at the moment. So for now, I'm defaulting to using default ID (the same as we do in other places).
There was a problem hiding this comment.
You can return whatever makes sense here, multiple rows are fine.
This isn't data k2 collects, it's here solely for our debugging.
There was a problem hiding this comment.
Correcting myself... We do query kolide_launcher_info, but I don't think we look at this column.
James-Pickett
approved these changes
Dec 6, 2024
zackattack01
reviewed
Dec 6, 2024
zackattack01
approved these changes
Dec 6, 2024
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.
Another smaller task for #1939 -- adds the registration ID to osquery instance history, and includes it appropriately when working with instance history.
Updates the
kolide_launcher_configtable to handle multiple registration IDs in preparation for registrations having different osquery configs.