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

Cloud metadata #3729

Merged
merged 6 commits into from
May 5, 2020
Merged

Cloud metadata #3729

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4d239d2
model: add Cloud type, Metadata.Cloud field
axw May 4, 2020
3c4279d
docs/spec: add cloud to metadata schema
axw May 4, 2020
276f507
modeldecoder: decode Cloud metadata
axw May 4, 2020
41980f6
Update integration tests
axw May 4, 2020
e54e831
Add changelog entry
axw May 4, 2020
6b9fd32
_meta: add 'overwrite: true' to duplicated fields
axw May 5, 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
77 changes: 77 additions & 0 deletions _meta/fields.common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,3 +685,80 @@
dynamic: true
description: Additional experimental data sent by the agents.

- name: cloud
title: Cloud
group: 2
type: group
description: >
Cloud metadata reported by agents
fields:
- name: account
type: group
dynamic: false
fields:
- name: id
level: extended
type: keyword
ignore_above: 1024
description: Cloud account ID
- name: name
level: extended
type: keyword
ignore_above: 1024
description: Cloud account name
- name: availability_zone
axw marked this conversation as resolved.
Show resolved Hide resolved
level: extended
type: keyword
ignore_above: 1024
description: Cloud availability zone name
example: us-east1-a
- name: instance
type: group
dynamic: false
fields:
- name: id
level: extended
type: keyword
ignore_above: 1024
description: Cloud instance/machine ID
- name: name
level: extended
type: keyword
ignore_above: 1024
description: Cloud instance/machine name
- name: machine
type: group
dynamic: false
fields:
- name: type
level: extended
type: keyword
ignore_above: 1024
description: Cloud instance/machine type
example: t2.medium
- name: project
type: group
dynamic: false
fields:
- name: id
level: extended
type: keyword
ignore_above: 1024
description: Cloud project ID
- name: name
level: extended
type: keyword
ignore_above: 1024
description: Cloud project name
- name: provider
level: extended
type: keyword
ignore_above: 1024
description: Cloud provider name
example: gcp
- name: region
level: extended
type: keyword
ignore_above: 1024
description: Cloud region name
example: us-east1
100 changes: 100 additions & 0 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 @@ -16,6 +16,26 @@
"client": {
"ip": "12.53.12.1"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -354,6 +374,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -455,6 +495,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -552,6 +612,26 @@
"name": "elastic-ruby",
"version": "2.1.3"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -655,6 +735,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down
120 changes: 120 additions & 0 deletions beater/test_approved_es_documents/TestPublishIntegrationSpans.approved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,26 @@
"51234abcdef56789"
]
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -126,6 +146,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -236,6 +276,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -350,6 +410,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -461,6 +541,26 @@
"name": "elastic-ruby",
"version": "2.2"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down Expand Up @@ -654,6 +754,26 @@
"name": "elastic-node",
"version": "3.14.0"
},
"cloud": {
"account": {
"id": "account_id",
"name": "account_name"
},
"availability_zone": "cloud_availability_zone",
"instance": {
"id": "instance_id",
"name": "instance_name"
},
"machine": {
"type": "machine_type"
},
"project": {
"id": "project_id",
"name": "project_name"
},
"provider": "cloud_provider",
"region": "cloud_region"
},
"container": {
"id": "container-id"
},
Expand Down
Loading