Switch to JSON logging by default (#4590) (#4605)

elastic · Jan 11, 2021 · 1a5cb35 · 1a5cb35
1 parent 9f9a92b
commit 1a5cb35
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 27 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 Elastic APM Server
-Copyright 2017-2020 Elasticsearch BV
+Copyright 2017-2021 Elasticsearch BV
 
 This product includes software developed by The Apache Software 
 Foundation (http://www.apache.org/).

diff --git a/_meta/beat.yml b/_meta/beat.yml
@@ -1059,11 +1059,10 @@ output.elasticsearch:
   #interval: 0
 
 # Set to true to log messages in json format.
-#logging.json: false
+#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`
-# Defaults to true.
+# information. Recommended to use in combination with `logging.json=true`.
 #logging.ecs: true
 
 #=============================== HTTP Endpoint ===============================

diff --git a/apm-server.docker.yml b/apm-server.docker.yml
@@ -1059,11 +1059,10 @@ output.elasticsearch:
   #interval: 0
 
 # Set to true to log messages in json format.
-#logging.json: false
+#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`
-# Defaults to true.
+# information. Recommended to use in combination with `logging.json=true`.
 #logging.ecs: true
 
 #=============================== HTTP Endpoint ===============================

diff --git a/apm-server.yml b/apm-server.yml
@@ -1059,11 +1059,10 @@ output.elasticsearch:
   #interval: 0
 
 # Set to true to log messages in json format.
-#logging.json: false
+#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`
-# Defaults to true.
+# information. Recommended to use in combination with `logging.json=true`.
 #logging.ecs: true
 
 #=============================== HTTP Endpoint ===============================

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

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

diff --git a/tests/system/config/apm-server.yml.j2 b/tests/system/config/apm-server.yml.j2
@@ -249,21 +249,14 @@ output.elasticsearch:
 
 ############################# Logging #########################################
 
-{% if logging_json or logging_level or logging_ecs_disabled %}
-logging:
-{% endif %}
 {% if logging_json %}
-  # Set to true to log messages in json format.
-  json: {{ logging_json }}
-{% endif %}
-
-{% if logging_level %}
-  # Set log level
-  level: {{ logging_level }}
+# Defaults to true.
+logging.json: {{ logging_json }}
 {% endif %}
 
-{% if logging_ecs_disabled %}
-  ecs: false
+{% if logging_ecs %}
+# Defaults to true.
+logging.ecs: {{ logging_json }}
 {% endif %}
 
 queue.mem.flush.min_events: {{ queue_flush }}

diff --git a/tests/system/test_integration_acm.py b/tests/system/test_integration_acm.py
@@ -12,7 +12,6 @@ def config(self):
         cfg = super(AgentConfigurationTest, self).config()
         cfg.update({
             "kibana_host": self.get_kibana_url(),
-            "logging_json": "true",
             "kibana_enabled": "true",
             "acm_cache_expiration": "1s"
         })
@@ -184,7 +183,6 @@ def test_rum_disabled(self):
 @integration_test
 class AgentConfigurationKibanaDownIntegrationTest(ElasticTest):
     config_overrides = {
-        "logging_json": "true",
         "secret_token": "supersecret",
         "kibana_enabled": "true",
         "kibana_host": "unreachablehost"
@@ -223,7 +221,6 @@ def test_config_requests(self):
 @integration_test
 class AgentConfigurationKibanaDisabledIntegrationTest(ElasticTest):
     config_overrides = {
-        "logging_json": "true",
         "kibana_enabled": "false",
     }
 

diff --git a/tests/system/test_jaeger.py b/tests/system/test_jaeger.py
@@ -33,7 +33,8 @@ def config(self):
             # check that the authorization tag is always removed,
             # even if there's no secret token / API Key auth.
             "jaeger_grpc_auth_tag": "authorization",
-            "logging_ecs_disabled": "true",
+            "logging_ecs": "false",
+            "logging_json": "false",
         })
         return cfg