Skip to content

[elastic-agent] ensure container is backwards compatible (backport #25092) #25098

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

Merged
simitt merged 1 commit into from
Apr 15, 2021
Merged

[elastic-agent] ensure container is backwards compatible (backport #25092) #25098

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
17 changes: 13 additions & 4 deletions x-pack/elastic-agent/pkg/agent/cmd/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ func containerCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
return err
}

elasticCloud := envBool("ELASTIC_AGENT_CLOUD")
// if not in cloud mode, always run the agent
runAgent := !elasticCloud
// create access configuration from ENV and config files
cfg := defaultAccessConfig()
for _, f := range []string{"fleet-setup.yml", "credentials.yml"} {
Expand All @@ -155,13 +158,14 @@ func containerCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
if err != nil {
return fmt.Errorf("unpacking config file(%s): %s", f, err)
}
// if in elastic cloud mode, only run the agent when configured
runAgent = true
}
}

// start apm-server legacy process when in cloud mode
var wg sync.WaitGroup
var apmProc *process.Info
_, elasticCloud := os.LookupEnv("ELASTIC_AGENT_CLOUD")
apmPath := os.Getenv("APM_SERVER_PATH")
if elasticCloud {
logInfo(streams, "Starting in elastic cloud mode")
Expand Down Expand Up @@ -202,13 +206,18 @@ func containerCmd(streams *cli.IOStreams, cmd *cobra.Command) error {
apmProc.Stop()
logInfo(streams, "Initiate shutdown legacy apm-server.")
}
wg.Wait()
}()
}
}

// run the main elastic-agent container command
return runContainerCmd(streams, cmd, cfg)
var err error
if runAgent {
// run the main elastic-agent container command
err = runContainerCmd(streams, cmd, cfg)
}
// wait until APM Server shut down
wg.Wait()
return err
}

func runContainerCmd(streams *cli.IOStreams, cmd *cobra.Command, cfg setupConfig) error {
Expand Down