Skip to content

Commit

Permalink
Update to elastic/beats@1ec04e2cbfd8 (#4808)
Browse files Browse the repository at this point in the history 
* Update to elastic/beats@1ec04e2cbfd8
* Update approvals for ECS 1.8.0
  • Loading branch information
@axw
axw authored Feb 25, 2021
1 parent 9582825 commit 998de33
Show file tree
Hide file tree
Showing 25 changed files with 368 additions and 357 deletions.
44 changes: 22 additions & 22 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,11 +509,11 @@ SOFTWARE.

--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
Version: v7.0.0-alpha2.0.20210217184505-f8b654daf437
Version: v7.0.0-alpha2.0.20210218165332-1ec04e2cbfd8
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20210217184505-f8b654daf437/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20210218165332-1ec04e2cbfd8/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 All @@ -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
Expand Down Expand Up @@ -1655,11 +1655,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------------------
Dependency : github.com/gofrs/uuid
Version: v3.3.0+incompatible
Version: v4.0.0+incompatible
Licence type (autodetected): MIT
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid@v3.3.0+incompatible/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/gofrs/uuid@v4.0.0+incompatible/LICENSE:

Copyright (C) 2013-2018 by Maxim Bublis <[email protected]>

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

--------------------------------------------------------------------------------
Dependency : go.elastic.co/apm
Version: v1.9.0
Version: v1.11.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/apm@v1.9.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/apm@v1.11.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -9351,11 +9351,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-structform@v

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

Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.5.0/LICENSE.txt:
Contents of probable licence file $GOMODCACHE/github.com/elastic/go-sysinfo@v1.6.0/LICENSE.txt:


Apache License
Expand Down Expand Up @@ -9986,11 +9986,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]

--------------------------------------------------------------------------------
Dependency : github.com/elastic/gosigar
Version: v0.13.0
Version: v0.14.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.13.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/elastic/gosigar@v0.14.0/LICENSE:

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

--------------------------------------------------------------------------------
Dependency : github.com/prometheus/procfs
Version: v0.2.0
Version: v0.6.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.2.0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.6.0/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -16137,11 +16137,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].

--------------------------------------------------------------------------------
Dependency : github.com/rcrowley/go-metrics
Version: v0.0.0-20200313005456-10cdbea86bc0
Version: v0.0.0-20201227073835-cf1acfcdf475
Licence type (autodetected): BSD-2-Clause-FreeBSD
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/github.com/rcrowley/[email protected]20200313005456-10cdbea86bc0/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/rcrowley/[email protected]20201227073835-cf1acfcdf475/LICENSE:

Copyright 2012 Richard Crowley. All rights reserved.

Expand Down Expand Up @@ -17576,11 +17576,11 @@ Contents of probable licence file $GOMODCACHE/github.com/xdg/[email protected]/L

--------------------------------------------------------------------------------
Dependency : go.elastic.co/ecszap
Version: v0.3.0
Version: v1.0.0
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v0.3.0/LICENSE:
Contents of probable licence file $GOMODCACHE/go.elastic.co/ecszap@v1.0.0/LICENSE:


Apache License
Expand Down Expand Up @@ -18027,11 +18027,11 @@ THE SOFTWARE.

--------------------------------------------------------------------------------
Dependency : golang.org/x/crypto
Version: v0.0.0-20201221181555-eec23a3978ad
Version: v0.0.0-20210218145215-b8e89b74b9df
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20201221181555-eec23a3978ad/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210218145215-b8e89b74b9df/LICENSE:

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

Expand Down Expand Up @@ -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-20210217105451-b926d437f341
Version: v0.0.0-20210218155724-8ebf48af031b
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------

Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210217105451-b926d437f341/LICENSE:
Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20210218155724-8ebf48af031b/LICENSE:

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

Expand Down
8 changes: 4 additions & 4 deletions apmpackage/apm/0.1.0/docs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,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",
Expand Down Expand Up @@ -309,7 +309,7 @@ Traces are written to `traces-apm.*` indices.
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -516,7 +516,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"
Expand Down Expand Up @@ -695,7 +695,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",
Expand Down
10 changes: 5 additions & 5 deletions beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"culprit": "my.module.function_name",
Expand Down Expand Up @@ -393,7 +393,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"grouping_key": "dc8dd667f7036ec5f0bae87bf2188243",
Expand Down Expand Up @@ -511,7 +511,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"exception": [
Expand Down Expand Up @@ -625,7 +625,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"exception": [
Expand Down Expand Up @@ -745,7 +745,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",
Expand Down
8 changes: 4 additions & 4 deletions beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"event": {
"outcome": "success"
Expand Down Expand Up @@ -207,7 +207,7 @@
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"event": {
"outcome": "success"
Expand Down Expand Up @@ -369,7 +369,7 @@
},
"double_gauge": 3.141592653589793,
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"float_gauge": 9.16,
"host": {
Expand Down Expand Up @@ -498,7 +498,7 @@
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"culprit": "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)",
Expand Down
6 changes: 3 additions & 3 deletions beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"double_gauge": 3.141592653589793,
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"float_gauge": 9.16,
"host": {
Expand Down Expand Up @@ -109,7 +109,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"go": {
"memstats": {
Expand Down Expand Up @@ -164,7 +164,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"host": {
"ip": "127.0.0.1"
Expand Down
14 changes: 7 additions & 7 deletions beater/test_approved_es_documents/TestPublishIntegrationMinimalEvents.approved.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -58,7 +58,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -109,7 +109,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -158,7 +158,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"host": {
"ip": "127.0.0.1"
Expand Down Expand Up @@ -186,7 +186,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"grouping_key": "0b9cba09845a097a271c6beb4c6207f3",
Expand Down Expand Up @@ -224,7 +224,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"exception": [
Expand Down Expand Up @@ -264,7 +264,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.6.0"
"version": "1.8.0"
},
"error": {
"exception": [
Expand Down
Loading

0 comments on commit 998de33

Please sign in to comment.