[Ingest Manager] Logging to file disabled on enroll (elastic#24466)

michalpristas · Mar 10, 2021 · 3949300 · 3949300
1 parent bea9a9b
commit 3949300
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/libbeat/logp/config.go b/libbeat/logp/config.go
@@ -62,7 +62,8 @@ const defaultLevel = InfoLevel
 // Beat is supposed to be run within.
 func DefaultConfig(environment Environment) Config {
  return Config{
- Level: defaultLevel,
+ Level: defaultLevel,
+ ToFiles: true,
  Files: FileConfig{
  MaxSize: 10 * 1024 * 1024,
  MaxBackups: 7,

diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc
@@ -41,6 +41,7 @@
 - Fix windows installer during enroll {pull}[24343]24343
 - Fix failing installation on windows 7 {pull}[24387]24387
 - Fix capabilities resolution in inspect command {pull}[24346]24346
+- Logging to file disabled on enroll {issue}[24173]24173
 
 ==== New features
 

diff --git a/x-pack/elastic-agent/pkg/agent/cmd/enroll.go b/x-pack/elastic-agent/pkg/agent/cmd/enroll.go
@@ -187,6 +187,11 @@ func enroll(streams *cli.IOStreams, cmd *cobra.Command, flags *globalFlags, args
  }
  }
 
+ // enroll is invoked either manually or from install with redirected IO
+ // no need to log to file
+ cfg.Settings.LoggingConfig.ToFiles = false
+ cfg.Settings.LoggingConfig.ToStderr = true
+
  logger, err := logger.NewFromConfig("", cfg.Settings.LoggingConfig)
  if err != nil {
  return err

diff --git a/x-pack/elastic-agent/pkg/core/logger/logger.go b/x-pack/elastic-agent/pkg/core/logger/logger.go
@@ -54,13 +54,18 @@ func new(name string, cfg *Config) (*Logger, error) {
  if err != nil {
  return nil, err
  }
- internal, err := makeInternalFileOutput(cfg)
- if err != nil {
- return nil, err
- }
- if err := configure.LoggingWithOutputs("", commonCfg, internal); err != nil {
- return nil, fmt.Errorf("error initializing logging: %v", err)
+
+ if cfg.ToFiles {
+ internal, err := makeInternalFileOutput(cfg)
+ if err != nil {
+ return nil, err
+ }
+
+ if err := configure.LoggingWithOutputs("", commonCfg, internal); err != nil {
+ return nil, fmt.Errorf("error initializing logging: %v", err)
+ }
  }
+
  return logp.NewLogger(name), nil
 }