chef-handler-datadog 0.1.0 → 0.1.1

data/lib/chef-handler-datadog.rb

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

data/lib/chef/handler/datadog.rb

@@ -30,6 +30,7 @@ class Chef
           @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)
+          Chef::Log.debug("Submitted chef metrics back to Datadog")
         rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
           Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
         end
@@ -63,17 +64,34 @@ class Chef
         # Submit the details back to Datadog
         begin
           # Send the Event data
-          @dog.emit_event(Dogapi::Event.new(event_data,
-                                            :msg_title => event_title,
-                                            :event_type => 'config_management.run',
-                                            :event_object => hostname,
-                                            :alert_type => alert_type,
-                                            :priority => event_priority,
-                                            :source_type_name => 'chef'
-                                            ), :host => hostname)
+          evt = @dog.emit_event(Dogapi::Event.new(event_data,
+                                                  :msg_title => event_title,
+                                                  :event_type => 'config_management.run',
+                                                  :event_object => hostname,
+                                                  :alert_type => alert_type,
+                                                  :priority => event_priority,
+                                                  :source_type_name => 'chef'
+                                                  ), :host => hostname)
+          begin
+            # FIXME nice-to-have: abstract format of return value away a bit
+            # in dogapi directly. See https://github.com/DataDog/dogapi-rb/issues/18
+            if evt.length < 2
+              Chef::Log.warn("Unexpected response from Datadog Event API: #{evt}")
+            else
+              # [http_response_code, {"event" => {"url" => "...", ...}}]
+              # 2xx means ok
+              if evt[0].to_i / 100 != 2
+                Chef::Log.warn("Could not submit event to Datadog (HTTP call failed): #{evt[0]}")
+              else
+                Chef::Log.debug("Successfully submitted Chef event to Datadog for #{hostname} at #{evt[1]['event']['url']}")
+              end
+            end
+          rescue
+            Chef::Log.warn("Could not determine whether chef run was successfully submitted to Datadog: #{evt}")
+          end
 
           # Get the current list of tags, remove any "role:" entries
-          host_tags = @dog.host_tags(node.name)[1]["tags"] || []
+          host_tags = @dog.host_tags(hostname)[1]["tags"] || []
           host_tags.delete_if {|tag| tag.start_with?('role:') }
 
           # Get list of chef roles, rename them to tag format
@@ -90,7 +108,21 @@ class Chef
           new_host_tags = host_tags | chef_roles
 
           # Replace all tags with the new tags
-          @dog.update_tags(node.name, new_host_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")
+              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 Errno::ECONNREFUSED, Errno::ETIMEDOUT => e
           Chef::Log.error("Could not connect to Datadog. Connection error:\n" + e)

metadata

@@ -1,135 +1,140 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chef-handler-datadog
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Mike Fiedler
 - Adam Jacob
 - Alexis Le-Quoc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-09-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: chef
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 10
-        - 12
-        version: "10.12"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '10.12'
   type: :runtime
-  name: chef
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
   prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.12'
+- !ruby/object:Gem::Dependency
   name: dogapi
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
   prerelease: false
-  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: travis-lint
-  requirement: *id007
-description: This Handler will report the events and metrics for a chef-client run to DataDog.
-email: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: This Handler will report the events and metrics for a chef-client run
+  to DataDog.
+email:
 - packages@datadoghq.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE.txt
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -142,38 +147,30 @@ files:
 - test/helper.rb
 - test/test_chef-handler-datadog.rb
 homepage: http://www.datadoghq.com/
-licenses: 
+licenses:
 - BSD
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Chef Handler for DataDog events and metrics
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_chef-handler-datadog.rb