chef-handler-datadog 0.0.1 → 0.0.2

data/Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
+
 # Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 gem "dogapi", ">= 1.2.3"
 gem "chef", ">= 0.9.18"
 

data/README.rdoc

@@ -1,6 +1,6 @@
 = chef-handler-datadog
 
-Description goes here.
+An Exception and Report Handler for Chef.
 
 == Contributing to chef-handler-datadog
  
@@ -14,6 +14,4 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2011 Mike Fiedler. See LICENSE.txt for
-further details.
-
+Copyright (c) 2011 Datadog, Inc. See LICENSE.txt for further details.

data/Rakefile

@@ -15,12 +15,12 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "chef-handler-datadog"
-  gem.homepage = "http://github.com/miketheman/chef-handler-datadog"
+  gem.homepage = "http://www.datadoghq.com/"
   gem.license = "BSD"
   gem.summary = %Q{Chef Handler for DataDog events and metrics}
-  gem.description = %Q{Chef Handler for DataDog events and metrics.}
-  gem.email = "miketheman@gmail.com"
-  gem.authors = ["Mike Fiedler"]
+  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"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/chef-handler-datadog.rb

@@ -0,0 +1,53 @@
+require 'rubygems'
+require 'chef'
+require 'chef/handler'
+require 'dogapi'
+
+class DataDog < Chef::Handler
+  def initialize(api_key)
+    @api_key = api_key
+    @dog = Dogapi::Client.new(api_key)
+  end
+
+  def report
+    # 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)
+    rescue Errno::ECONNREFUSED => e
+      Chef::Log.error("Could not connect to DataDog. Connection error:\n" + e)
+    end
+  
+    event_data = "Chef run for #{run_status.node.name}"
+    if run_status.success?
+      event_data << " complete in #{run_status.elapsed_time} seconds\n"
+    else
+      event_data << " failed in #{run_status.elapsed_time} seconds\n"
+    end
+    event_data << "Managed #{run_status.all_resources.length} resources\n"
+    event_data << "Updated #{run_status.updated_resources.length} resources"
+    if run_status.updated_resources.length.to_i > 0
+      event_data << "\n\n@@@\n"
+      run_status.updated_resources.each do |r|
+        event_data << "- #{r.to_s} (#{r.defined_at})\n"
+      end
+      event_data << "\n@@@\n"
+    end
+
+    if run_status.failed?
+      event_data << "\n\n@@@\n#{run_status.formatted_exception}\n@@@\n"
+      event_data << "\n\n@@@\n#{run_status.backtrace.join("\n")}\n@@@\n"
+    end
+
+    # Submit the details back to DataDog
+    begin
+      @dog.emit_event(Dogapi::Event.new(event_data), :host => run_status.node.name)
+      # TODO: add chef roles to set the node's #tags in newsfeed
+    rescue Errno::ECONNREFUSED => e
+      Chef::Log.error("Could not connect to DataDog. Connection error:\n" + e)
+      Chef::Log.error("Data to be submitted was:")
+      Chef::Log.error(event_data)
+    end
+  end
+end

data/test/helper.rb

@@ -12,7 +12,7 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'chef/handler/datadog_handler'
+require 'chef-handler-datadog'
 
 class Test::Unit::TestCase
 end

data/test/test_chef-handler-datadog.rb

@@ -2,6 +2,6 @@ require 'helper'
 
 class TestChefHandlerDatadog < Test::Unit::TestCase
   should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+    # flunk "hey buddy, you should probably rename this file and start testing for real"
   end
 end

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: chef-handler-datadog
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mike Fiedler
+- Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 Z
+date: 2011-11-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -123,8 +124,8 @@ dependencies:
   name: rdoc
   prerelease: false
   type: :development
-description: Chef Handler for DataDog events and metrics.
-email: miketheman@gmail.com
+description: This Handler will report the events and metrics for a chef-client run to DataDog.
+email: packages@datadoghq.com
 executables: []
 
 extensions: []
@@ -133,18 +134,16 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files: 
-- .document
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
-- chef-handler-datadog.gemspec
-- lib/chef/handler/datadog_handler.rb
+- lib/chef-handler-datadog.rb
 - test/helper.rb
 - test/test_chef-handler-datadog.rb
-homepage: http://github.com/miketheman/chef-handler-datadog
+homepage: http://www.datadoghq.com/
 licenses: 
 - BSD
 post_install_message: 

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/chef-handler-datadog.gemspec

@@ -1,68 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "chef-handler-datadog"
-  s.version = "0.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mike Fiedler"]
-  s.date = "2011-11-16"
-  s.description = "Chef Handler for DataDog events and metrics."
-  s.email = "miketheman@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "chef-handler-datadog.gemspec",
-    "lib/chef/handler/datadog_handler.rb",
-    "test/helper.rb",
-    "test/test_chef-handler-datadog.rb"
-  ]
-  s.homepage = "http://github.com/miketheman/chef-handler-datadog"
-  s.licenses = ["BSD"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "Chef Handler for DataDog events and metrics"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dogapi>, [">= 1.2.3"])
-      s.add_runtime_dependency(%q<chef>, [">= 0.9.18"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-    else
-      s.add_dependency(%q<dogapi>, [">= 1.2.3"])
-      s.add_dependency(%q<chef>, [">= 0.9.18"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<dogapi>, [">= 1.2.3"])
-    s.add_dependency(%q<chef>, [">= 0.9.18"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-  end
-end
-

data/lib/chef/handler/datadog_handler.rb

@@ -1,41 +0,0 @@
-require "chef/handler"
-require "dogapi"
-
-class DataDog < Chef::Handler
-  def initialize(api_key)
-    @api_key = api_key
-    @dog = Dogapi::Client.new(api_key)
-  end
-
-  def report
-    # our_time = Time.now.utc
-    @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)
-    
-    event_data = "Chef run for #{run_status.node.name}"
-    if run_status.success?
-      event_data << " complete in #{run_status.elapsed_time} seconds\n"
-    else
-      event_data << " failed in #{run_status.elapsed_time} seconds\n"
-    end
-    event_data << "Managed #{run_status.all_resources.length} resources\n"
-    event_data << "Updated #{run_status.updated_resources.length} resources"
-    if run_status.updated_resources.length.to_i > 0
-      event_data << "\n\n@@@\n"
-      run_status.updated_resources.each do |r|
-        event_data << "- #{r.to_s} (#{r.defined_at})\n"
-      end
-      event_data << "\n@@@\n"
-    end
-
-    if run_status.failed?
-      event_data << "\n\n@@@\n#{run_status.formatted_exception}\n@@@\n"
-      event_data << "\n\n@@@\n#{run_status.backtrace.join("\n")}\n@@@\n"
-    end
-
-    # Chef::Log.warn(event_data)
-    # get existig tags, prune, reset with chefroles, and tag #chef
-    @dog.emit_event(Dogapi::Event.new(event_data), :host => run_status.node.name)
-  end
-end