diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index a7b11ddc2d1..90d4a4e9edd 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -56,6 +56,7 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Remove Metricbeat EventFetcher and EventsFetcher interface. Use the reporter interface instead. {pull}25093[25093] - Update Darwin build image to a debian 10 base that increases the MacOS SDK and minimum supported version used in build to 10.14. {issue}24193[24193] - Removed the `common.Float` type. {issue}28279[28279] {pull}28280[28280] {pull}28376[28376] +- libbeat.logp package forces ECS compliant logs. Logs are JSON formatted. Options to enable ECS/JSON have been removed. {issue}15544[15544] {pull}28573[28573] ==== Bugfixes diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5f3e62942c3..4dde946f8e5 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -26,6 +26,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Improve stats API {pull}27963[27963] - Enable IMDSv2 support for `add_cloud_metadata` processor on AWS. {issue}22101[22101] {pull}28285[28285] - Update kubernetes.namespace from keyword to group field and add name, labels, annotations, uuid as its fields {pull}27917[27917] +- Libbeat: logp package forces ECS compliant logs. Logs are JSON formatted. Options to enable ECS/JSON have been removed. {issue}15544[15544] {pull}28573[28573] - Previously, RE2 and thus Golang had a bug where `(|a)*` matched more characters than `(|a)+`. To stay consistent with PCRE, the bug was fixed. Configurations that rely on the old, buggy behaviour has to be adjusted. See more about Golang bug: https://github.com/golang/go/issues/46123 {pull}27543[27543] *Auditbeat* diff --git a/auditbeat/auditbeat.reference.yml b/auditbeat/auditbeat.reference.yml index f616e16c846..0bdc2af4cec 100644 --- a/auditbeat/auditbeat.reference.yml +++ b/auditbeat/auditbeat.reference.yml @@ -1448,14 +1448,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Auditbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/auditbeat/tests/system/test_file_integrity.py b/auditbeat/tests/system/test_file_integrity.py index 4b12314be62..08fef13d8e5 100644 --- a/auditbeat/tests/system/test_file_integrity.py +++ b/auditbeat/tests/system/test_file_integrity.py @@ -98,7 +98,7 @@ def test_non_recursive(self): # wait until file1 is reported before deleting. Otherwise the hash # might not be calculated - self.wait_log_contains("\"path\": \"{0}\"".format(escape_path(file1)), ignore_case=True) + self.wait_log_contains("\"path\":\"{0}\"".format(escape_path(file1)), ignore_case=True) os.unlink(file1) @@ -107,8 +107,9 @@ def test_non_recursive(self): file3 = os.path.join(subdir, "other_file.txt") self.create_file(file3, "not reported.") - self.wait_log_contains("\"deleted\"") - self.wait_log_contains("\"path\": \"{0}\"".format(escape_path(subdir)), ignore_case=True) + # log entries are JSON formatted, this value shows up as an escaped json string. + self.wait_log_contains("\\\"deleted\\\"") + self.wait_log_contains("\"path\":\"{0}\"".format(escape_path(subdir)), ignore_case=True) self.wait_output(3) self.wait_until(lambda: any( 'file.path' in obj and obj['file.path'].lower() == subdir.lower() for obj in self.read_output())) @@ -157,7 +158,7 @@ def test_recursive(self): # wait until the directories to watch are printed in the logs # this happens when the file_integrity module starts self.wait_log_contains(escape_path(dirs[0]), max_timeout=30, ignore_case=True) - self.wait_log_contains("\"recursive\": true") + self.wait_log_contains("\"recursive\":true") # auditbeat_test/subdir/ subdir = os.path.join(dirs[0], "subdir") @@ -173,7 +174,7 @@ def test_recursive(self): file2 = os.path.join(subdir2, "more.txt") self.create_file(file2, "") - self.wait_log_contains("\"path\": \"{0}\"".format(escape_path(file2)), ignore_case=True) + self.wait_log_contains("\"path\":\"{0}\"".format(escape_path(file2)), ignore_case=True) self.wait_output(4) self.wait_until(lambda: any( 'file.path' in obj and obj['file.path'].lower() == subdir2.lower() for obj in self.read_output())) diff --git a/filebeat/filebeat.reference.yml b/filebeat/filebeat.reference.yml index 055de812f9c..24e584ae00f 100644 --- a/filebeat/filebeat.reference.yml +++ b/filebeat/filebeat.reference.yml @@ -2360,14 +2360,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Filebeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/heartbeat/heartbeat.reference.yml b/heartbeat/heartbeat.reference.yml index 0a7bec03b61..64391eda49b 100644 --- a/heartbeat/heartbeat.reference.yml +++ b/heartbeat/heartbeat.reference.yml @@ -1594,14 +1594,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Heartbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/journalbeat/journalbeat.reference.yml b/journalbeat/journalbeat.reference.yml index 322429ae687..c9f0b739a6b 100644 --- a/journalbeat/journalbeat.reference.yml +++ b/journalbeat/journalbeat.reference.yml @@ -1391,14 +1391,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Journalbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/libbeat/_meta/config/logging.reference.yml.tmpl b/libbeat/_meta/config/logging.reference.yml.tmpl index 556ae8bc8dc..9a1e91a0af8 100644 --- a/libbeat/_meta/config/logging.reference.yml.tmpl +++ b/libbeat/_meta/config/logging.reference.yml.tmpl @@ -72,11 +72,3 @@ logging.files: # renamed during rotation. Or when set to date, the date is added to # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count - -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false diff --git a/libbeat/docs/loggingconfig.asciidoc b/libbeat/docs/loggingconfig.asciidoc index 49ec4beaa11..4b47c45d5fb 100644 --- a/libbeat/docs/loggingconfig.asciidoc +++ b/libbeat/docs/loggingconfig.asciidoc @@ -264,17 +264,6 @@ If the log file already exists on startup, immediately rotate it and start writing to a new file instead of appending to the existing one. Defaults to true. -[float] -==== `logging.json` - -When true, logs messages in JSON format. The default is false. - -[float] -==== `logging.ecs` - -When true, logs messages with minimal required Elastic Common Schema (ECS) -information. - ifndef::serverless[] [float] ==== `logging.files.redirect_stderr` experimental[] diff --git a/libbeat/logp/config.go b/libbeat/logp/config.go index 1cf0c6b5058..c5de43ae51a 100644 --- a/libbeat/logp/config.go +++ b/libbeat/logp/config.go @@ -26,11 +26,9 @@ import ( // Config contains the configuration options for the logger. To create a Config // from a common.Config use logp/config.Build. type Config struct { - Beat string `config:",ignore"` // Name of the Beat (for default file name). - JSON bool `config:"json"` // Write logs as JSON. - Level Level `config:"level"` // Logging level (error, warning, info, debug). - Selectors []string `config:"selectors"` // Selectors for debug level logging. - ECSEnabled bool `config:"ecs" yaml:"ecs"` // Adds minimal ECS information using ECS conformant keys to every log line + Beat string `config:",ignore"` // Name of the Beat (for default file name). + Level Level `config:"level"` // Logging level (error, warning, info, debug). + Selectors []string `config:"selectors"` // Selectors for debug level logging. toObserver bool toIODiscard bool diff --git a/libbeat/logp/core.go b/libbeat/logp/core.go index 9b4b1094b74..c85a5feeaec 100644 --- a/libbeat/logp/core.go +++ b/libbeat/logp/core.go @@ -196,7 +196,7 @@ func makeOptions(cfg Config) []zap.Option { if cfg.development { options = append(options, zap.Development()) } - if cfg.ECSEnabled { + if cfg.Beat != "" { fields := []zap.Field{ zap.String("service.name", cfg.Beat), } @@ -254,10 +254,7 @@ func newCore(cfg Config, enc zapcore.Encoder, ws zapcore.WriteSyncer, enab zapco return wrappedCore(cfg, zapcore.NewCore(enc, ws, enab)) } func wrappedCore(cfg Config, core zapcore.Core) zapcore.Core { - if cfg.ECSEnabled { - return ecszap.WrapCore(core) - } - return core + return ecszap.WrapCore(core) } func globalLogger() *zap.Logger { diff --git a/libbeat/logp/core_test.go b/libbeat/logp/core_test.go index 741a6522753..293f57098eb 100644 --- a/libbeat/logp/core_test.go +++ b/libbeat/logp/core_test.go @@ -48,7 +48,7 @@ func TestLogger(t *testing.T) { TestingSetup() exerciseLogger() - TestingSetup(AsJSON()) + TestingSetup() exerciseLogger() } @@ -152,7 +152,6 @@ func TestLoggingECSFields(t *testing.T) { Beat: "beat1", Level: DebugLevel, development: true, - ECSEnabled: true, Files: FileConfig{ Name: "beat1.log", }, diff --git a/libbeat/logp/encoding.go b/libbeat/logp/encoding.go index b1977285602..a2f477fdce0 100644 --- a/libbeat/logp/encoding.go +++ b/libbeat/logp/encoding.go @@ -43,20 +43,15 @@ type encoderCreator func(cfg zapcore.EncoderConfig) zapcore.Encoder func buildEncoder(cfg Config) zapcore.Encoder { var encCfg zapcore.EncoderConfig var encCreator encoderCreator - if cfg.JSON { - encCfg = JSONEncoderConfig() - encCreator = zapcore.NewJSONEncoder - } else if cfg.ToSyslog { + if cfg.ToSyslog { encCfg = SyslogEncoderConfig() encCreator = zapcore.NewConsoleEncoder } else { - encCfg = ConsoleEncoderConfig() - encCreator = zapcore.NewConsoleEncoder + encCfg = JSONEncoderConfig() + encCreator = zapcore.NewJSONEncoder } - if cfg.ECSEnabled { - encCfg = ecszap.ECSCompatibleEncoderConfig(encCfg) - } + encCfg = ecszap.ECSCompatibleEncoderConfig(encCfg) return encCreator(encCfg) } diff --git a/libbeat/logp/options.go b/libbeat/logp/options.go index 2ce7989c665..4b7efa373c0 100644 --- a/libbeat/logp/options.go +++ b/libbeat/logp/options.go @@ -52,10 +52,3 @@ func ToDiscardOutput() Option { cfg.ToStderr = false } } - -// AsJSON specifies to log the output as JSON. -func AsJSON() Option { - return func(cfg *Config) { - cfg.JSON = true - } -} diff --git a/libbeat/tests/system/test_logging.py b/libbeat/tests/system/test_logging.py index 417223c2ea4..4295bfd1776 100644 --- a/libbeat/tests/system/test_logging.py +++ b/libbeat/tests/system/test_logging.py @@ -25,26 +25,12 @@ def assert_contains_ecs_log(self, logfile=None): assert self.log_contains(ecs_message_log, logfile=logfile) assert self.log_contains(ecs_log_level_log, logfile=logfile) - def assert_not_contains_ecs_log(self, logfile=None): - assert not self.log_contains(ecs_version_log, logfile=logfile) - assert not self.log_contains(ecs_timestamp_log, logfile=logfile) - assert not self.log_contains(ecs_log_level_log, logfile=logfile) - - def test_console_default(self): - """ - logs to console with default format - """ - self.run_beat_with_args("mockbeat start running", logging_args=["-e"]) - self.assert_not_contains_ecs_log() - def test_console_ecs(self): """ logs to console with ECS format """ self.run_beat_with_args("mockbeat start running", - logging_args=["-e"], - extra_args=["-E", "logging.json=true", - "-E", "logging.ecs=true"]) + logging_args=["-e"]) self.assert_contains_ecs_log() def test_file_default(self): @@ -52,16 +38,12 @@ def test_file_default(self): logs to file with default format """ self.run_beat_with_args("Mockbeat is alive!", - logging_args=[], - extra_args=["-E", "logging.json=true", - "-E", "logging.ecs=false"]) - self.assert_not_contains_ecs_log(logfile="logs/mockbeat") + logging_args=[]) + self.assert_contains_ecs_log(logfile="logs/mockbeat") def test_file_ecs(self): """ logs to file with ECS format """ - self.run_beat_with_args("Mockbeat is alive!", - extra_args=["-E", "logging.json=true", - "-E", "logging.ecs=true"]) + self.run_beat_with_args("Mockbeat is alive!") self.assert_contains_ecs_log(logfile="logs/mockbeat") diff --git a/libbeat/tests/system/test_template.py b/libbeat/tests/system/test_template.py index 3fb3eb53351..cc80e284f4e 100644 --- a/libbeat/tests/system/test_template.py +++ b/libbeat/tests/system/test_template.py @@ -107,7 +107,7 @@ def test_json_template(self): proc = self.start_beat() self.wait_until(lambda: self.log_contains("mockbeat start running.")) self.wait_until(lambda: self.log_contains("Loading json template from file")) - self.wait_until(lambda: self.log_contains('Template with name "bla" loaded.')) + self.wait_until(lambda: self.log_contains('Template with name \\\"bla\\\" loaded.')) proc.check_kill_and_wait() result = es.transport.perform_request('GET', '/_template/' + template_name) @@ -149,7 +149,7 @@ def test_template_default(self): self.render_config() proc = self.start_beat() self.wait_until(lambda: self.log_contains("mockbeat start running.")) - self.wait_until(lambda: self.log_contains('Template with name "mockbeat-9.9.9" loaded.')) + self.wait_until(lambda: self.log_contains('Template with name \\\"mockbeat-9.9.9\\\" loaded.')) self.wait_until(lambda: self.log_contains("PublishEvents: 1 events have been published")) proc.check_kill_and_wait() diff --git a/metricbeat/metricbeat.reference.yml b/metricbeat/metricbeat.reference.yml index 934bdd2a801..726af811802 100644 --- a/metricbeat/metricbeat.reference.yml +++ b/metricbeat/metricbeat.reference.yml @@ -2263,14 +2263,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Metricbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/metricbeat/module/elasticsearch/test_elasticsearch.py b/metricbeat/module/elasticsearch/test_elasticsearch.py index bdcc060b391..7a48efdfb15 100644 --- a/metricbeat/module/elasticsearch/test_elasticsearch.py +++ b/metricbeat/module/elasticsearch/test_elasticsearch.py @@ -135,7 +135,7 @@ def test_xpack_cluster_stats(self): } }]) proc = self.start_beat() - self.wait_log_contains('"dataset": "elasticsearch.cluster.stats"') + self.wait_log_contains('\\"dataset\\": \\"elasticsearch.cluster.stats\\"') proc.check_kill_and_wait() self.assert_no_logged_warnings() diff --git a/packetbeat/packetbeat.reference.yml b/packetbeat/packetbeat.reference.yml index 49b148eb80f..5077a379747 100644 --- a/packetbeat/packetbeat.reference.yml +++ b/packetbeat/packetbeat.reference.yml @@ -1943,14 +1943,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Packetbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/winlogbeat/winlogbeat.reference.yml b/winlogbeat/winlogbeat.reference.yml index 1b0e3e79c3e..92212208561 100644 --- a/winlogbeat/winlogbeat.reference.yml +++ b/winlogbeat/winlogbeat.reference.yml @@ -1371,14 +1371,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Winlogbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/auditbeat/auditbeat.reference.yml b/x-pack/auditbeat/auditbeat.reference.yml index b478846f564..0f8876084d5 100644 --- a/x-pack/auditbeat/auditbeat.reference.yml +++ b/x-pack/auditbeat/auditbeat.reference.yml @@ -1504,14 +1504,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Auditbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl b/x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl index 8af3322245e..1850c003f46 100644 --- a/x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl +++ b/x-pack/elastic-agent/_meta/config/common.p2.yml.tmpl @@ -197,9 +197,4 @@ agent.logging.to_stderr: true # Set to true to log messages in JSON format. #agent.logging.json: false -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#agent.logging.ecs: false - {{template "providers.yml.tmpl" .}} diff --git a/x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl b/x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl index a0ff0d37a20..f7593c383ac 100644 --- a/x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl +++ b/x-pack/elastic-agent/_meta/config/common.reference.p2.yml.tmpl @@ -197,9 +197,4 @@ agent.logging.to_stderr: true # Set to true to log messages in JSON format. #agent.logging.json: false -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#agent.logging.ecs: false - {{template "providers.yml.tmpl" .}} diff --git a/x-pack/elastic-agent/_meta/elastic-agent.yml b/x-pack/elastic-agent/_meta/elastic-agent.yml index a19d653b9ae..6167575e769 100644 --- a/x-pack/elastic-agent/_meta/elastic-agent.yml +++ b/x-pack/elastic-agent/_meta/elastic-agent.yml @@ -191,8 +191,3 @@ agent.logging.to_stderr: true # Set to true to log messages in JSON format. #agent.logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#agent.logging.ecs: false diff --git a/x-pack/elastic-agent/elastic-agent.reference.yml b/x-pack/elastic-agent/elastic-agent.reference.yml index 93a3dc2eedc..5456097ce3a 100644 --- a/x-pack/elastic-agent/elastic-agent.reference.yml +++ b/x-pack/elastic-agent/elastic-agent.reference.yml @@ -203,11 +203,6 @@ agent.logging.to_stderr: true # Set to true to log messages in JSON format. #agent.logging.json: false -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#agent.logging.ecs: false - # Providers # Providers supply the key/values pairs that are used for variable substitution diff --git a/x-pack/elastic-agent/elastic-agent.yml b/x-pack/elastic-agent/elastic-agent.yml index 37c6ec05d1a..8204503be51 100644 --- a/x-pack/elastic-agent/elastic-agent.yml +++ b/x-pack/elastic-agent/elastic-agent.yml @@ -203,11 +203,6 @@ agent.logging.to_stderr: true # Set to true to log messages in JSON format. #agent.logging.json: false -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#agent.logging.ecs: false - # Providers # Providers supply the key/values pairs that are used for variable substitution 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 index 9cf9427bf5a..f96f5ecf916 100644 --- a/x-pack/elastic-agent/pkg/core/monitoring/beats/beats_monitor.go +++ b/x-pack/elastic-agent/pkg/core/monitoring/beats/beats_monitor.go @@ -133,8 +133,6 @@ func (b *Monitor) EnrichArgs(spec program.Spec, pipelineID string, args []string } logFile = fmt.Sprintf("%s-json.log", logFile) appendix = append(appendix, - "-E", "logging.json=true", - "-E", "logging.ecs=true", "-E", "logging.files.path="+loggingPath, "-E", "logging.files.name="+logFile, "-E", "logging.files.keepfiles=7", diff --git a/x-pack/filebeat/filebeat.reference.yml b/x-pack/filebeat/filebeat.reference.yml index 91f8bf0bd2e..0a9f7065bd5 100644 --- a/x-pack/filebeat/filebeat.reference.yml +++ b/x-pack/filebeat/filebeat.reference.yml @@ -4501,14 +4501,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Filebeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/functionbeat/functionbeat.reference.yml b/x-pack/functionbeat/functionbeat.reference.yml index e5ccc87ba83..78d42f2d8b8 100644 --- a/x-pack/functionbeat/functionbeat.reference.yml +++ b/x-pack/functionbeat/functionbeat.reference.yml @@ -1242,14 +1242,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Functionbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/heartbeat/heartbeat.reference.yml b/x-pack/heartbeat/heartbeat.reference.yml index 0a7bec03b61..64391eda49b 100644 --- a/x-pack/heartbeat/heartbeat.reference.yml +++ b/x-pack/heartbeat/heartbeat.reference.yml @@ -1594,14 +1594,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Heartbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml index 40f9c1c9a46..410e8f36cd4 100644 --- a/x-pack/metricbeat/metricbeat.reference.yml +++ b/x-pack/metricbeat/metricbeat.reference.yml @@ -2793,14 +2793,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Metricbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/osquerybeat/osquerybeat.reference.yml b/x-pack/osquerybeat/osquerybeat.reference.yml index 990a7f85d7d..e942ab7ff20 100644 --- a/x-pack/osquerybeat/osquerybeat.reference.yml +++ b/x-pack/osquerybeat/osquerybeat.reference.yml @@ -961,14 +961,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Osquerybeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/packetbeat/packetbeat.reference.yml b/x-pack/packetbeat/packetbeat.reference.yml index 49b148eb80f..5077a379747 100644 --- a/x-pack/packetbeat/packetbeat.reference.yml +++ b/x-pack/packetbeat/packetbeat.reference.yml @@ -1943,14 +1943,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Packetbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The diff --git a/x-pack/winlogbeat/winlogbeat.reference.yml b/x-pack/winlogbeat/winlogbeat.reference.yml index 58e93d2ded6..24167e7285d 100644 --- a/x-pack/winlogbeat/winlogbeat.reference.yml +++ b/x-pack/winlogbeat/winlogbeat.reference.yml @@ -1414,14 +1414,6 @@ logging.files: # the end of the file. On rotation a new file is created, older files are untouched. #suffix: count -# Set to true to log messages in JSON format. -#logging.json: false - -# Set to true, to log messages with minimal required Elastic Common Schema (ECS) -# information. Recommended to use in combination with `logging.json=true` -# Defaults to false. -#logging.ecs: false - # ============================= X-Pack Monitoring ============================== # Winlogbeat can export internal metrics to a central Elasticsearch monitoring # cluster. This requires xpack monitoring to be enabled in Elasticsearch. The