[7.x] Update beats framework to 7dabaf093231 (#3833)

* Update beats framework to 7dabaf093231

* Fix for avoiding duplicate dynamic template names #2693

* Align k8s.io/client-go with beats version

NOTICE.txt

@@ -512,7 +512,7 @@ Contents of "LICENSE":
 --------------------------------------------------------------------
 Dependency: github.com/elastic/beats/v7
 Version: v7.0.0
-Revision: d6dd4a70f8db
+Revision: 7dabaf093231
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
@@ -824,7 +824,7 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: github.com/golang/protobuf
-Version: v1.3.2
+Version: v1.4.2
 License type (autodetected): BSD-3-Clause
 Contents of "LICENSE":
 
@@ -926,7 +926,7 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: github.com/google/gofuzz
-Version: v1.0.0
+Version: v1.1.0
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
@@ -1835,7 +1835,7 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: github.com/json-iterator/go
-Version: v1.1.7
+Version: v1.1.8
 License type (autodetected): MIT
 Contents of "LICENSE":
 
@@ -2911,7 +2911,7 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: golang.org/x/sys
-Revision: 6aff5f38e54f
+Revision: 8d3cce7afc34
 License type (autodetected): BSD-3-Clause
 Contents of "LICENSE":
 
@@ -3018,9 +3018,43 @@ License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: google.golang.org/grpc
-Version: v1.27.1
+Version: v1.29.1
 License type (autodetected): Apache-2.0
 
+--------------------------------------------------------------------
+Dependency: google.golang.org/protobuf
+Version: v1.23.0
+License type (autodetected): BSD-3-Clause
+Contents of "LICENSE":
+
+    Copyright (c) 2018 The Go Authors. All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are
+    met:
+
+       * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+       * 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.
+       * Neither the name of Google Inc. nor the names of its
+    contributors may be used to endorse or promote products derived from
+    this software without specific prior written permission.
+
+    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 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+    A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+    OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+    SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+    LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 --------------------------------------------------------------------
 Dependency: gopkg.in/inf.v0
 Version: v0.9.1
@@ -3073,7 +3107,7 @@ License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: gopkg.in/jcmturner/gokrb5.v7
-Version: v7.3.0
+Version: v7.5.0
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
@@ -3083,7 +3117,7 @@ License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: gopkg.in/yaml.v2
-Version: v2.2.8
+Version: v2.3.0
 License type (autodetected): Apache-2.0
 Contents of "NOTICE":
 
@@ -3103,7 +3137,7 @@ Contents of "NOTICE":
 
 --------------------------------------------------------------------
 Dependency: gopkg.in/yaml.v2
-Version: v2.2.8
+Version: v2.3.0
 License type (autodetected): MIT
 Contents of "LICENSE.libyaml":
 
@@ -3206,34 +3240,38 @@ Contents of "LICENSE":
 
 --------------------------------------------------------------------
 Dependency: k8s.io/api
-Revision: 36bff7324fb7
+Version: v0.18.3
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: k8s.io/apimachinery
-Revision: 423f5d784010
+Version: v0.18.3
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: k8s.io/client-go
 Replacement: k8s.io/client-go
-Revision: 78d2af792bab
+Version: v0.18.3
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: k8s.io/klog
-Version: v0.4.0
+Version: v1.0.0
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: k8s.io/utils
-Revision: 6c36bc71fc4a
+Revision: a9aa75ae1b89
+License type (autodetected): Apache-2.0
+
+--------------------------------------------------------------------
+Dependency: sigs.k8s.io/structured-merge-diff/v3
+Version: v3.0.0
 License type (autodetected): Apache-2.0
 
 --------------------------------------------------------------------
 Dependency: sigs.k8s.io/yaml
-Version: v1.1.1
-Revision: 4cd0c284b15f
+Version: v1.2.0
 License type (autodetected): MIT
 Contents of "LICENSE":
 

go.mod

@@ -9,10 +9,10 @@ require (
 	github.com/cespare/xxhash/v2 v2.1.1
 	github.com/client9/misspell v0.3.5-0.20180309020325-c0b55c823952 // indirect
 	github.com/dlclark/regexp2 v1.2.0 // indirect
-	github.com/dop251/goja v0.0.0-20200414142002-77e84ffb8c65 // indirect
+	github.com/dop251/goja v0.0.0-20200526165454-f1752421c432 // indirect
 	github.com/dop251/goja_nodejs v0.0.0-20200128125109-2d688c7e0ac4 // indirect
 	github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4
-	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200511065629-d6dd4a70f8db
+	github.com/elastic/beats/v7 v7.0.0-alpha2.0.20200602125252-7dabaf093231
 	github.com/elastic/go-elasticsearch/v7 v7.5.0
 	github.com/elastic/go-elasticsearch/v8 v8.0.0-20200210103600-aff00e5adfde
 	github.com/elastic/go-hdrhistogram v0.1.0
@@ -22,13 +22,15 @@ require (
 	github.com/go-sourcemap/sourcemap v2.1.3+incompatible
 	github.com/gofrs/uuid v3.3.0+incompatible
 	github.com/gogo/googleapis v1.3.1-0.20190914144012-b8d18e97a9a1 // indirect
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.4.2
 	github.com/google/addlicense v0.0.0-20190907113143-be125746c2c4 // indirect
 	github.com/google/go-cmp v0.4.0
 	github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc
 	github.com/hashicorp/golang-lru v0.5.3
 	github.com/jaegertracing/jaeger v1.16.0
+	github.com/jcmturner/gofork v1.0.0 // indirect
 	github.com/jstemmer/go-junit-report v0.9.1
+	github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd // indirect
 	github.com/magefile/mage v1.9.0
 	github.com/mitchellh/hashstructure v1.0.0 // indirect
 	github.com/modern-go/reflect2 v1.0.1
@@ -42,7 +44,7 @@ require (
 	github.com/santhosh-tekuri/jsonschema v1.2.4
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.5.0
+	github.com/stretchr/testify v1.5.1
 	github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c
 	github.com/uber/tchannel-go v1.16.0 // indirect
 	go.elastic.co/apm v1.7.2
@@ -52,15 +54,14 @@ require (
 	go.elastic.co/ecszap v0.2.0 // indirect
 	go.uber.org/atomic v1.6.0
 	go.uber.org/zap v1.15.0
-	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 // indirect
 	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
 	golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
-	golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f // indirect
+	golang.org/x/sys v0.0.0-20200602100848-8d3cce7afc34 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5 // indirect
-	google.golang.org/grpc v1.27.1
-	gopkg.in/yaml.v2 v2.2.8
+	golang.org/x/tools v0.0.0-20200601175630-2caf76543d99 // indirect
+	google.golang.org/grpc v1.29.1
+	gopkg.in/yaml.v2 v2.3.0
 	howett.net/plist v0.0.0-20200419221736-3b63eb3a43b5 // indirect
 )
 
@@ -73,5 +74,5 @@ replace (
 	github.com/fsnotify/fsevents => github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270
 	github.com/fsnotify/fsnotify => github.com/adriansr/fsnotify v0.0.0-20180417234312-c9bbe1f46f1d
 	github.com/tonistiigi/fifo => github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
+	k8s.io/client-go => k8s.io/client-go v0.18.3
 )