diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 61210cf2fa0..636ff9a605a 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -133,6 +133,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Update a few kibana.* fields to map to ECS. {pull}10350[10350] - Update rabbitmq.* fields to map to ECS. {pull}10563[10563] - Update haproxy.* fields to map to ECS. {pull}10558[10558] {pull}10568[10568] +- Collect all EC2 meta data from all instances in all states. {pull}10628[10628] *Packetbeat* diff --git a/x-pack/metricbeat/module/aws/ec2/ec2.go b/x-pack/metricbeat/module/aws/ec2/ec2.go index e690cfc4003..a4c0bf18b62 100644 --- a/x-pack/metricbeat/module/aws/ec2/ec2.go +++ b/x-pack/metricbeat/module/aws/ec2/ec2.go @@ -8,7 +8,6 @@ import ( "fmt" "time" - awssdk "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/cloudwatchiface" "github.com/aws/aws-sdk-go-v2/service/ec2" @@ -232,15 +231,7 @@ func getInstancesPerRegion(svc ec2iface.EC2API) (instanceIDs []string, instances init := true for init || output.NextToken != nil { init = false - describeInstanceInput := &ec2.DescribeInstancesInput{ - Filters: []ec2.Filter{ - { - Name: awssdk.String("instance-state-name"), - Values: []string{"running"}, - }, - }, - } - + describeInstanceInput := &ec2.DescribeInstancesInput{} req := svc.DescribeInstancesRequest(describeInstanceInput) output, err := req.Send() if err != nil {