Merge branch 'master' into add-php-agent-instructions

elastic · Feb 19, 2021 · d538023 · d538023
2 parents c9b17b5 + ce812f6
commit d538023
Show file tree

Hide file tree

Showing 30 changed files with 788 additions and 355 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,7 +1,7 @@
 Elastic APM Server
 Copyright 2014-2021 Elasticsearch BV
 
-This product includes software developed by The Apache Software 
+This product includes software developed by The Apache Software
 Foundation (http://www.apache.org/).
 
 ================================================================================
@@ -509,11 +509,11 @@ SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20210215225204-ba423212a660
+Version: v7.0.0-alpha2.0.20210217153456-1b31c268017d
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20210215225204-ba423212a660/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20210217153456-1b31c268017d/LICENSE.txt:
 
 Source code in this repository is variously licensed under the Apache License
 Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -532,11 +532,11 @@ License Version 2.0.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/ecs
-Version: v1.6.0
+Version: v1.8.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/ecs@v1.6.0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/ecs@v1.8.0/LICENSE.txt:
 
 
                                  Apache License
@@ -18101,11 +18101,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/sys
-Version: v0.0.0-20210124154548-22da62e12c0c
+Version: v0.0.0-20210217105451-b926d437f341
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210124154548-22da62e12c0c/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210217105451-b926d437f341/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -19976,13 +19976,13 @@ Contents of probable licence file $GOMODCACHE/howett.net/[email protected]
 Copyright (c) 2013, Dustin L. Howett. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met: 
+modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
+   list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution. 
+   and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -19996,7 +19996,7 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The views and conclusions contained in the software and documentation are those
-of the authors and should not be interpreted as representing official policies, 
+of the authors and should not be interpreted as representing official policies,
 either expressed or implied, of the FreeBSD Project.
 
 --------------------------------------------------------------------------------

diff --git a/apmpackage/apm/0.1.0/docs/README.md b/apmpackage/apm/0.1.0/docs/README.md
@@ -205,7 +205,7 @@ Traces are written to `traces-apm.*` indices.
     "id": "container-id"
   },
   "ecs": {
-    "version": "1.6.0"
+    "version": "1.8.0"
   },
   "event": {
     "ingested": "2020-08-11T09:55:04.391451Z",
@@ -301,7 +301,7 @@ Traces are written to `traces-apm.*` indices.
     "version": "3.14.0"
   },
   "ecs": {
-    "version": "1.6.0"
+    "version": "1.8.0"
   },
   "event": {
     "outcome": "unknown"
@@ -508,7 +508,7 @@ Metrics are written to `metrics-apm.*`, `metrics-apm.internal.*` and `metrics-ap
     "version": "3.14.0"
   },
   "ecs": {
-    "version": "1.6.0"
+    "version": "1.8.0"
   },
   "event": {
     "ingested": "2020-04-22T14:55:05.425020Z"
@@ -687,7 +687,7 @@ Logs are written to `logs-apm.error.*` indices.
     "id": "container-id"
   },
   "ecs": {
-    "version": "1.6.0"
+    "version": "1.8.0"
   },
   "error": {
     "grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
@@ -37,7 +37,7 @@
                 "id": "container-id"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "culprit": "my.module.function_name",
@@ -393,7 +393,7 @@
                 "id": "container-id"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "grouping_key": "dc8dd667f7036ec5f0bae87bf2188243",
@@ -511,7 +511,7 @@
                 "id": "container-id"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "exception": [
@@ -625,7 +625,7 @@
                 "id": "container-id"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "exception": [
@@ -745,7 +745,7 @@
                 "id": "container-id"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
@@ -14,7 +14,7 @@
                 "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "event": {
                 "outcome": "success"
@@ -207,7 +207,7 @@
                 "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "event": {
                 "outcome": "success"
@@ -369,7 +369,7 @@
             },
             "double_gauge": 3.141592653589793,
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "float_gauge": 9.16,
             "host": {
@@ -498,7 +498,7 @@
                 "id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "culprit": "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)",

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json
@@ -14,7 +14,7 @@
             },
             "double_gauge": 3.141592653589793,
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "float_gauge": 9.16,
             "host": {
@@ -109,7 +109,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "go": {
                 "memstats": {
@@ -164,7 +164,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "host": {
                 "ip": "127.0.0.1"

diff --git a/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json
@@ -7,7 +7,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "event": {
                 "outcome": "unknown"
@@ -58,7 +58,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "event": {
                 "outcome": "unknown"
@@ -109,7 +109,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "event": {
                 "outcome": "unknown"
@@ -158,7 +158,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "host": {
                 "ip": "127.0.0.1"
@@ -186,7 +186,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "grouping_key": "0b9cba09845a097a271c6beb4c6207f3",
@@ -224,7 +224,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "exception": [
@@ -264,7 +264,7 @@
                 "version": "3.14.0"
             },
             "ecs": {
-                "version": "1.6.0"
+                "version": "1.8.0"
             },
             "error": {
                 "exception": [