Merge branch 'master' into eol-compat

.mergify.yml

@@ -25,6 +25,18 @@ pull_request_rules:
         branches:
           - "7.x"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 7.15 branch
+    conditions:
+      - merged
+      - base=master
+      - label=backport-7.15
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "7.15"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
   - name: backport patches to 7.14 branch
     conditions:
       - merged

NOTICE.txt

@@ -576,11 +576,11 @@ SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20210805202431-9c57b1ec68c1
+Version: v7.0.0-alpha2.0.20210815221626-84b4cea96755
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20210805202431-9c57b1ec68c1/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20210815221626-84b4cea96755/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
@@ -4864,11 +4864,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : go.uber.org/zap
-Version: v1.18.1
+Version: v1.19.0
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.18.1/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/go.uber.org/zap@v1.19.0/LICENSE.txt:
 
 Copyright (c) 2016-2017 Uber Technologies, Inc.
 
@@ -4893,11 +4893,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/net
-Version: v0.0.0-20210805182204-aaa1db679c0d
+Version: v0.0.0-20210813160813-60bc85c4be6d
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210805182204-aaa1db679c0d/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210813160813-60bc85c4be6d/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -5004,11 +5004,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : google.golang.org/grpc
-Version: v1.39.1
+Version: v1.40.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.39.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.40.0/LICENSE:
 
 
                                  Apache License
@@ -18787,11 +18787,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/crypto
-Version: v0.0.0-20210711020723-a769d52b0f97
+Version: v0.0.0-20210813211128-0a44fdfbc16e
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210711020723-a769d52b0f97/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210813211128-0a44fdfbc16e/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18861,11 +18861,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/sys
-Version: v0.0.0-20210806184541-e5e7981a1069
+Version: v0.0.0-20210816032535-30e4713e60e3
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210806184541-e5e7981a1069/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210816032535-30e4713e60e3/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18935,11 +18935,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/text
-Version: v0.3.6
+Version: v0.3.7
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected].6/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected].7/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18972,11 +18972,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : google.golang.org/genproto
-Version: v0.0.0-20210805201207-89edb61ffb67
+Version: v0.0.0-20210813162853-db860fec028c
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20210805201207-89edb61ffb67/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20210813162853-db860fec028c/LICENSE:
 
 
                                  Apache License

apmpackage/apm/data_stream/app_metrics/fields/base-fields.yml

@@ -10,3 +10,6 @@
 - name: data_stream.namespace
   type: constant_keyword
   description: Data stream namespace.
+- name: ecs.version
+  type: keyword
+  description: ECS version the event conforms to.