From f5e65f7d680288071c07f6883dd8e16c6cdf501c Mon Sep 17 00:00:00 2001
From: Andrew Wilkins <axw@elastic.co>
Date: Mon, 15 Nov 2021 13:04:28 +0800
Subject: [PATCH] Stop overriding logging.{ecs,json} defaults

---
 _meta/beat.yml                     | 7 -------
 apm-server.docker.yml              | 7 -------
 apm-server.yml                     | 7 -------
 cmd/root.go                        | 2 --
 systemtest/apmservertest/server.go | 2 --
 systemtest/export_test.go          | 4 ----
 6 files changed, 29 deletions(-)

diff --git a/_meta/beat.yml b/_meta/beat.yml
index 3bce17a3206..d639b12e654 100644
--- 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
index 9103bc41b36..859f6389453 100644
--- 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
index 720b986b042..2bba05e9077 100644
--- 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
index a706e095970..3626b1510fd 100644
--- 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
index 8d9ce615eaa..791cafce7b3 100644
--- 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
index bff513ed827..b11940d7245 100644
--- 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: