Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.x] Update to elastic/beats@536b32753394 #4547

Merged
merged 2 commits into from
Dec 16, 2020
Merged

[7.x] Update to elastic/beats@536b32753394 #4547

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51c452
Update to elastic/beats@536b32753394
simitt Dec 15, 2020
d1d8dd6
Merge remote-tracking branch 'elastic/7.x' into 7.x-update-beats
simitt Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 86 additions & 18 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ Contents of "LICENSE":
--------------------------------------------------------------------
Dependency: github.com/elastic/beats/v7
Version: v7.0.0
Revision: 6d0785f9b8b2
Revision: 536b32753394
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Expand Down Expand Up @@ -894,6 +894,11 @@ Contents of "LICENSE.txt":
6.11 "Subscription" means the right to receive Support Services and a License
to the Commercial Software.

--------------------------------------------------------------------
Dependency: github.com/elastic/go-concert
Version: v0.0.4
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/elastic/go-elasticsearch/v7
Version: v7.9.0
Expand Down Expand Up @@ -1040,6 +1045,11 @@ Version: v1.0.1
Revision: b8dc90050f24
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/go-logr/logr
Version: v0.2.0
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/go-sourcemap/sourcemap
Version: v2.1.3
Expand Down Expand Up @@ -1295,8 +1305,7 @@ License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/googleapis/gnostic
Version: v0.3.1
Revision: 25d8b0b66985
Version: v0.4.1
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Expand Down Expand Up @@ -1362,6 +1371,38 @@ Contents of "LICENSE.txt":
(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: github.com/h2non/filetype
Version: v1.1.1
Revision: f60988ab73d5
License type (autodetected): MIT
Contents of "LICENSE":

The MIT License

Copyright (c) Tomas Aparicio

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/hashicorp/errwrap
Version: v1.1.0
Expand Down Expand Up @@ -2941,6 +2982,11 @@ Contents of "LICENSE":
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/jonboulle/clockwork
Version: v0.2.2
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/json-iterator/go
Version: v1.1.10
Expand Down Expand Up @@ -3554,11 +3600,31 @@ Contents of "LICENSE":
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/urso/diag
Revision: 21b3cc8eb797
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/urso/go-bin
Revision: 781c575c9f0e
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/urso/sderr
Revision: c2a16f3d43ec
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/xdg/scram
Revision: 7eeb5667e42c
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: github.com/xdg/stringprep
Version: v1.0.0
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: go.elastic.co/apm
Version: v1.9.0
Expand Down Expand Up @@ -3858,7 +3924,7 @@ Contents of "LICENSE.txt":

--------------------------------------------------------------------
Dependency: golang.org/x/crypto
Revision: c8d3bf9c5392
Revision: 5f87f3452ae9
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -3892,7 +3958,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: golang.org/x/net
Revision: 5d6afe98e0b7
Revision: ac852fbbde11
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -3994,7 +4060,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: golang.org/x/sys
Revision: ef89a241ccb3
Revision: f9fddec55a1e
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -4028,7 +4094,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: golang.org/x/term
Revision: f5c789dd3221
Revision: 7de9c90e9dd1
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -4130,7 +4196,7 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: google.golang.org/genproto
Revision: f3c370f40bfb
Revision: cb27e3aa2013
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Expand All @@ -4140,7 +4206,7 @@ License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: google.golang.org/protobuf
Version: v1.23.0
Version: v1.24.0
License type (autodetected): BSD-3-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -4292,7 +4358,7 @@ Contents of "LICENSE.libyaml":

--------------------------------------------------------------------
Dependency: howett.net/plist
Revision: 117a925f2150
Revision: 1454fab16a06
License type (autodetected): BSD-2-Clause
Contents of "LICENSE":

Expand Down Expand Up @@ -4357,33 +4423,35 @@ Contents of "LICENSE":

--------------------------------------------------------------------
Dependency: k8s.io/api
Version: v0.18.3
Replacement: k8s.io/api
Version: v0.19.4
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: k8s.io/apimachinery
Version: v0.18.3
Replacement: k8s.io/apimachinery
Version: v0.19.4
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: k8s.io/client-go
Replacement: k8s.io/client-go
Version: v0.18.3
Version: v0.19.4
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: k8s.io/klog
Version: v1.0.0
Dependency: k8s.io/klog/v2
Version: v2.2.0
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: k8s.io/utils
Revision: a9aa75ae1b89
Revision: d5654de09c73
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Dependency: sigs.k8s.io/structured-merge-diff/v3
Version: v3.0.0
Dependency: sigs.k8s.io/structured-merge-diff/v4
Version: v4.0.1
License type (autodetected): Apache-2.0

--------------------------------------------------------------------
Expand Down
Loading