chef-handler-datadog 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzlmYzNiOWYxODgxODhmZjNmY2Y3OTE1MGQ1MTlhMjMxNTA4M2NiZA==
+  data.tar.gz: !binary |-
+    ODljYmFlYjg5Y2UyMDQ2OWQ2NjlkNzM4OGFkN2FkYmM5ZmEwMDQ1Yg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YzNiODIxMTI1NTg1ZjNmYTdmZWEyMDVjYzRhOTY1OGViMjc5MDYyZDczNDBl
+    ZTVlYzM3YzFkZGI3OWUxMjlmNjcyNzMzNjMzMzQ3YmQyYTJhOWMxNmY3ZjU4
+    ZjA1MjFlMGZmY2MyMGJmZmUwZGEyYTI1MTIzNWM5MDU5NTIwNzE=
+  data.tar.gz: !binary |-
+    NGNjYzFmNWI4OTJlNzZlYzFmMjA2NmFmYTRhZTc1M2YwMTg4MDMxZjBkYmJh
+    ZmNkMGY0ZTdlMjhlODAzODM4NGE3M2FkNDQxNGQ5NzNiMjAwNzgwNDc4ZGUz
+    MTE4NzZmYzM1YjQzMGQ2MWE2Yjc5MWEwNDQxZTk1MjAxOGE1MWI=

data/.gitignore

@@ -53,3 +53,8 @@ pkg
 json
 rake
 Gemfile.lock
+
+# For Ruby Managers:
+.ruby-gemset
+.ruby-version
+.rvmrc

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
-before_install: gem update --system 1.8.25
 gemfile:
   - gemfiles/Gemfile.chef-11
   - gemfiles/Gemfile.chef-10

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+Changes
+=======
+# 0.2.0 / 2013-10-31
+
+* [BUGFIX] moved Chef gem dependency to development, [#34][] [@miketheman][]
+* [BUGFIX] redis python client check was not properly checking the default version, [@remh][]
+* [MISC] tailor 1.3.1 caught some cosmetic issue, [@alq][]
+* [MISC] fixed a few repo & build issues, [@miketheman][]
+
+# 0.1.2 / 2013-04-03
+
+And all other versions were prior to this. See git history for more.
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#34]: https://github.com/DataDog/chef-handler-datadog/issues/34
+[@alq]: https://github.com/alq
+[@miketheman]: https://github.com/miketheman
+[@remh]: https://github.com/remh

data/README.md

@@ -6,7 +6,7 @@ An Exception and Report Handler for Chef.
 
 ## Using chef-handler-datadog
 
-The [Chef integration page](https://app.datadoghq.com/accounts/settings#integrations) has detailed instructions.
+The Datadog Docs on [Chef](http://docs.datadoghq.com/guides/chef/#deployhandler) has detailed instructions.
 
 ## Contributing to chef-handler-datadog
 
@@ -20,4 +20,4 @@ The [Chef integration page](https://app.datadoghq.com/accounts/settings#integrat
 
 ## Copyright
 
-Copyright (c) 2012 Datadog, Inc. See LICENSE.txt for further details.
+Copyright (c) 2012-2013 Datadog, Inc. See LICENSE.txt for further details.

data/Rakefile

@@ -3,21 +3,15 @@
 require 'rubygems'
 require 'bundler/gem_tasks'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
+require 'rspec/core/rake_task'
+require 'tailor/rake_task'
 
 task :default => :test
 
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+RSpec::Core::RakeTask.new(:spec)
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "chef-handler-datadog #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+Tailor::RakeTask.new do |task|
+  task.file_set('lib/**/*.rb', "code") do |style|
+    style.max_line_length 160, :level => :warn
+  end
 end

data/chef-handler-datadog.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.extra_rdoc_files = ['README.md', 'LICENSE.txt']
 
-  gem.add_dependency 'chef', ">= 10", "<= 12"
   gem.add_dependency 'dogapi', ">= 1.2"
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'shoulda'
   gem.add_development_dependency 'bundler'
-  gem.add_development_dependency 'rdoc'
+  gem.add_development_dependency 'chef', ">= 10", "<= 12"
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'tailor', '~> 1.3'
   gem.add_development_dependency 'travis-lint'
 
   gem.authors       = ["Mike Fiedler", "Adam Jacob", "Alexis Le-Quoc"]

data/lib/chef-handler-datadog.rb

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

data/lib/chef/handler/datadog.rb

@@ -20,6 +20,7 @@ class Chef
       end
 
       def report
+        # resolve correct hostname
         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
@@ -35,6 +36,7 @@ class Chef
           Chef::Log.error("Could not send metrics to Datadog. Connection error:\n" + e)
         end
 
+        # Build the correct event
         event_title = ""
         run_time = pluralize(run_status.elapsed_time, "second")
         if run_status.success?
@@ -65,13 +67,14 @@ class Chef
         begin
           # Send the Event data
           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)
+            :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
@@ -110,7 +113,7 @@ class Chef
           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."
+                "create one and update your datadog attributes in the datadog cookbook."
             )
           else
             # Replace all tags with the new tags
@@ -121,7 +124,7 @@ class Chef
                 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")
+                  Chef::Log.warn("Could not submit #{new_host_tags} tags for #{hostname} to Datadog: #{evt}")
                 else
                   Chef::Log.debug("Successfully updated #{hostname}'s tags to #{new_host_tags.join(', ')}")
                 end
@@ -156,8 +159,9 @@ class Chef
         end
       end
 
+    # TODO: Remove this once confirmed that Chef 0.9.x is no longer used.
     ## This function is to mimic behavior built into a later version of chef than 0.9.x
-    ## Source is here: https://github.com/opscode/chef/blob/master/chef/lib/chef/resource.rb#L415-424
+    ## Source is here: https://github.com/opscode/chef/blob/19bc40b148f3862ce88d044e600d01a9838c60bc/chef/lib/chef/resource.rb#L375-L384
     ## Including this based on help from schisamo
       def defined_at(resource)
         cookbook_name = resource.cookbook_name

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-handler-datadog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Fiedler
@@ -11,66 +10,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: chef
+  name: dogapi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '10'
-    - - <=
-      - !ruby/object:Gem::Version
-        version: '12'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: dogapi
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
+    - - <=
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,15 +70,13 @@ dependencies:
   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
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,31 +84,27 @@ dependencies:
   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
+  name: tailor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: travis-lint
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +112,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -143,6 +128,7 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -157,27 +143,26 @@ files:
 homepage: http://www.datadoghq.com/
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Chef Handler for DataDog events and metrics
 test_files:
 - test/helper.rb