Enable osquery watchdog for nightly use (#1374)

Co-authored-by: seph <seph@kolide.co>

cmd/launcher/extension.go

@@ -209,6 +209,9 @@ func commonRunnerOptions(logger log.Logger, k types.Knapsack) []runtime.OsqueryI
 		kolidelog.WithKeyValue("osqlevel", "stdout"),
 	)
 
+	// Only enable watchdog internally for now
+	enableWatchdog := k.UpdateChannel() == "nightly"
+
 	return []runtime.OsqueryInstanceOption{
 		runtime.WithKnapsack(k),
 		runtime.WithOsquerydBinary(k.OsquerydPath()),
@@ -223,6 +226,7 @@ func commonRunnerOptions(logger log.Logger, k types.Knapsack) []runtime.OsqueryI
 		runtime.WithAutoloadedExtensions(k.AutoloadedExtensions()...),
 		runtime.WithUpdateDirectory(k.UpdateDirectory()),
 		runtime.WithUpdateChannel(k.UpdateChannel()),
+		runtime.WithEnableWatchdog(enableWatchdog),
 	}
 }
 

pkg/osquery/runtime/osqueryinstance.go

@@ -76,6 +76,12 @@ func WithUpdateChannel(channel string) OsqueryInstanceOption {
 	}
 }
 
+func WithEnableWatchdog(enableWatchdog bool) OsqueryInstanceOption {
+	return func(i *OsqueryInstance) {
+		i.opts.enableWatchdog = enableWatchdog
+	}
+}
+
 // WithExtensionSocketPath is a functional option which allows the user to
 // define the path of the extension socket path that osqueryd will open to
 // communicate with other processes.
@@ -318,6 +324,7 @@ type osqueryOptions struct {
 	distributedPluginFlag string
 	extensionPlugins      []osquery.OsqueryPlugin
 	autoloadedExtensions  []string
+	enableWatchdog        bool
 	extensionSocketPath   string
 	enrollSecretPath      string
 	loggerPluginFlag      string
@@ -460,17 +467,22 @@ func calculateOsqueryPaths(opts osqueryOptions) (*osqueryFilePaths, error) {
 // which will launch a properly configured osqueryd process.
 func (opts *osqueryOptions) createOsquerydCommand(osquerydBinary string, paths *osqueryFilePaths) (*exec.Cmd, error) {
 	// Create the reference instance for the running osquery instance
-	cmd := exec.Command(
-		osquerydBinary,
+	args := []string{
 		fmt.Sprintf("--logger_plugin=%s", opts.loggerPluginFlag),
 		fmt.Sprintf("--distributed_plugin=%s", opts.distributedPluginFlag),
 		"--disable_distributed=false",
 		"--distributed_interval=5",
 		"--pack_delimiter=:",
 		"--host_identifier=uuid",
 		"--force=true",
-		"--disable_watchdog",
 		"--utc",
+	}
+	if !opts.enableWatchdog {
+		args = append(args, "--disable_watchdog")
+	}
+	cmd := exec.Command(
+		osquerydBinary,
+		args...,
 	)
 
 	if opts.verbose {