Merge branch 'master' into copy-package

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/).

_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 ===============================

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 ===============================

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 ===============================

changelogs/7.11.asciidoc

@@ -34,4 +34,5 @@ https://github.com/elastic/apm-server/compare/v7.10.2\...v7.11.0[View commits]
 * Upgrade Go to 1.14.12 {pull}4478[4478]
 * Added apm-server.response_headers config {pull}4523[4523]
 * Switch logging format to be ECS compliant where possible {pull}3829[3829]
+* Switch logging format to JSON to work with ECS logging {pull}4590[4590]
 * Switch from `keyword` to `wildcard` in alignment with ECS 1.7 {pull}4577[4577]

cmd/root.go

@@ -48,7 +48,8 @@ var libbeatConfigOverrides = []cfgfile.ConditionalOverride{{
 			"metrics": map[string]interface{}{
 				"enabled": false,
 			},
-			"ecs": true,
+			"ecs":  true,
+			"json": true,
 		},
 	}),
 }}

docs/breaking-changes.asciidoc

@@ -3,6 +3,10 @@
 APM Server is built on top of {beats-ref}/index.html[libbeat].
 As such, any breaking change in libbeat is also considered to be a breaking change in APM Server.
 
+[float]
+=== 7.11
+There are no breaking changes in APM Server.
+
 [float]
 === 7.10
 There are no breaking changes in APM Server.

docs/guide/apm-breaking-changes.asciidoc

@@ -3,6 +3,7 @@
 
 This section discusses the changes that you need to be aware of when migrating your application from one version of APM to another.
 
+* <<breaking-7.11.0>>
 * <<breaking-7.10.0>>
 * <<breaking-7.9.0>>
 * <<breaking-7.8.0>>
@@ -28,6 +29,13 @@ Also see {observability-guide}/whats-new.html[What's new in Observability {minor
 // tag::notable-v8-breaking-changes[]
 // end::notable-v8-breaking-changes[]
 
+[[breaking-7.11.0]]
+=== 7.11.0 APM Breaking changes
+
+// tag::notable-breaking-changes[]
+No breaking changes.
+// end::notable-breaking-changes[]
+
 [[breaking-7.10.0]]
 === 7.10.0 APM Breaking changes
 

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:

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 }}

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",
     }
 

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