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

Remove filter in DescribeInstances #10628

Merged
merged 63 commits into from
Feb 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
aed6cc6
Never default to a qualifier when none of them are set. (#9148)
ph Nov 19, 2018
07c4fa5
Merge branch 'master' of github.com:kaiyan-sheng/beats
kaiyan-sheng Nov 27, 2018
ff52365
Merge branch 'master' of github.com:kaiyan-sheng/beats
kaiyan-sheng Dec 10, 2018
5f9f575
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 10, 2018
09d8b97
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 10, 2018
141277e
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 13, 2018
276a1de
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 14, 2018
19a705a
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 17, 2018
e54a566
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 18, 2018
edd4488
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 26, 2018
b0d2e22
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 27, 2018
378b4f9
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 28, 2018
1996739
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Dec 28, 2018
1e05766
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 2, 2019
33c130c
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 2, 2019
513bbd0
Merge branch 'master' of github.com:elastic/beats
kaiyan-sheng Jan 3, 2019
c618fd0
Merge branch 'master' of github.com:elastic/beats
kaiyan-sheng Jan 3, 2019
40c8368
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 3, 2019
042c89b
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 3, 2019
97393f4
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 4, 2019
5b300c8
Merge branch 'master' of github.com:elastic/beats
kaiyan-sheng Jan 4, 2019
be995ca
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 7, 2019
b9461c2
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 9, 2019
89f5158
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 10, 2019
2db435e
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 11, 2019
1f3911b
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 14, 2019
3244062
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 14, 2019
89fcbbf
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 14, 2019
71b5c64
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 14, 2019
19cda55
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 14, 2019
c08f7fc
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 15, 2019
dcd95f8
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 16, 2019
f6fa0c2
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 16, 2019
af20179
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 18, 2019
bf32666
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 18, 2019
9386146
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 21, 2019
b7ff595
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 22, 2019
fbbf49d
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 22, 2019
d5e086d
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 23, 2019
9aed507
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 24, 2019
2419bbf
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 24, 2019
1e7e5f4
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 24, 2019
113d1f7
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 24, 2019
b8e918f
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 25, 2019
f11f562
Merge branch 'master' of github.com:elastic/beats
kaiyan-sheng Jan 28, 2019
bc84e90
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 28, 2019
f3a53c0
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 29, 2019
7a1fb44
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 30, 2019
c49c601
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 30, 2019
a54297f
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 31, 2019
53afa5c
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Jan 31, 2019
18cbfd2
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 1, 2019
5731d47
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 4, 2019
653fee5
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 4, 2019
a4338fc
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 5, 2019
528968e
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 5, 2019
7a33c70
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 5, 2019
4b212dd
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 5, 2019
c4dbfa9
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 6, 2019
48ed802
Merge remote-tracking branch 'upstream/master'
kaiyan-sheng Feb 7, 2019
de90e52
Remove filter DescribeInstances
kaiyan-sheng Feb 6, 2019
134b08e
Add changelog
kaiyan-sheng Feb 7, 2019
c587362
Remove rebase error
kaiyan-sheng Feb 7, 2019
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 @@ -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*

Expand Down
11 changes: 1 addition & 10 deletions x-pack/metricbeat/module/aws/ec2/ec2.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down