chef-handler-datadog 0.0.11 → 0.0.13

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+env:
+  - CHEF_VERSION=0.9.18

data/README.rdoc

@@ -2,6 +2,11 @@
 
 An Exception and Report Handler for Chef.
 
+{<img src="https://secure.travis-ci.org/DataDog/chef-handler-datadog.png?branch=master" alt="Build Status" />}[http://travis-ci.org/DataDog/chef-handler-datadog]
+== Using chef-handler-datadog
+
+The [Chef integration page](https://app.datadoghq.com/accounts/settings#integrations) has detailed instructions.
+
 == Contributing to chef-handler-datadog
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{Chef Handler for DataDog events and metrics}
   gem.description = %Q{This Handler will report the events and metrics for a chef-client run to DataDog.}
   gem.email = "packages@datadoghq.com"
-  gem.authors = ["Mike Fiedler", "Adam Jacob"]
+  gem.authors = ["Mike Fiedler", "Adam Jacob", "Alexis Le-Quoc"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.13

data/lib/chef-handler-datadog.rb

@@ -8,18 +8,26 @@ class Datadog < Chef::Handler
   # For the tags to work, the client must have created an Application Key on the
   # "Account Settings" page here: https://app.datadoghq.com/account/settings
   # It should be passed along from the node/role/environemnt attributes, as the default is nil.
-  def initialize(opts = {})
+  def initialize(opts = nil)
+    opts = opts || {}
     @api_key = opts[:api_key]
     @application_key = opts[:application_key]
+    # If we're on ec2, use the instance by default, unless instructed otherwise
+    @use_ec2_instance_id = !opts.has_key?(:use_ec2_instance_id) || opts.has_key?(:use_ec2_instance_id) && opts[:use_ec2_instance_id]
     @dog = Dogapi::Client.new(@api_key, application_key = @application_key)
   end
 
   def report
+    hostname = run_status.node.name
+    if @use_ec2_instance_id && run_status.node.attribute?("ec2") && run_status.node.ec2.attribute?("instance_id")
+      hostname = run_status.node.ec2.instance_id
+    end
+
     # Send the metrics
     begin
-      @dog.emit_point("chef.resources.total", run_status.all_resources.length, :host => run_status.node.name)
-      @dog.emit_point("chef.resources.updated", run_status.updated_resources.length, :host => run_status.node.name)
-      @dog.emit_point("chef.resources.elapsed_time", run_status.elapsed_time, :host => run_status.node.name)
+      @dog.emit_point("chef.resources.total", run_status.all_resources.length, :host => hostname)
+      @dog.emit_point("chef.resources.updated", run_status.updated_resources.length, :host => hostname)
+      @dog.emit_point("chef.resources.elapsed_time", run_status.elapsed_time, :host => hostname)
     rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
       Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
     end
@@ -29,9 +37,9 @@ class Datadog < Chef::Handler
     if run_status.success?
       alert_type = "success"
       event_priority = "low"
-      event_title << "Chef completed in #{run_time} on #{run_status.node.name} "
+      event_title << "Chef completed in #{run_time} on #{hostname} "
     else
-      event_title << "Chef failed in #{run_time} on #{run_status.node.name} "
+      event_title << "Chef failed in #{run_time} on #{hostname} "
     end
 
     event_data = "Chef updated #{run_status.updated_resources.length} resources out of #{run_status.all_resources.length} resources total."
@@ -56,11 +64,11 @@ class Datadog < Chef::Handler
       @dog.emit_event(Dogapi::Event.new(event_data,
                                         :msg_title => event_title,
                                         :event_type => 'config_management.run',
-                                        :event_object => run_status.node.name,
+                                        :event_object => hostname,
                                         :alert_type => alert_type,
                                         :priority => event_priority,
                                         :source_type_name => 'chef'
-                                        ), :host => run_status.node.name)
+                                        ), :host => hostname)
 
       # Get the current list of tags, remove any "role:" entries
       host_tags = @dog.host_tags(node.name)[1]["tags"] || []

metadata

@@ -1,102 +1,115 @@
 --- !ruby/object:Gem::Specification 
 name: chef-handler-datadog
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Mike Fiedler
 - Adam Jacob
+- Alexis Le-Quoc
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-04-05 00:00:00 -04:00
-default_executable: 
+date: 2012-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: chef
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 9
         - 18
         version: 0.9.18
-  requirement: *id001
-  name: chef
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: dogapi
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 2
         version: "1.2"
-  requirement: *id002
-  name: dogapi
-  prerelease: false
   type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  name: shoulda
-  prerelease: false
   type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: bundler
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
-  name: bundler
-  prerelease: false
   type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: jeweler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 6
         - 4
         version: 1.6.4
-  requirement: *id005
-  name: jeweler
-  prerelease: false
   type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: rdoc
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  name: rdoc
-  prerelease: false
   type: :development
+  version_requirements: *id006
 description: This Handler will report the events and metrics for a chef-client run to DataDog.
 email: packages@datadoghq.com
 executables: []
@@ -107,6 +120,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -116,7 +130,6 @@ files:
 - lib/chef-handler-datadog.rb
 - test/helper.rb
 - test/test_chef-handler-datadog.rb
-has_rdoc: true
 homepage: http://www.datadoghq.com/
 licenses: 
 - BSD
@@ -126,23 +139,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Chef Handler for DataDog events and metrics