adjust more things again

elastic · Nov 19, 2021 · 2ff01b3 · 2ff01b3
1 parent d68d4d5
commit 2ff01b3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/winlogbeat/tests/system/test_wineventlog.py b/winlogbeat/tests/system/test_wineventlog.py
@@ -52,7 +52,7 @@ def test_resume_reading_events(self):
         # remove the output file, otherwise there is a race condition
         # in read_events() below where it reads the results of the previous
         # execution
-        os.unlink(os.path.join(self.working_dir, "output", self.beat_name))
+        os.unlink(os.path.join(self.working_dir, "output", self.beat_name + "-" + self.today + ".ndjson"))
 
         msg = "Second event"
         self.write_event_log(msg)

diff --git a/x-pack/elastic-agent/pkg/agent/operation/monitoring.go b/x-pack/elastic-agent/pkg/agent/operation/monitoring.go
@@ -234,10 +234,8 @@ func (o *Operator) getMonitoringFilebeatConfig(outputType string, output interfa
 				},
 			},
 			"paths": []string{
-				filepath.Join(paths.Home(), "logs", "elastic-agent-json.log"),
-				filepath.Join(paths.Home(), "logs", "elastic-agent-json.log*"),
-				filepath.Join(paths.Home(), "logs", "elastic-agent-watcher-json.log"),
-				filepath.Join(paths.Home(), "logs", "elastic-agent-watcher-json.log*"),
+				filepath.Join(paths.Home(), "logs", "elastic-agent-*.ndjson"),
+				filepath.Join(paths.Home(), "logs", "elastic-agent-watcher-*.ndjson"),
 			},
 			"index": fmt.Sprintf("logs-elastic_agent-%s", monitoringNamespace),
 			"processors": []map[string]interface{}{

diff --git a/x-pack/elastic-agent/pkg/core/logger/logger.go b/x-pack/elastic-agent/pkg/core/logger/logger.go
@@ -114,7 +114,7 @@ func makeInternalFileOutput(cfg *Config) (zapcore.Core, error) {
 	// defaultCfg is used to set the defaults for the file rotation of the internal logging
 	// these settings cannot be changed by a user configuration
 	defaultCfg := logp.DefaultConfig(logp.DefaultEnvironment)
-	filename := filepath.Join(paths.Home(), "logs", fmt.Sprintf("%s-json.log", cfg.Beat))
+	filename := filepath.Join(paths.Home(), "logs", cfg.Beat)
 
 	rotator, err := file.NewFileRotator(filename,
 		file.MaxSizeBytes(defaultCfg.Files.MaxSize),

diff --git a/x-pack/elastic-agent/pkg/core/monitoring/beats/beats_monitor.go b/x-pack/elastic-agent/pkg/core/monitoring/beats/beats_monitor.go
@@ -131,7 +131,7 @@ func (b *Monitor) EnrichArgs(spec program.Spec, pipelineID string, args []string
 		if isSidecar {
 			logFile += "_monitor"
 		}
-		logFile = fmt.Sprintf("%s-json.log", logFile)
+		logFile = fmt.Sprintf("%s", logFile)
 		appendix = append(appendix,
 			"-E", "logging.files.path="+loggingPath,
 			"-E", "logging.files.name="+logFile,

diff --git a/x-pack/elastic-agent/pkg/core/monitoring/beats/monitoring.go b/x-pack/elastic-agent/pkg/core/monitoring/beats/monitoring.go
@@ -16,9 +16,9 @@ import (
 
 const (
 	// args: data path, pipeline name, application name
-	logFileFormat = "%s/logs/%s/%s-json.log"
+	logFileFormat = "%s/logs/%s/%s"
 	// args: data path, install path, pipeline name, application name
-	logFileFormatWin = "%s\\logs\\%s\\%s-json.log"
+	logFileFormatWin = "%s\\logs\\%s\\%s"
 
 	// args: pipeline name, application name
 	mbEndpointFileFormatWin = `npipe:///%s-%s`