Skip to content

7.x revert breaking commit, go 1.16.5 update, beats update #5590

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

Merged
merged 7 commits into from
Jul 1, 2021
Merged

7.x revert breaking commit, go 1.16.5 update, beats update #5590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f0d324e
Revert "[7.x] Update to elastic/beats@2871d29be93a (backport #5454) (…
simitt Jun 30, 2021
d859e0b
Update go version to 1.16.5
simitt Jun 30, 2021
5b1fb38
Update to elastic/beats@9361be46ebf2
simitt Jun 30, 2021
4e03b6d
update tests to new ecs version
simitt Jun 30, 2021
c4365b6
fix broken test due to https://github.com/elastic/beats/pull/25219/
simitt Jun 30, 2021
a53adf7
update python tests to new ecs version
simitt Jun 30, 2021
7ccd50b
make update
axw Jul 1, 2021
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
252 changes: 126 additions & 126 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions apmpackage/apm/data_stream/app_metrics/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
type: keyword
description: Cloud region name
ignore_above: 1024
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: container.id
type: keyword
description: |
Expand Down
6 changes: 0 additions & 6 deletions apmpackage/apm/data_stream/app_metrics/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: experimental
type: object
description: Additional experimental data sent by the agents.
Expand Down
6 changes: 6 additions & 0 deletions apmpackage/apm/data_stream/error_logs/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
type: keyword
description: Cloud region name
ignore_above: 1024
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: container.id
type: keyword
description: |
Expand Down
6 changes: 0 additions & 6 deletions apmpackage/apm/data_stream/error_logs/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: error.culprit
type: keyword
description: Function call which was the primary perpetrator of this event.
Expand Down
6 changes: 6 additions & 0 deletions apmpackage/apm/data_stream/internal_metrics/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
type: keyword
description: Cloud region name
ignore_above: 1024
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: container.id
type: keyword
description: |
Expand Down
6 changes: 0 additions & 6 deletions apmpackage/apm/data_stream/internal_metrics/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: experimental
type: object
description: Additional experimental data sent by the agents.
Expand Down
6 changes: 6 additions & 0 deletions apmpackage/apm/data_stream/profile_metrics/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
type: keyword
description: Cloud region name
ignore_above: 1024
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: container.id
type: keyword
description: |
Expand Down
6 changes: 0 additions & 6 deletions apmpackage/apm/data_stream/profile_metrics/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: experimental
type: object
description: Additional experimental data sent by the agents.
Expand Down
6 changes: 6 additions & 0 deletions apmpackage/apm/data_stream/traces/fields/ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@
type: keyword
description: Cloud region name
ignore_above: 1024
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: container.id
type: keyword
description: |
Expand Down
6 changes: 0 additions & 6 deletions apmpackage/apm/data_stream/traces/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
type: keyword
description: |
The ID(s) of the child event(s).
- name: cloud.service.name
level: extended
type: keyword
description: |
Cloud service name, intended to distinguish services running on different platforms within a provider.
ignore_above: 1024
- name: experimental
type: object
description: Additional experimental data sent by the agents.
Expand Down
14 changes: 7 additions & 7 deletions apmpackage/apm/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Traces are written to `traces-apm.*` indices.
|cloud.project.name|Cloud project name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.provider|Cloud provider name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.region|Cloud region name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.service.name|Cloud service name, intended to distinguish services running on different platforms within a provider.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
|cloud.service.name|Cloud service name, intended to distinguish services running on different platforms within a provider.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|container.id|Unique container id.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|destination.address|Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|destination.ip|IP addess of the destination. Can be one of multiple IPv4 or IPv6 addresses.|ip| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
Expand Down Expand Up @@ -208,7 +208,7 @@ Traces are written to `traces-apm.*` indices.
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"ingested": "2020-08-11T09:55:04.391451Z",
Expand Down Expand Up @@ -304,7 +304,7 @@ Traces are written to `traces-apm.*` indices.
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -447,7 +447,7 @@ Metrics are written to `metrics-apm.app.*`, `metrics-apm.internal.*`, and `metri
|cloud.project.name|Cloud project name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.provider|Cloud provider name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.region|Cloud region name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.service.name|Cloud service name, intended to distinguish services running on different platforms within a provider.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
|cloud.service.name|Cloud service name, intended to distinguish services running on different platforms within a provider.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|container.id|Unique container id.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|destination.address|Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|destination.ip|IP addess of the destination. Can be one of multiple IPv4 or IPv6 addresses.|ip| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
Expand Down Expand Up @@ -537,7 +537,7 @@ Metrics are written to `metrics-apm.app.*`, `metrics-apm.internal.*`, and `metri
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"ingested": "2020-04-22T14:55:05.425020Z"
Expand Down Expand Up @@ -620,7 +620,7 @@ Logs are written to `logs-apm.error.*` indices.
|cloud.project.name|Cloud project name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.provider|Cloud provider name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.region|Cloud region name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|cloud.service.name|Cloud service name, intended to distinguish services running on different platforms within a provider.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
|cloud.service.name|Cloud service name, intended to distinguish services running on different platforms within a provider.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|container.id|Unique container id.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|destination.address|Some event destination addresses are defined ambiguously. The event will sometimes list an IP, a domain or a unix socket. You should always store the raw address in the \`.address\` field. Then it should be duplicated to \`.ip\` or \`.domain\`, depending on which one it is.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
|destination.ip|IP addess of the destination. Can be one of multiple IPv4 or IPv6 addresses.|ip| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
Expand Down Expand Up @@ -728,7 +728,7 @@ Logs are written to `logs-apm.error.*` indices.
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",
Expand Down
6 changes: 1 addition & 5 deletions beater/beater.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,11 +655,7 @@ func newSourcemapStore(beatInfo beat.Info, cfg config.SourceMapping, fleetCfg *c
// Default for es is 90s :shrug:
timeout := 30 * time.Second
dialer := transport.NetDialer(timeout)
tlsDialer, err := transport.TLSDialer(dialer, tlsConfig, timeout)
if err != nil {
return nil, err
}

tlsDialer := transport.TLSDialer(dialer, tlsConfig, timeout)
rt = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Dial: dialer.Dial,
Expand Down
10 changes: 5 additions & 5 deletions beater/test_approved_es_documents/TestPublishIntegrationErrors.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"culprit": "my.module.function_name",
Expand Down Expand Up @@ -394,7 +394,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"grouping_key": "dc8dd667f7036ec5f0bae87bf2188243",
Expand Down Expand Up @@ -513,7 +513,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"exception": [
Expand Down Expand Up @@ -628,7 +628,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"exception": [
Expand Down Expand Up @@ -749,7 +749,7 @@
"id": "container-id"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"grouping_key": "d6b3f958dfea98dc9ed2b57d5f0c48bb",
Expand Down
8 changes: 4 additions & 4 deletions beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"outcome": "success"
Expand Down Expand Up @@ -207,7 +207,7 @@
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"outcome": "success"
Expand Down Expand Up @@ -376,7 +376,7 @@
},
"double_gauge": 3.141592653589793,
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"float_gauge": 9.16,
"host": {
Expand Down Expand Up @@ -506,7 +506,7 @@
"id": "8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"culprit": "opbeans.controllers.DTInterceptor.preHandle(DTInterceptor.java:73)",
Expand Down
10 changes: 5 additions & 5 deletions beater/test_approved_es_documents/TestPublishIntegrationMetricsets.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"double_gauge": 3.141592653589793,
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"float_gauge": 9.16,
"host": {
Expand Down Expand Up @@ -110,7 +110,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"go": {
"memstats": {
Expand Down Expand Up @@ -166,7 +166,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"host": {
"ip": "127.0.0.1"
Expand Down Expand Up @@ -229,7 +229,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"host": {
"ip": "127.0.0.1"
Expand Down Expand Up @@ -313,7 +313,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -58,7 +58,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -109,7 +109,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"event": {
"outcome": "unknown"
Expand Down Expand Up @@ -158,7 +158,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"host": {
"ip": "127.0.0.1"
Expand Down Expand Up @@ -187,7 +187,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"grouping_key": "0b9cba09845a097a271c6beb4c6207f3",
Expand Down Expand Up @@ -225,7 +225,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"exception": [
Expand Down Expand Up @@ -265,7 +265,7 @@
"version": "3.14.0"
},
"ecs": {
"version": "1.8.0"
"version": "1.10.0"
},
"error": {
"exception": [
Expand Down
Loading