chef-handler-datadog 0.1.1 → 0.1.2

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
-env:
-  - CHEF_VERSION=0.10.8
-  - CHEF_VERSION=10.12.0
-  - CHEF_VERSION=10.14.2
+before_install: gem update --system 1.8.25
+gemfile:
+  - gemfiles/Gemfile.chef-11
+  - gemfiles/Gemfile.chef-10

data/chef-handler-datadog.gemspec

@@ -1,9 +1,6 @@
-# -*- encoding: utf-8 -*-
-chef_version = ENV.key?('CHEF_VERSION') ? "= #{ENV['CHEF_VERSION']}" : ['~> 10.12']
 require File.expand_path('../lib/chef-handler-datadog', __FILE__)
 
 Gem::Specification.new do |gem|
-
   gem.name          = "chef-handler-datadog"
   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.}
@@ -16,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
-  gem.add_dependency 'chef', chef_version
+  gem.add_dependency 'chef', ">= 10", "<= 12"
   gem.add_dependency 'dogapi', ">= 1.2"
 
   gem.add_development_dependency 'rake'
@@ -26,7 +23,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'travis-lint'
 
   gem.authors       = ["Mike Fiedler", "Adam Jacob", "Alexis Le-Quoc"]
-  gem.email         = ["packages@datadoghq.com"]
+  gem.email         = ["package@datadoghq.com"]
   gem.homepage      = "http://www.datadoghq.com/"
-
 end

data/gemfiles/Gemfile.chef-10

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '~> 10.0'
+
+gemspec :path => '..'

data/gemfiles/Gemfile.chef-11

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'chef', '~> 11.2'
+
+gemspec :path => '..'

data/lib/chef-handler-datadog.rb

@@ -1,3 +1,3 @@
 module ChefHandlerDatadog
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/chef/handler/datadog.rb

@@ -92,38 +92,44 @@ class Chef
 
           # Get the current list of tags, remove any "role:" entries
           host_tags = @dog.host_tags(hostname)[1]["tags"] || []
-          host_tags.delete_if {|tag| tag.start_with?('role:') }
+          host_tags.delete_if { |tag| tag.start_with?('role:') }
 
           # Get list of chef roles, rename them to tag format
           chef_roles = node.run_list.roles
-          chef_roles.collect! {|role| "role:" + role }
+          chef_roles.collect! { |role| "role:" + role }
 
           # Get the chef environment (as long as it's not '_default')
           if node.respond_to?('chef_environment') && node.chef_environment != '_default'
-            host_tags.delete_if {|tag| tag.start_with?('env:') }
+            host_tags.delete_if { |tag| tag.start_with?('env:') }
             host_tags << "env:" + node.chef_environment
           end
 
           # Combine (union) both arrays. Removes dupes, preserves non-chef tags.
           new_host_tags = host_tags | chef_roles
 
-          # Replace all tags with the new tags
-          rc = @dog.update_tags(hostname, new_host_tags)
-          begin
-            # See FIXME above about why I feel dirty repeating this code here
-            if evt.length < 2
-              Chef::Log.warn("Unexpected response from Datadog Event API: #{evt}")
-            else
-              if rc[0].to_i / 100 != 2
-                Chef::Log.warn("Could not submit #{chef_roles} tags for #{hostname} to Datadog")
+          if @application_key.nil?
+            Chef::Log.warn("You need an application key to let Chef tag your nodes " \
+              "in Datadog. Visit https://app.datadoghq.com/account/settings#api to " \
+              "create one and update your datadog attributes in the datadog cookbook."
+            )
+          else
+            # Replace all tags with the new tags
+            rc = @dog.update_tags(hostname, new_host_tags)
+            begin
+              # See FIXME above about why I feel dirty repeating this code here
+              if rc.length < 2
+                Chef::Log.warn("Unexpected response from Datadog Event API: #{evt}")
               else
-                Chef::Log.debug("Successfully updated #{hostname}'s tags to #{new_host_tags.join(', ')}")
+                if rc[0].to_i / 100 != 2
+                  Chef::Log.warn("Could not submit #{chef_roles} tags for #{hostname} to Datadog")
+                else
+                  Chef::Log.debug("Successfully updated #{hostname}'s tags to #{new_host_tags.join(', ')}")
+                end
               end
+            rescue
+              Chef::Log.warn("Could not determine whether #{hostname}'s tags were successfully submitted to Datadog: #{rc}")
             end
-          rescue
-            Chef::Log.warn("Could not determine whether #{hostname}'s tags were successfully submitted to Datadog: #{rc}")
           end
-
         rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
           Chef::Log.error("Could not connect to Datadog. Connection error:\n" + e)
           Chef::Log.error("Data to be submitted was:")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-datadog
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,24 +11,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - <=
       - !ruby/object:Gem::Version
-        version: '10.12'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - <=
       - !ruby/object:Gem::Version
-        version: '10.12'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: dogapi
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +134,7 @@ dependencies:
 description: This Handler will report the events and metrics for a chef-client run
   to DataDog.
 email:
-- packages@datadoghq.com
+- package@datadoghq.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -142,6 +148,8 @@ files:
 - README.md
 - Rakefile
 - chef-handler-datadog.gemspec
+- gemfiles/Gemfile.chef-10
+- gemfiles/Gemfile.chef-11
 - lib/chef-handler-datadog.rb
 - lib/chef/handler/datadog.rb
 - test/helper.rb