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.

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

add cloud.service.name #1204

Merged
merged 7 commits into from
Jan 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.next.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Thanks, you're awesome :-) -->
#### Added

* Added `http.request.id`. #1208
* Added `cloud.service.name`. #1204

#### Improvements

Expand Down
6 changes: 6 additions & 0 deletions code/go/ecs/cloud.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions docs/field-details.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,24 @@ example: `us-east-1`

// ===============================================================

|
[[field-cloud-service-name]]
<<field-cloud-service-name, cloud.service.name>>

| The cloud service name is intended to distinguish services running on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs App Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.

type: keyword



example: `lambda`

| extended

// ===============================================================

|=====

[[ecs-code_signature]]
Expand Down
11 changes: 11 additions & 0 deletions experimental/generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,17 @@
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
- name: service.name
level: extended
type: keyword
ignore_above: 1024
description: 'The cloud service name is intended to distinguish services running
on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs
App Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.'
example: lambda
default_field: false
- name: code_signature
title: Code Signature
group: 2
Expand Down
1 change: 1 addition & 0 deletions experimental/generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
2.0.0-dev+exp,true,cloud,cloud.project.name,keyword,extended,,my project,The cloud project name.
2.0.0-dev+exp,true,cloud,cloud.provider,keyword,extended,,aws,Name of the cloud provider.
2.0.0-dev+exp,true,cloud,cloud.region,keyword,extended,,us-east-1,Region in which this host is running.
2.0.0-dev+exp,true,cloud,cloud.service.name,keyword,extended,,lambda,The cloud service name.
2.0.0-dev+exp,true,container,container.id,keyword,core,,,Unique container id.
2.0.0-dev+exp,true,container,container.image.name,keyword,extended,,,Name of the image the container was built on.
2.0.0-dev+exp,true,container,container.image.tag,keyword,extended,array,,Container image tags.
Expand Down
15 changes: 15 additions & 0 deletions experimental/generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,21 @@ cloud.region:
normalize: []
short: Region in which this host is running.
type: keyword
cloud.service.name:
dashed_name: cloud-service-name
description: 'The cloud service name is intended to distinguish services running
on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs App
Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.'
example: lambda
flat_name: cloud.service.name
ignore_above: 1024
level: extended
name: service.name
normalize: []
short: The cloud service name.
type: keyword
container.id:
dashed_name: container-id
description: Unique container id.
Expand Down
15 changes: 15 additions & 0 deletions experimental/generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,21 @@ cloud:
normalize: []
short: Region in which this host is running.
type: keyword
cloud.service.name:
dashed_name: cloud-service-name
description: 'The cloud service name is intended to distinguish services running
on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs
App Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.'
example: lambda
flat_name: cloud.service.name
ignore_above: 1024
level: extended
name: service.name
normalize: []
short: The cloud service name.
type: keyword
footnote: 'Examples: If Metricbeat is running on an EC2 host and fetches data from
its host, the cloud info contains the data about this machine. If Metricbeat runs
on a remote machine outside the cloud and fetches data from a service running
Expand Down
8 changes: 8 additions & 0 deletions experimental/generated/elasticsearch/7/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,14 @@
"region": {
"ignore_above": 1024,
"type": "keyword"
},
"service": {
"properties": {
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
}
}
},
Expand Down
8 changes: 8 additions & 0 deletions experimental/generated/elasticsearch/component/cloud.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@
"region": {
"ignore_above": 1024,
"type": "keyword"
},
"service": {
"properties": {
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,17 @@
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
- name: service.name
level: extended
type: keyword
ignore_above: 1024
description: 'The cloud service name is intended to distinguish services running
on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs
App Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.'
example: lambda
default_field: false
- name: code_signature
title: Code Signature
group: 2
Expand Down
1 change: 1 addition & 0 deletions generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
2.0.0-dev,true,cloud,cloud.project.name,keyword,extended,,my project,The cloud project name.
2.0.0-dev,true,cloud,cloud.provider,keyword,extended,,aws,Name of the cloud provider.
2.0.0-dev,true,cloud,cloud.region,keyword,extended,,us-east-1,Region in which this host is running.
2.0.0-dev,true,cloud,cloud.service.name,keyword,extended,,lambda,The cloud service name.
2.0.0-dev,true,container,container.id,keyword,core,,,Unique container id.
2.0.0-dev,true,container,container.image.name,keyword,extended,,,Name of the image the container was built on.
2.0.0-dev,true,container,container.image.tag,keyword,extended,array,,Container image tags.
Expand Down
15 changes: 15 additions & 0 deletions generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,21 @@ cloud.region:
normalize: []
short: Region in which this host is running.
type: keyword
cloud.service.name:
dashed_name: cloud-service-name
description: 'The cloud service name is intended to distinguish services running
on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs App
Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.'
example: lambda
flat_name: cloud.service.name
ignore_above: 1024
level: extended
name: service.name
normalize: []
short: The cloud service name.
type: keyword
container.id:
dashed_name: container-id
description: Unique container id.
Expand Down
15 changes: 15 additions & 0 deletions generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,21 @@ cloud:
normalize: []
short: Region in which this host is running.
type: keyword
cloud.service.name:
dashed_name: cloud-service-name
description: 'The cloud service name is intended to distinguish services running
on different platforms within a provider, eg AWS EC2 vs Lambda, GCP GCE vs
App Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.'
example: lambda
flat_name: cloud.service.name
ignore_above: 1024
level: extended
name: service.name
normalize: []
short: The cloud service name.
type: keyword
footnote: 'Examples: If Metricbeat is running on an EC2 host and fetches data from
its host, the cloud info contains the data about this machine. If Metricbeat runs
on a remote machine outside the cloud and fetches data from a service running
Expand Down
8 changes: 8 additions & 0 deletions generated/elasticsearch/6/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,14 @@
"region": {
"ignore_above": 1024,
"type": "keyword"
},
"service": {
"properties": {
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
}
}
},
Expand Down
8 changes: 8 additions & 0 deletions generated/elasticsearch/7/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,14 @@
"region": {
"ignore_above": 1024,
"type": "keyword"
},
"service": {
"properties": {
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
}
}
},
Expand Down
8 changes: 8 additions & 0 deletions generated/elasticsearch/component/cloud.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@
"region": {
"ignore_above": 1024,
"type": "keyword"
},
"service": {
"properties": {
"name": {
"ignore_above": 1024,
"type": "keyword"
}
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions schemas/cloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,18 @@

Examples: AWS account name, Google Cloud ORG display name.

- name: service.name
level: extended
type: keyword
example: lambda
short: The cloud service name.
description: >
The cloud service name is intended to distinguish services running on
different platforms within a provider, eg AWS EC2 vs Lambda,
GCP GCE vs App Engine, Azure VM vs App Server.

Examples: app engine, app service, cloud run, fargate, lambda.

- name: project.id
level: extended
type: keyword
Expand Down