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

Make jsonrpc the default for transport #1919

Merged
merged 1 commit into from
Oct 28, 2024
Merged

Make jsonrpc the default for transport #1919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/launcher/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func ParseOptions(subcommandName string, args []string) (*Options, error) {
flInitialRunner = flagset.Bool("with_initial_runner", false, "Run differential queries from config ahead of scheduled interval.")
flKolideServerURL = flagset.String("hostname", "", "The hostname of the gRPC server")
flKolideHosted = flagset.Bool("kolide_hosted", false, "Use Kolide SaaS settings for defaults")
flTransport = flagset.String("transport", "grpc", "The transport protocol that should be used to communicate with remote (default: grpc)")
flTransport = flagset.String("transport", "jsonrpc", "The transport protocol that should be used to communicate with remote (default: jsonrpc)")
flLoggingInterval = flagset.Duration("logging_interval", 60*time.Second, "The interval at which logs should be flushed to the server")
flOsquerydPath = flagset.String("osqueryd_path", "", "Path to the osqueryd binary to use (Default: find osqueryd in $PATH)")
flOsqueryHealthcheckStartupDelay = flagset.Duration("osquery_healthcheck_startup_delay", 10*time.Minute, "time to wait before beginning osquery healthchecks")
Expand Down
3 changes: 1 addition & 2 deletions pkg/launcher/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ func getArgsAndResponse() (map[string]string, *Options) {
"-autoupdate_interval": "48h",
"-logging_interval": fmt.Sprintf("%ds", randomInt),
"-osqueryd_path": windowsAddExe("/dev/null"),
"-transport": "grpc",
}

opts := &Options{
Expand All @@ -258,7 +257,7 @@ func getArgsAndResponse() (map[string]string, *Options) {
TufServerURL: "https://tuf.kolide.com",
OsquerydPath: windowsAddExe("/dev/null"),
OsqueryHealthcheckStartupDelay: 10 * time.Minute,
Transport: "grpc",
Transport: "jsonrpc",
UpdateChannel: "stable",
DelayStart: 0 * time.Second,
WatchdogEnabled: false,
Expand Down
Loading