Stop overriding logging.{ecs,json} defaults

elastic · Nov 15, 2021 · f5e65f7 · f5e65f7
1 parent 602d322
commit f5e65f7
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 29 deletions.
diff --git a/_meta/beat.yml b/_meta/beat.yml
@@ -1023,13 +1023,6 @@ output.elasticsearch:
   # Unix epoch. Defaults to disabled.
   #interval: 0
 
-# Set to true to log messages in json format.
-#logging.json: true
-
-# Set to true, to log messages with minimal required Elastic Common Schema (ECS)
-# information. Recommended to use in combination with `logging.json=true`.
-#logging.ecs: true
-
 #=============================== HTTP Endpoint ===============================
 
 # apm-server can expose internal metrics through a HTTP endpoint. For security

diff --git a/apm-server.docker.yml b/apm-server.docker.yml
@@ -1023,13 +1023,6 @@ output.elasticsearch:
   # Unix epoch. Defaults to disabled.
   #interval: 0
 
-# Set to true to log messages in json format.
-#logging.json: true
-
-# Set to true, to log messages with minimal required Elastic Common Schema (ECS)
-# information. Recommended to use in combination with `logging.json=true`.
-#logging.ecs: true
-
 #=============================== HTTP Endpoint ===============================
 
 # apm-server can expose internal metrics through a HTTP endpoint. For security

diff --git a/apm-server.yml b/apm-server.yml
@@ -1023,13 +1023,6 @@ output.elasticsearch:
   # Unix epoch. Defaults to disabled.
   #interval: 0
 
-# Set to true to log messages in json format.
-#logging.json: true
-
-# Set to true, to log messages with minimal required Elastic Common Schema (ECS)
-# information. Recommended to use in combination with `logging.json=true`.
-#logging.ecs: true
-
 #=============================== HTTP Endpoint ===============================
 
 # apm-server can expose internal metrics through a HTTP endpoint. For security

diff --git a/cmd/root.go b/cmd/root.go
@@ -56,8 +56,6 @@ var libbeatConfigOverrides = func() []cfgfile.ConditionalOverride {
 					"metrics": map[string]interface{}{
 						"enabled": false,
 					},
-					"ecs":  true,
-					"json": true,
 				},
 			}),
 		},

diff --git a/systemtest/apmservertest/server.go b/systemtest/apmservertest/server.go
@@ -138,8 +138,6 @@ func (s *Server) start(tls bool) error {
 	extra := map[string]interface{}{
 		// These are config attributes that we always specify,
 		// as the testing framework relies on them being set.
-		"logging.ecs":               true,
-		"logging.json":              true,
 		"logging.level":             "debug",
 		"logging.to_stderr":         true,
 		"apm-server.expvar.enabled": true,

diff --git a/systemtest/export_test.go b/systemtest/export_test.go
@@ -49,8 +49,6 @@ func TestExportConfigDefaults(t *testing.T) {
 
 	expectedConfig := strings.ReplaceAll(`
 logging:
-  ecs: true
-  json: true
   metrics:
     enabled: false
 path:
@@ -71,8 +69,6 @@ func TestExportConfigOverrideDefaults(t *testing.T) {
 
 	expectedConfig := strings.ReplaceAll(`
 logging:
-  ecs: true
-  json: true
   metrics:
     enabled: true
 path: