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.

Sign up for GitHub

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

Fix handler use_ec2_instance_id options #44

Merged
merged 2 commits into from
Feb 6, 2013
Merged

Fix handler use_ec2_instance_id options #44

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b99f426
Pass use_ec2_instance_id attributes to options for the handler and co…
Feb 6, 2013
51e636a
Ha, use != user
Feb 6, 2013
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
5 changes: 2 additions & 3 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,8 @@
# 15 and 60 is a reasonable interval.
default['datadog']['check_freq'] = 15

# If running on ec2, use the instance-id as the host identifier
# rather than the hostname.
# If you have set up meaningful hostnames for your EC2 instances, set this to "no"
# If running on ec2, if true, use the instance-id as the host identifier
# rather than the hostname for the agent or nodename for chef-handler.
default['datadog']['use_ec2_instance_id'] = false

# Use mount points instead of volumes to track disk and fs metrics
Expand Down
3 changes: 2 additions & 1 deletion recipes/dd-handler.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
source "chef/handler/datadog"
arguments [
:api_key => node['datadog']['api_key'],
:application_key => node['datadog']['application_key']
:application_key => node['datadog']['application_key'],
:use_ec2_instance_id => node['datadog']['user_ec2_instance_id']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say (use instead of user).

:use_ec2_instance_id => node['datadog']['use_ec2_instance_id']

]
supports :report => true, :exception => true
action :nothing
Expand Down