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 to add_cloud_metadata #24993

Merged
merged 2 commits into from
Apr 9, 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.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Added new `rate_limit` processor for enforcing rate limits on event throughput. {pull}22883[22883]
- Allow node/namespace metadata to be disabled on kubernetes metagen and ensure add_kubernetes_metadata honors host {pull}23012[23012]
- Add `wineventlog` schema to `decode_xml` processor. {issue}23910[23910] {pull}24726[24726]
- Add new ECS 1.9 field `cloud.service.name` to `add_cloud_metadata` processor. {pull}24993[24993]

*Auditbeat*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ var alibabaCloudMetadataFetcher = provider{
ecsMetadataZoneURI := "/latest/meta-data/zone-id"

ecsSchema := func(m map[string]interface{}) common.MapStr {
m["service"] = common.MapStr{
"name": "ECS",
}
return common.MapStr(m)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ func TestRetrieveAlibabaCloudMetadata(t *testing.T) {
},
"region": "cn-shenzhen",
"availability_zone": "cn-shenzhen-a",
"service": common.MapStr{
"name": "ECS",
},
},
}
assert.Equal(t, expected, actual.Fields)
Expand Down
8 changes: 6 additions & 2 deletions libbeat/processors/add_cloud_metadata/provider_aws_ec2.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,17 @@ var ec2MetadataFetcher = provider{

Create: func(_ string, config *common.Config) (metadataFetcher, error) {
ec2Schema := func(m map[string]interface{}) common.MapStr {
m["serviceName"] = "EC2"
out, _ := s.Schema{
"instance": s.Object{"id": c.Str("instanceId")},
"machine": s.Object{"type": c.Str("instanceType")},
"region": c.Str("region"),
"availability_zone": c.Str("availabilityZone"),
"account": s.Object{"id": c.Str("accountId")},
"image": s.Object{"id": c.Str("imageId")},
"service": s.Object{
"name": c.Str("serviceName"),
},
"account": s.Object{"id": c.Str("accountId")},
"image": s.Object{"id": c.Str("imageId")},
}.Apply(m)
return out
}
Expand Down
17 changes: 16 additions & 1 deletion libbeat/processors/add_cloud_metadata/provider_aws_ec2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func TestRetrieveAWSMetadataEC2(t *testing.T) {
"imageId" : "%s",
"instanceType" : "%s",
"devpayProductCodes" : null,
"privateIp" : "10.0.0.1",
"privateIp" : "10.0.0.1",
"version" : "2010-08-31",
"billingProducts" : null,
"pendingTime" : "2016-09-20T15:43:02Z",
Expand Down Expand Up @@ -114,6 +114,9 @@ func TestRetrieveAWSMetadataEC2(t *testing.T) {
"image": common.MapStr{"id": imageIDDoc1},
"region": regionDoc1,
"availability_zone": availabilityZoneDoc1,
"service": common.MapStr{
"name": "EC2",
},
},
},
},
Expand Down Expand Up @@ -154,6 +157,9 @@ func TestRetrieveAWSMetadataEC2(t *testing.T) {
"image": common.MapStr{"id": imageIDDoc1},
"region": regionDoc1,
"availability_zone": availabilityZoneDoc1,
"service": common.MapStr{
"name": "EC2",
},
},
},
},
Expand All @@ -172,6 +178,9 @@ func TestRetrieveAWSMetadataEC2(t *testing.T) {
"image": common.MapStr{"id": imageIDDoc1},
"region": regionDoc1,
"availability_zone": availabilityZoneDoc1,
"service": common.MapStr{
"name": "EC2",
},
},
},
},
Expand All @@ -194,6 +203,9 @@ func TestRetrieveAWSMetadataEC2(t *testing.T) {
"image": common.MapStr{"id": imageIDDoc1},
"region": regionDoc1,
"availability_zone": availabilityZoneDoc1,
"service": common.MapStr{
"name": "EC2",
},
},
},
},
Expand All @@ -215,6 +227,9 @@ func TestRetrieveAWSMetadataEC2(t *testing.T) {
"image": common.MapStr{"id": imageIDDoc1},
"region": regionDoc1,
"availability_zone": availabilityZoneDoc1,
"service": common.MapStr{
"name": "EC2",
},
},
},
},
Expand Down
4 changes: 4 additions & 0 deletions libbeat/processors/add_cloud_metadata/provider_azure_vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ var azureVMMetadataFetcher = provider{
azMetadataURI := "/metadata/instance/compute?api-version=2017-04-02"
azHeaders := map[string]string{"Metadata": "true"}
azSchema := func(m map[string]interface{}) common.MapStr {
m["serviceName"] = "Virtual Machines"
out, _ := s.Schema{
"account": s.Object{
"id": c.Str("subscriptionId"),
Expand All @@ -44,6 +45,9 @@ var azureVMMetadataFetcher = provider{
"machine": s.Object{
"type": c.Str("vmSize"),
},
"service": s.Object{
"name": c.Str("serviceName"),
},
"region": c.Str("location"),
}.Apply(m)
return out
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ func TestRetrieveAzureMetadata(t *testing.T) {
"account": common.MapStr{
"id": "5tfb04c3-63de-4709-a9f9-9ab8c0411d5e",
},
"service": common.MapStr{
"name": "Virtual Machines",
},
"region": "eastus2",
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,15 @@ var doMetadataFetcher = provider{

Create: func(provider string, config *common.Config) (metadataFetcher, error) {
doSchema := func(m map[string]interface{}) common.MapStr {
m["serviceName"] = "Droplets"
out, _ := s.Schema{
"instance": s.Object{
"id": c.StrFromNum("droplet_id"),
},
"region": c.Str("region"),
"service": s.Object{
"name": c.Str("serviceName"),
},
}.Apply(m)
return out
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ func TestRetrieveDigitalOceanMetadata(t *testing.T) {
"instance": common.MapStr{
"id": "1111111",
},
"service": common.MapStr{
"name": "Droplets",
},
"region": "nyc3",
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ var gceMetadataFetcher = provider{
gceMetadataURI := "/computeMetadata/v1/?recursive=true&alt=json"
gceHeaders := map[string]string{"Metadata-Flavor": "Google"}
gceSchema := func(m map[string]interface{}) common.MapStr {
out := common.MapStr{}
out := common.MapStr{
"service": common.MapStr{
"name": "GCE",
},
}

trimLeadingPath := func(key string) {
v, err := out.GetValue(key)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ func TestRetrieveGCEMetadata(t *testing.T) {
"project": common.MapStr{
"id": "test-dev",
},
"service": common.MapStr{
"name": "GCE",
},
},
}
assert.Equal(t, expected, actual.Fields)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ var openstackNovaSSLMetadataFetcher = provider{
func buildOpenstackNovaCreate(scheme string) func(provider string, c *common.Config) (metadataFetcher, error) {
return func(provider string, c *common.Config) (metadataFetcher, error) {
osSchema := func(m map[string]interface{}) common.MapStr {
m["service"] = common.MapStr{
"name": "Nova",
}
return common.MapStr(m)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ func assertOpenstackNova(t *testing.T, config *common.Config) {
"type": "m1.xlarge",
},
"availability_zone": "az-test-2",
"service": common.MapStr{
"name": "Nova",
},
},
}
assert.Equal(t, expected, actual.Fields)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ var qcloudMetadataFetcher = provider{
qcloudMetadataZoneURI := "/meta-data/placement/zone"

qcloudSchema := func(m map[string]interface{}) common.MapStr {
m["service"] = common.MapStr{
"name": "CVM",
}
return common.MapStr(m)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ func TestRetrieveQCloudMetadata(t *testing.T) {
},
"region": "china-south-gz",
"availability_zone": "gz-azone2",
"service": common.MapStr{
"name": "CVM",
},
},
}
assert.Equal(t, expected, actual.Fields)
Expand Down