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

Remove and consolidate osquery instance options #1909

Merged
merged 9 commits into from
Oct 28, 2024

Conversation

RebeccaMahany
Copy link
Contributor

@RebeccaMahany RebeccaMahany commented Oct 23, 2024

Relates to #1827 -- getting some tidying out of the way before making more substantial changes.

Relates to #1936.

This PR updates our osquery instance options:

  1. Remove unused options
  2. Remove options that are redundant with knapsack flags, opting to pull these values from the knapsack instead

While I was validating that the root directory will always be set by the time that we make it to the osquery runner, I noticed that in runLauncher if the root directory wasn't set in the launcher options and we fell back to making a temp directory, we wouldn't save that temp directory in the knapsack flags. I updated to save it in the launcher options, so that it would later be available via the knapsack. I imagine we don't run into this issue much/at all, but wanted to address it just in case.

James-Pickett
James-Pickett previously approved these changes Oct 23, 2024
Copy link
Contributor

@James-Pickett James-Pickett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Always love negative lines of code. Do any of these removals make options in launcher options obsolete?

Copy link
Contributor

@directionless directionless left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't test this, but I imagine it's fine.

However I think we should hold slightly on merging -- I think we're going to want to be in a place to cut a release for Zack's flare stuff and maybe the systray tweaks.

@RebeccaMahany RebeccaMahany marked this pull request as draft October 24, 2024 13:06
@RebeccaMahany
Copy link
Contributor Author

@directionless good point -- converted to draft and will hold off on merging.

@James-Pickett checked and yes! Deprecated a handful of flags. 🎉

@RebeccaMahany RebeccaMahany marked this pull request as ready for review October 28, 2024 18:48
@RebeccaMahany RebeccaMahany added this pull request to the merge queue Oct 28, 2024
Merged via the queue into kolide:main with commit 69fdb88 Oct 28, 2024
31 checks passed
@RebeccaMahany RebeccaMahany deleted the becca/osq-options branch October 28, 2024 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants