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

Support EC2 tag discovery in all regions #1332

Merged
merged 1 commit into from
Mar 16, 2015
Merged

Conversation

mweagle
Copy link

@mweagle mweagle commented Jan 30, 2015

The AWS EC2 tag discovery defaulted to us-east-1 which resulted in an instance discovery failure in other regions. The /var/log/datadog/collector.log was showing entries as in:

EC2ResponseError: EC2ResponseError: 400 Bad Request
<?xml version="1.0" encoding="UTF-8"?>
<Response><Errors><Error><Code>InvalidInstanceID.NotFound</Code><Message>The instance ID 'i-XXXXXXXX' does not exist</Message></Error></Errors><RequestID>deadbeef-701a-4bf9-9f29-147994aee2cc</RequestID></Response>

Support instance tag
discovery in all regions by querying the instance-identity document
store for the region and using boto.ec2.connect_to_region for the EC2 instance discovery.

NOTE: Apologies in advance for Python style violations...I've not used Python in a long time and I'm not in a position to setup a full test environment. Thanks!

The AWS EC2 tag discovery defaulted to us-east-1.  Support instance tag
discovery in all regions by querying the instance-identity document
store for the region and using `boto.ec2.connect_to_region`
@remh
Copy link

remh commented Jan 30, 2015

Thanks a bunch a @mweagle !

Our master branch is currently frozen for the preparation of our 5.2.0 release.

We'll review your pull request for our 5.3.0 release.
Thanks again!

@remh remh added this to the 5.3.0 milestone Jan 30, 2015
@remh
Copy link

remh commented Mar 16, 2015

Looks good to me ! Merging.
Thanks again @mweagle !

remh pushed a commit that referenced this pull request Mar 16, 2015
Support EC2 tag discovery in all regions
@remh remh merged commit dea6078 into DataDog:master Mar 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants