[Ingest Manager] Fix: Successfully installed and enrolled agent running standalone (#24128)

michalpristas · michalpristas · commit d441d3f2e407 · 2021-02-19T16:45:52.000+01:00
diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc
@@ -35,6 +35,7 @@
 - Fixed Monitoring filebeat and metricbeat not connecting to Agent over GRPC {pull}23843[23843]
 - Windows agent doesn't uninstall with a lowercase `c:` drive in the path {pull}23998[23998]
 - Fix reloading of log level for services {pull}[24055]24055
+- Fix: Successfully installed and enrolled agent running standalone{pull}[24128]24128
 
 ==== New features
 
diff --git a/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go b/x-pack/elastic-agent/pkg/agent/application/enroll_cmd.go
@@ -84,7 +84,6 @@ type EnrollCmdOption struct {
 	Staging              string
 	FleetServerConnStr   string
 	FleetServerPolicyID  string
-	NoRestart            bool
 }
 
 func (e *EnrollCmdOption) kibanaConfig() (*kibana.Config, error) {
@@ -178,18 +177,13 @@ func (c *EnrollCmd) Execute(ctx context.Context) error {
 		// enroll should use localhost as fleet-server is now running
 		// it must also restart
 		c.options.URL = "http://localhost:8000"
-		c.options.NoRestart = false
 	}
 
 	err := c.enrollWithBackoff(ctx)
 	if err != nil {
 		return errors.New(err, "fail to enroll")
 	}
 
-	if c.options.NoRestart {
-		return nil
-	}
-
 	if c.daemonReload(ctx) != nil {
 		c.log.Info("Elastic Agent might not be running; unable to trigger restart")
 	}
diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go
@@ -38,7 +38,6 @@ func newEnrollCommandWithArgs(flags *globalFlags, _ []string, streams *cli.IOStr
 
 	addEnrollFlags(cmd)
 	cmd.Flags().BoolP("force", "f", false, "Force overwrite the current and do not prompt for confirmation")
-	cmd.Flags().Bool("no-restart", false, "Skip restarting the currently running daemon")
 
 	// used by install command
 	cmd.Flags().BoolP("from-install", "", false, "Set by install command to signal this was executed from install")
@@ -141,11 +140,9 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, flags *globalFlags, args
 		}
 	}
 
-	noRestart, _ := cmd.Flags().GetBool("no-restart")
 	force, _ := cmd.Flags().GetBool("force")
 	if fromInstall {
 		force = true
-		noRestart = true
 	}
 
 	// prompt only when it is not forced and is already enrolled
@@ -192,7 +189,6 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, flags *globalFlags, args
 		Staging:              staging,
 		FleetServerConnStr:   fServer,
 		FleetServerPolicyID:  fPolicy,
-		NoRestart:            noRestart,
 	}
 
 	c, err := application.NewEnrollCmd(

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ type EnrollCmdOption struct {`
`84`	`84`	`Staging string`
`85`	`85`	`FleetServerConnStr string`
`86`	`86`	`FleetServerPolicyID string`
`87`		`- NoRestart bool`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`func (e EnrollCmdOption) kibanaConfig() (kibana.Config, error) {`
`@@ -178,18 +177,13 @@ func (c *EnrollCmd) Execute(ctx context.Context) error {`
`178`	`177`	`// enroll should use localhost as fleet-server is now running`
`179`	`178`	`// it must also restart`
`180`	`179`	`c.options.URL = "http://localhost:8000"`
`181`		`- c.options.NoRestart = false`
`182`	`180`	`}`
`183`	`181`
`184`	`182`	`err := c.enrollWithBackoff(ctx)`
`185`	`183`	`if err != nil {`
`186`	`184`	`return errors.New(err, "fail to enroll")`
`187`	`185`	`}`
`188`	`186`
`189`		`- if c.options.NoRestart {`
`190`		`- return nil`
`191`		`- }`
`192`		`-`
`193`	`187`	`if c.daemonReload(ctx) != nil {`
`194`	`188`	`c.log.Info("Elastic Agent might not be running; unable to trigger restart")`
`195`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ func newEnrollCommandWithArgs(flags globalFlags, _ []string, streams cli.IOStr`
`38`	`38`
`39`	`39`	`addEnrollFlags(cmd)`
`40`	`40`	`cmd.Flags().BoolP("force", "f", false, "Force overwrite the current and do not prompt for confirmation")`
`41`		`- cmd.Flags().Bool("no-restart", false, "Skip restarting the currently running daemon")`
`42`	`41`
`43`	`42`	`// used by install command`
`44`	`43`	`cmd.Flags().BoolP("from-install", "", false, "Set by install command to signal this was executed from install")`
`@@ -141,11 +140,9 @@ func enroll(streams cli.IOStreams, cmd cobra.Command, flags *globalFlags, args`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`
`144`		`- noRestart, _ := cmd.Flags().GetBool("no-restart")`
`145`	`143`	`force, _ := cmd.Flags().GetBool("force")`
`146`	`144`	`if fromInstall {`
`147`	`145`	`force = true`
`148`		`- noRestart = true`
`149`	`146`	`}`
`150`	`147`
`151`	`148`	`// prompt only when it is not forced and is already enrolled`
`@@ -192,7 +189,6 @@ func enroll(streams cli.IOStreams, cmd cobra.Command, flags *globalFlags, args`
`192`	`189`	`Staging: staging,`
`193`	`190`	`FleetServerConnStr: fServer,`
`194`	`191`	`FleetServerPolicyID: fPolicy,`
`195`		`- NoRestart: noRestart,`
`196`	`192`	`}`
`197`	`193`
`198`	`194`	`c, err := application.NewEnrollCmd(`