Skip to content

Commit

Permalink
make update (#6318)
Browse files Browse the repository at this point in the history
* fix apmpackage changelog

* update to go1.17.1

* make update-beats

* Update go.mod to 1.17

* go mod tidy

* go mod download all

* Makefile: move fields.asciidoc to docs/legacy

* Manual tweaks to fields.asciidoc

See #6287

* Stop generating fields.asciidoc

We won't be updating libbeat fields.yml anymore,
so no need to keep regenerating fields.asciidoc.

Co-authored-by: Andrew Wilkins <[email protected]>
  • Loading branch information
stuartnelson3 and axw authored Oct 16, 2021
1 parent 5abc7d0 commit 4a4658e
Show file tree
Hide file tree
Showing 20 changed files with 636 additions and 354 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.6
1.17.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.16.6
FROM golang:1.17.1
MAINTAINER Nicolas Ruflin <[email protected]>

RUN set -x && \
Expand Down
56 changes: 28 additions & 28 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -576,11 +576,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20211004051530-67f2e2b0bc87
Version: v7.0.0-alpha2.0.20211014102705-568fd05e680b
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20211004051530-67f2e2b0bc87/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20211014102705-568fd05e680b/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
Expand Down Expand Up @@ -5104,11 +5104,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/net
Version: v0.0.0-20210929193557-e81a3d93ecf6
Version: v0.0.0-20211013171255-e13a2654a71e
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210929193557-e81a3d93ecf6/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20211013171255-e13a2654a71e/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -9655,11 +9655,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-structform@v

--------------------------------------------------------------------------------
Dependency : github.com/elastic/go-sysinfo
Version: v1.7.0
Version: v1.7.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].0/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE.txt:


Apache License
Expand Down Expand Up @@ -10598,11 +10598,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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

Contents of probable licence file $GOMODCACHE/github.com/go-logr/logr@v0.2.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/go-logr/logr@v0.4.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -16146,11 +16146,11 @@ Contents of probable licence file $GOMODCACHE/github.com/opentracing/opentracing

--------------------------------------------------------------------------------
Dependency : github.com/pierrec/lz4
Version: v2.5.2+incompatible
Version: v2.6.0+incompatible
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4@v2.5.2+incompatible/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4@v2.6.0+incompatible/LICENSE:

Copyright (c) 2015, Pierre Curto
All rights reserved.
Expand Down Expand Up @@ -17695,11 +17695,11 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg/[email protected]/LICENS

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

Contents of probable licence file $GOMODCACHE/github.com/xdg/[email protected].0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/xdg/[email protected].3/LICENSE:


Apache License
Expand Down Expand Up @@ -19882,11 +19882,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/sys
Version: v0.0.0-20211003122950-b1ebd4e1001c
Version: v0.0.0-20211013075003-97ac67df715c
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20211003122950-b1ebd4e1001c/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20211013075003-97ac67df715c/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -19919,11 +19919,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/term
Version: v0.0.0-20201126162022-7de9c90e9dd1
Version: v0.0.0-20210220032956-6a3ed077a48d
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20201126162022-7de9c90e9dd1/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210220032956-6a3ed077a48d/LICENSE:

Copyright (c) 2009 The Go Authors. All rights reserved.

Expand Down Expand Up @@ -19993,11 +19993,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto
Version: v0.0.0-20211001223012-bfb93cce50d9
Version: v0.0.0-20211013025323-ce878158c4d4
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20211001223012-bfb93cce50d9/LICENSE:
Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected]20211013025323-ce878158c4d4/LICENSE:


Apache License
Expand Down Expand Up @@ -21403,11 +21403,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : k8s.io/api
Version: v0.20.6
Version: v0.21.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.20.6/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.21.1/LICENSE:


Apache License
Expand Down Expand Up @@ -21615,11 +21615,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]/LICENSE:

--------------------------------------------------------------------------------
Dependency : k8s.io/apimachinery
Version: v0.20.6
Version: v0.21.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.20.6/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.21.1/LICENSE:


Apache License
Expand Down Expand Up @@ -21827,11 +21827,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]/LICENS

--------------------------------------------------------------------------------
Dependency : k8s.io/client-go
Version: v0.20.6
Version: v0.21.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.20.6/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.21.1/LICENSE:


Apache License
Expand Down Expand Up @@ -22039,11 +22039,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]/LICENSE:

--------------------------------------------------------------------------------
Dependency : k8s.io/klog/v2
Version: v2.4.0
Version: v2.8.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/k8s.io/klog/v2@v2.4.0/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/klog/v2@v2.8.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -22452,11 +22452,11 @@ Contents of probable licence file $GOMODCACHE/k8s.io/[email protected]

--------------------------------------------------------------------------------
Dependency : sigs.k8s.io/structured-merge-diff/v4
Version: v4.0.3
Version: v4.1.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/v4@v4.0.3/LICENSE:
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/structured-merge-diff/v4@v4.1.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
35 changes: 33 additions & 2 deletions docs/legacy/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -22583,16 +22583,47 @@ type: ip
--
*`kubernetes.namespace`*::
*`kubernetes.namespace.name`*::
+
--
Kubernetes namespace
Kubernetes namespace name
type: keyword
--
*`kubernetes.namespace.uuid`*::
+
--
Kubernetes namespace uuid
type: keyword
--
*`kubernetes.namespace.labels.*`*::
+
--
Kubernetes namespace labels map
type: object
--
*`kubernetes.namespace.annotations.*`*::
+
--
Kubernetes namespace annotations map
type: object
--
*`kubernetes.node.name`*::
+
--
Expand Down
2 changes: 1 addition & 1 deletion docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: master
:go-version: 1.16.6
:go-version: 1.17.1
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
Expand Down
Loading

0 comments on commit 4a4658e

Please sign in to comment.